Commit Graph

2382 Commits

Author SHA1 Message Date
Morris Jobke 236086c457
Merge pull request #8335 from nextcloud/remove-unused-import
Remove unused import statements
2018-02-14 22:23:07 +01:00
Morris Jobke d3d045dd5c
Remove unused import statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Morris Jobke e2974f1133
Simplify return statement
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-13 21:55:24 +01:00
Nextcloud bot 3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot 71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Roland Tapken cf4ec7a4b6 Apply ldapUserFilter on members of group
Refers to issue #8220

user_ldap configured with custom filters for active directory access
(group-member-association is "member"). Then it can happen that the
members of a group contain members that don't belong to the users
available in Nextcloud (the most trivial reason is that the user filter
contains "(!(UserAccountControl:1.2.840.113556.1.4.803:=2))" to exclude
disabled users from being imported).

This can be fixed by applying the ldapUserFilter when resolving the UID
for a DN fetched from the group's member list.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-02-07 12:02:58 +01:00
Morris Jobke 6428cf552c
Merge pull request #8122 from nextcloud/fix-6851
fix reading the ldapIgnoreNamingRule config value
2018-02-02 09:34:03 +01:00
Nextcloud bot b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00:00
blizzz 8f29f9a59b
typo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-31 21:50:55 +01:00
Arthur Schiwon 8753a816d8
fixes reading the sysconfig value
settings without the entry in the translation array are computed

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-31 13:46:13 +01:00
Nextcloud bot cb26f6d014
[tx-robot] updated from transifex 2018-01-31 01:10:51 +00:00
Morris Jobke eb51f06a3b
Use ::class statement instead of string
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-29 12:03:47 +01:00
Nextcloud bot 1d8b90b8d3
[tx-robot] updated from transifex 2018-01-29 01:10:53 +00:00
Morris Jobke a661f043e1
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 23:46:40 +01:00
Morris Jobke 2ad2eb38e8
Use type casting instead of *val() method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 15:01:27 +01:00
Morris Jobke ca493ab5b1
Merge pull request #8069 from nextcloud/no-catch-serverdown
do not catch and ignore ServerNotAvailable in the wrong spot
2018-01-26 14:01:07 +01:00
Arthur Schiwon b61b906abe
do not catch ServerNotAvailable
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-26 12:47:19 +01:00
Morris Jobke 6bbea33133
Simplify ternary operator statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 12:36:25 +01:00
Morris Jobke c1e4f9f305
Use type casting instead of *val() method
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 11:35:42 +01:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 00:02:03 +01:00
Joas Schilling bf2be08c9f
Fix risky tests without assertions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-25 11:33:25 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Morris Jobke 55532f19d9
Cleanup OC_User and OCP\User
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 18:39:11 +01:00
Roeland Jago Douma 419de27b6d
Merge pull request #7840 from nextcloud/dep_config
Remove deprecated \OCP\Config
2018-01-14 22:21:37 +01:00
Morris Jobke 7d9146db38
Merge pull request #7846 from nextcloud/this_is_14
Bump version number
2018-01-14 20:54:16 +01:00
Roeland Jago Douma db411f8771
Bump apps
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
Roeland Jago Douma dffa922c0b
Remove deprecated functions for OCP\Util
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 19:41:34 +01:00
Roeland Jago Douma 8a41d05761
Remove deprecated \OCP\Config
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 14:25:04 +01:00
Morris Jobke f578b69729
Update composer
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:16:10 +01:00
Morris Jobke 9898ec95c1
Merge pull request #7796 from nextcloud/ldap-sync-fixes
LDAP Sync fixes: revert recursion resolution, fixed handling of pagingsize of 0
2018-01-11 17:22:00 +01:00
Morris Jobke 33b82f34be
Merge pull request #7709 from nextcloud/fix-password-displayed-as-username-in-password-manager
Fix password displayed as username in Firefox password manager dialog
2018-01-11 15:21:35 +01:00
Arthur Schiwon f84ec92563
revert resolving of recursion (3628d4d65d)
without recursion we have issues with internal states. paged search status
are set to false, cookies are not being set. In the end we have  endless
requests which pile up enormously with a high initial offset.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 15:17:18 +01:00
Arthur Schiwon 9031ae0281
fix return value when ldapPagingSize returns null
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 14:47:51 +01:00
Arthur Schiwon 15a3f4659f
enrich log message with backtrace, but level it down to DEBUG
The message is not helpful anyway for an admin, and oftentimes is just
valid (e.g. when searching with an offset beyond users in LDAP).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 14:17:14 +01:00
Daniel Calviño Sánchez b83204bf2c
Add strengthify bar after plain text input clone of password input
To show the password in plain text "showPassword" adds a text input
after the password input and swaps their visibility depending on whether
the password has to be shown in plain text or not. In a similar way,
"strengthify" by default adds the strength bar after the input element
it was called on. Due to this, if "showPassword" is called before
"strengthify" on the same password input then the strength bar ends
between the password input and the text input, and when the text input
is shown it appears below the strength bar.

