Commit Graph

2808 Commits

Author SHA1 Message Date
Morris Jobke 8ffa762486
Merge pull request #20536 from nextcloud/fix/noid/ldap-73api-read-wo-pagedresults
do not run paged results against ldap_read ops on PHP7.3+
2020-04-22 13:37:43 +02:00
Roeland Jago Douma 8f650feede
Merge pull request #20114 from nextcloud/techdebt/noid/allow-some-apps-to-have-root-urls
Allow some apps to have root URLs in their own routing file
2020-04-21 16:00:34 +02:00
Arthur Schiwon 75c686d825
do not run paged results against ldap_read ops on PHP7.3+
- previously it was needed as the PHP LDAP handling of paged results was
strange
- but now the read operation would fail, e.g. with extra home dir attribute
set ("Home dir attribute can't be read from LDAP for uid: foobar"

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-21 15:47:49 +02:00
Nextcloud bot f0c1041d2e
[tx-robot] updated from transifex 2020-04-21 02:16:40 +00:00
Nextcloud bot b1a90da347
[tx-robot] updated from transifex 2020-04-20 02:16:12 +00:00
Joas Schilling 708b4991d9
Fix legacy routes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-04-18 11:21:28 +02:00
Arthur Schiwon ab550d682f
do not rerun expensive sanitizer against already processed DNs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-17 12:49:47 +02:00
Arthur Schiwon 32000dd1af
read records from DB for lists at once, not one by one.
Keep a runtime cache of dn-id-mapping

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-17 12:39:54 +02:00
Arthur Schiwon cc31c38277
don't circulate with only one backend
- saves some overhead costs
- in some occasions saves LDAP requests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-17 12:38:52 +02:00
Arthur Schiwon e8ddb4718c
consolidate groupsMatchFilter in groupsExist
- less duplication
- profiting of the same cache entry

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-17 12:38:07 +02:00
Roeland Jago Douma d9990b09b8
PHP-CS-Fixer green
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-16 09:25:17 +02:00
Nextcloud bot 078ac97939
[tx-robot] updated from transifex 2020-04-16 02:17:30 +00:00
Arthur Schiwon 84619a5b9c
use serverControls directly with LDAP calls, fixes 19127
- adapters for PHP API version to Support PHP < 7.3
- switch to pass only one base per search
- cookie logic is moved from Access to API adapters

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-04-14 12:58:28 +02:00
Nextcloud bot 6187cea304
[tx-robot] updated from transifex 2020-04-13 02:19:45 +00:00
Christoph Wurst 734c62bee0
Format code according to PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +02:00
Christoph Wurst 28f8eb5dba
Add visibility to all constants
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
Christoph Wurst 1584c9ae9c
Add visibility to all methods and position of static keyword
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:51:06 +02:00
Christoph Wurst a7c8d26d31
Add visibility to all properties and move static keyword
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:48:31 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
Christoph Wurst 14c996d982
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
Nextcloud bot 078b12a9b0
[tx-robot] updated from transifex 2020-04-10 02:18:23 +00:00
Christoph Wurst 008e6d7e84
Merge pull request #20391 from nextcloud/refactor/spaces-cleanup
Remove all extra whitespace PSR2 does not like
2020-04-09 20:39:37 +02:00
Christoph Wurst 64510932b8
Merge pull request #20384 from nextcloud/techdebt/lowercase-keywords
Use php keywords in lowercase
2020-04-09 16:25:14 +02:00
Christoph Wurst a8a06a82d2
Remove trailing whitespaces from comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:09:23 +02:00
Christoph Wurst 44577e4345
Remove trailing and in between spaces
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
Christoph Wurst 36b3bc8148
Use php keywords in lowercase
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 14:04:56 +02:00
Christoph Wurst afbd9c4e6e
Unify function spacing to PSR2 recommendation
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
Christoph Wurst 41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Christoph Wurst 2fbad1ed72
Fix (array) indent style to always use one tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
Christoph Wurst 85e369cddb
Fix multiline comments
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-08 22:24:54 +02:00
Nextcloud bot 8146e1988c
[tx-robot] updated from transifex 2020-04-08 02:18:45 +00:00
Nextcloud bot cac1480bf8
[tx-robot] updated from transifex 2020-04-05 02:18:04 +00:00
Christoph Wurst 1a9330cd69
Update the license headers for Nextcloud 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
Nextcloud bot 9e8ac1d24a
[tx-robot] updated from transifex 2020-03-30 02:18:34 +00:00
Nextcloud bot 89710bbdcf
[tx-robot] updated from transifex 2020-03-29 02:20:14 +00:00
Christoph Wurst 463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
Remove unused imports
2020-03-27 17:14:08 +01:00
Christoph Wurst b80ebc9674
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
blizzz 62403d0932
Merge pull request #20123 from lippl/bugfix/ldap-user_count-warning
Bugfix - Prevent PHP Warning for count on null on LDAP
2020-03-26 11:28:26 +01:00
Philipp Staiger 8769d97f62 single squashed commit for bug fix
Signed-off-by: Philipp Staiger <philipp@staiger.it>
2020-03-26 09:01:35 +01:00
Christoph Wurst 2ee65f177e
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:21:27 +01:00
Christoph Wurst 74936c49ea
Remove unused imports
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +01:00
Nextcloud bot 06d1b327ff
[tx-robot] updated from transifex 2020-03-24 02:18:45 +00:00
Nextcloud bot bacf0d802a
[tx-robot] updated from transifex 2020-03-22 02:18:37 +00:00
blizzz 5817047c3e
Merge pull request #20039 from nextcloud/fix/19549/fix-uuid-attr-detection
fixes auto-detecting UUID attributes
2020-03-20 11:06:37 +01:00
Nextcloud bot 3fa63f2842
[tx-robot] updated from transifex 2020-03-20 02:18:21 +00:00
Arthur Schiwon 77c63e3b24
fixes auto-detecting UUID attributes
the continue (and later the early return) avoided proper looping over the
attribute candidates.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-03-19 19:42:46 +01:00
Christoph Wurst 150f39ed50
Update autoloaders for composer v1.10.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-19 09:48:49 +01:00
Nextcloud bot 4a019ab04c
[tx-robot] updated from transifex 2020-03-09 02:18:09 +00:00
Nextcloud bot 35ccf07ad4
[tx-robot] updated from transifex 2020-03-07 02:17:55 +00:00
Nextcloud bot a036ca6018
[tx-robot] updated from transifex 2020-03-06 02:18:23 +00:00
Nextcloud bot 351cd95777
[tx-robot] updated from transifex 2020-03-02 02:17:53 +00:00
Roeland Jago Douma aaf1cb70a2
Merge pull request #19549 from nextcloud/fix/19418/uuid-attr-log-flood
remove noise from detectUuid and cache results
2020-02-24 20:03:53 +01:00
Nextcloud bot 921253033a
[tx-robot] updated from transifex 2020-02-24 02:19:17 +00:00
Nextcloud bot 9d122c39ab
[tx-robot] updated from transifex 2020-02-23 02:19:29 +00:00
Nextcloud bot 6c12d16def
[tx-robot] updated from transifex 2020-02-20 02:18:42 +00:00
Arthur Schiwon 407b8fddfc
remove noise from detectUuid and cache results
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-02-19 16:42:36 +01:00
Nextcloud bot bdab337313
[tx-robot] updated from transifex 2020-02-15 02:18:10 +00:00
Nextcloud bot 29ec5e6c96
[tx-robot] updated from transifex 2020-02-11 02:18:33 +00:00
Arthur Schiwon a0e57ea6d3
sort prefixes for deterministic LDAP query behaviour
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-02-07 18:10:31 +01:00
Nextcloud bot 1afe8906bc
[tx-robot] updated from transifex 2020-02-07 02:20:10 +00:00
Nextcloud bot 698cfbd9cb
[tx-robot] updated from transifex 2020-02-06 02:18:41 +00:00
Nextcloud bot 23fc654fc4
[tx-robot] updated from transifex 2020-02-05 02:18:06 +00:00
Nextcloud bot 0b710e582b
[tx-robot] updated from transifex 2020-02-04 02:18:05 +00:00
Roeland Jago Douma c9af72ec30
Merge pull request #19250 from nextcloud/rakekniven-patch-1
l10n: Changed spelling of "user name" to "username"
2020-02-03 10:24:48 +01:00
Nextcloud bot f39c1a21f8
[tx-robot] updated from transifex 2020-02-02 02:17:40 +00:00
rakekniven 984c757be8
l10n: Changed spelling of "user name" to "username"
Using "username" like on > 200 strings over the whole Nextcloud project.

Signed-off-by: rakekniven mark.ziegler@rakekniven.de
2020-02-01 12:58:32 +01:00
Nextcloud bot 69d2893a75
[tx-robot] updated from transifex 2020-01-31 02:17:52 +00:00
Nextcloud bot 0585c76d16
[tx-robot] updated from transifex 2020-01-29 02:18:13 +00:00
Nextcloud bot 78d400cec2
[tx-robot] updated from transifex 2020-01-27 02:17:55 +00:00
Nextcloud bot 22e3a74f90
[tx-robot] updated from transifex 2020-01-24 02:16:52 +00:00
Roeland Jago Douma 8728eab9d7
Fix app updates
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-21 14:00:58 +01:00
Nextcloud bot 434fd438d9
[tx-robot] updated from transifex 2020-01-19 02:17:21 +00:00
Nextcloud bot a61bad6ede
[tx-robot] updated from transifex 2020-01-18 02:18:30 +00:00
blizzz 950856d5bb
Merge pull request #17717 from nextcloud/fix/noid/ldap-relax-getHome
relax strict getHome behaviour for LDAP users in a shadow state
2020-01-14 09:57:24 +01:00
Arthur Schiwon 489ed878e1
ensure that only valid group members are returned
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-13 17:13:08 +01:00
Arthur Schiwon 79667b58a9
cache group existence early to save useless requests to LDAP
we do it for users already

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-08 11:02:37 +01:00
Arthur Schiwon f657ded6ec
remove superfluous tests
- user_ldap is not exposed to public api, it is always behind ldap_proxy
- this is too much for a unit test
- integration tests cover userExists implicitly

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-08 09:21:22 +01:00
Arthur Schiwon 1068b860ff
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-08 09:21:22 +01:00
Arthur Schiwon 5cae135b94
decouple userExists from userExistsOnLDAP check
allows to mark users as offline right away, avoids a gap of being not a
user and causing weird side effects

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-08 09:21:22 +01:00
Arthur Schiwon 411a47cadb
relax strict getHome behaviour for LDAP users in a shadow state
* simplifies deletion process
* less strange behaviour when looking up home storage (as long as it is local)
* thus could enable transfer ownerships after user went invisible on ldap

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-01-08 09:21:21 +01:00
Nextcloud bot 32f79c9f0c
[tx-robot] updated from transifex 2020-01-06 02:27:21 +00:00
Nextcloud bot 46706d01e0
[tx-robot] updated from transifex 2020-01-05 02:30:34 +00:00
Nextcloud bot 797b603a1f
[tx-robot] updated from transifex 2020-01-04 02:27:44 +00:00
Nextcloud bot 1d8da461d5
[tx-robot] updated from transifex 2019-12-23 02:27:33 +00:00
Nextcloud bot c81e05db98
[tx-robot] updated from transifex 2019-12-22 02:28:34 +00:00
Christoph Wurst 1b46621cd3
Update license headers for 18
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-20 09:23:25 +01:00
Christoph Wurst 9772dbd19e
Fix LDAP application class instance created directly
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-09 10:12:02 +01:00
Nextcloud bot b41112a023
[tx-robot] updated from transifex 2019-12-07 02:16:37 +00:00
Nextcloud bot da84b36186
[tx-robot] updated from transifex 2019-12-06 02:16:59 +00:00
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
Christoph Wurst cc80339b39
Add typed create user events
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-03 08:03:57 +01:00
Roeland Jago Douma 669302e570
Merge pull request #18064 from nextcloud/feature/php74
Add php7.4 support
2019-11-28 08:36:10 +01:00
Nextcloud bot 563f9153a2
[tx-robot] updated from transifex 2019-11-28 02:16:54 +00:00
Roeland Jago Douma 17a9d5856f
TO REVERT LATER: disable some tests in UserTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:28 +01:00
Roeland Jago Douma 3a7cf40aaa
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:18 +01:00
Roeland Jago Douma 8d4346d656
Fix more tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:42 +01:00
Roeland Jago Douma c007ca624f
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:41 +01:00
Roeland Jago Douma 7015501a74
Merge pull request #18005 from nextcloud/fix/manual-app-instances
Remove some more direct app instance creations
2019-11-26 09:20:14 +01:00
Roeland Jago Douma c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs
Some php-cs fixes
2019-11-25 14:07:00 +01:00
Christoph Wurst 97385cef33
Remove some more direct app instance creations
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-25 08:42:16 +01:00