To fix this now the strength bar is added after the text input in those
places in which "strengthify" was called after "showPassword" on the
same element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 14:08:47 +01:00
Arthur Schiwon f292f98060
when paged results are turned off, all (max possible) users are returned
thus hasMoreResult should return false

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 13:20:17 +01:00
Arthur Schiwon cf915b0f75
extend test for rotating prefixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:46:07 +01:00
Arthur Schiwon 7c3db54ff6
fix changing to next cycle
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:45:06 +01:00
Arthur Schiwon 0d3f945209
add tests for whole run command
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:44:45 +01:00
Arthur Schiwon b17c5fec40
add unit test for qualifies to run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:08:59 +01:00
Arthur Schiwon e4310648df
add unit test for determining next cycle
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 12:57:14 +01:00
Arthur Schiwon a565bf0b9f
fix offset is never being reset
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 14:29:11 +01:00
Arthur Schiwon 82da4fde18
create failing test for this case
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 14:27:36 +01:00
Roeland Jago Douma 0280cff66f
Composer updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Nextcloud bot 298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Arthur Schiwon e9eccf34f9
removes invalid tests, adapts another one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 21:44:30 +01:00
Morris Jobke 4d0315ceae
Merge pull request #7599 from nextcloud/quieter-debug-log
don't show recurring log msg when paged result was turned off
2018-01-03 00:40:46 +01:00
Arthur Schiwon c8851e24a8
throw ServerNotAvailableException when LDAP is caught shutting down
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-02 12:20:44 +01:00
Arthur Schiwon 82fd09c294
don't show recurring msg when pages result was turned off
and only as debug level otherwise.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-21 14:29:56 +01:00
Morris Jobke d2d73f1ce8
Also replace all other occurences
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
Arthur Schiwon 5ce943aa85
don't use deprecated method for requesting memcache
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-18 20:57:11 +01:00
Roeland Jago Douma 49b095b78e
Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 08:31:31 +01:00
Morris Jobke defac0ff0d
Fixes hex2bin() in LDAP
Untangles the two if-else clauses into a more readable format.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-13 11:57:49 +01:00
Morris Jobke 7fdc4b5262
Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-user
ensure that users are cached when they are retrieved
2017-12-11 15:39:24 +01:00
Lukas Reschke bb8acc5824
Merge pull request #7321 from nextcloud/ldap-update-loginfilter
Update login filter when user filter was newly generated
2017-12-08 15:24:57 +01:00
Nextcloud bot ef2b0969dd
[tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Arthur Schiwon 27f14eee26
don't cache user, if no internal user id was retrieved/assigned
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 22:47:32 +01:00
Arthur Schiwon 991190b994
ensure that users are cached when they are retrieved
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 17:49:33 +01:00
Nextcloud bot bd1e357eef
[tx-robot] updated from transifex 2017-12-03 01:10:22 +00:00
Nextcloud bot cec236f0af
[tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Nextcloud bot ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Nextcloud bot 49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Arthur Schiwon cfd1e04588
Update login filter when user filter was newly generated
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-28 12:41:36 +01:00
Nextcloud bot a0ce2c1204
[tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
Marius Blüm 05039f1f71
Rename "LDAP" to "LDAP/AD-integration"
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-11-27 09:49:28 +01:00
Nextcloud bot 63d98574e9
[tx-robot] updated from transifex 2017-11-25 01:09:56 +00:00
Nextcloud bot dc1d13a18d
[tx-robot] updated from transifex 2017-11-24 01:09:53 +00:00
Nextcloud bot a8ec62dcc2
[tx-robot] updated from transifex 2017-11-21 01:10:07 +00:00
Nextcloud bot 96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot 39ec541b23
[tx-robot] updated from transifex 2017-11-18 01:10:43 +00:00
Nextcloud bot 6c2c129fce
[tx-robot] updated from transifex 2017-11-17 01:09:51 +00:00
Nextcloud bot b2e9cb6a00
[tx-robot] updated from transifex 2017-11-16 01:09:50 +00:00
Nextcloud bot c5afb25714
[tx-robot] updated from transifex 2017-11-15 01:09:47 +00:00
blizzz a6d8948937
Merge pull request #5749 from nextcloud/ldap-primary-buttons
LDAP Wizard: primary-style buttons
2017-11-14 14:03:27 +01:00
Nextcloud bot 28e8a1c4b0
[tx-robot] updated from transifex 2017-11-14 01:09:46 +00:00
Julius Härtl 57eb046836
Use primary class also for ui-button elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 16:33:21 +01:00
Arthur Schiwon 5603d9a5ea
hackishly add primary css class adaption for jquery ui
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-13 16:33:17 +01:00
John Molakvoæ 8e61ad8847
Merge pull request #6678 from nextcloud/downstream-ldap-configurable-user-update
LDAP: configurable user update  interval
2017-11-13 08:14:52 +01:00
Nextcloud bot 8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
sidey79 d536e4e3b8
Fixed indentation
Fixed indentation of this pr

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 fbd8c5db4f
Fixed typo from last commit
Fixed typo in getAppValue mocket method from last commit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 ea0ad82e56
Update testUpdateNoRefresh
Mocked getAppValue to deliver a value of 1800 when updateAttributesInterval  is requested by needsRefresh.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:15 +01:00
sidey79 45dfc11137
tryfix needsRefresh unit tests
Forced updateAttributesInterval from getAppValue to int

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 039f6c9636
Fixed Typo in user.php
Fixed a typo for the app config prameter updateAttributesInterval

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 0b290c0904
Update User.php
Makes the time between needsRefresh configurable via app config option updateAttribuesInterval.
Default is still 86400 secons which is one day.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:36 +01:00
Lukas Reschke d3e7dd1992
Merge pull request #7057 from nextcloud/ldap-sync-split
Bring LDAP user attribute updates ("sync") to the background
2017-11-10 15:02:26 +01:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Arthur Schiwon 419759e68b
resolve DI
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 3ba8b337a4
fix unit tests after rebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 8113f26eed
add Sync test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon fc6b3902af
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon 59c05d5447
move LDAP user attributes "sync" to background (except for ajax jobs)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:56 +01:00
Arthur Schiwon ef3cd32916
don't skip updating when ajax is set as background job mode
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:04 +01:00
Arthur Schiwon c6f1af9896
move ldap user sync to background (WIP)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:09:59 +01:00
Lukas Reschke 2bfa1ce5c3
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
Lukas Reschke 8c915baa34
Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00