Commit Graph

19652 Commits

Author SHA1 Message Date
Roeland Jago Douma e953ea47ea
Merge pull request #14891 from nextcloud/stable15-14886
[stable15] Fix opening folders from different file lists
2019-03-29 13:32:01 +01:00
Nextcloud bot aafedb9728
[tx-robot] updated from transifex 2019-03-29 01:12:59 +00:00
Julius Härtl 8ac03c67a7
Fix opening folders from different file lists
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-28 09:24:47 +01:00
Nextcloud bot 528d5299c7
[tx-robot] updated from transifex 2019-03-28 01:13:33 +00:00
Nextcloud bot c1fa96596a
[tx-robot] updated from transifex 2019-03-27 12:06:38 +00:00
Morris Jobke be8a82ecba
Merge pull request #14855 from nextcloud/backport/14583/remove-g+-federation
[stable15] Remove Google+ federation usersettings
2019-03-26 14:16:11 +01:00
Marius Blüm fc7ac08565
Remove G+ CSS rule (Feedback from Joas)
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-26 11:53:20 +01:00
Marius Blüm 9c7a6c2c53
Remove G+ code from Federated Files Sharing-usersettings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-26 11:52:15 +01:00
Marius Blüm 89c0d879bc
Remove G+ icon from Federated Files Sharing-usersettings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-26 11:51:58 +01:00
Nextcloud bot bca4a9ecbb
[tx-robot] updated from transifex 2019-03-26 10:41:42 +00:00
Vinicius Cubas Brand 79b7f12a79 LDAP plugin: force createUser to return new user's DN
LDAP plugins must change the createUser method to return the DN, as we
need this to update the cache.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:33:04 +00:00
Vinicius Cubas Brand 7d6a7ab351 Cache cleaning when subadmin adds user to group
This commit fix an error happening when the subadmin tries to create an
user, adding him/her to the group s/he is subadmin of, using a LDAP
User/Group plugin.

This just forces the cache to be reset after an user is added to a
group.

Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:33:03 +00:00
Vinicius Cubas Brand 20b0817e5c fix user creation using LDAP Plugin
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2019-03-21 10:33:03 +00:00
Nextcloud bot 2c7f1fd001
[tx-robot] updated from transifex 2019-03-21 01:14:06 +00:00
Evilham fad5424165 [app:files] Use current directory for hashing.
This fixes collisions that were causing uploads to break in a very
terrible way.

Kudos to @kesselb for finding the problematic place and to
@hottwister for the proposed solution.

Fixes #10527.
2019-03-20 10:21:21 +00:00
Roeland Jago Douma d211d5ef57
Merge pull request #14749 from nextcloud/backport/14744/stable15
[stable15] Always register the Notifier
2019-03-20 10:05:45 +01:00
Nextcloud bot ce619b07ae
[tx-robot] updated from transifex 2019-03-20 01:12:57 +00:00
Joas Schilling b0938d7d0d Always register the Notifier
... so background jobs without a user can prepare push notifications

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-19 15:43:38 +00:00
Nextcloud bot 3c76c0ce11
[tx-robot] updated from transifex 2019-03-19 01:12:52 +00:00
Roeland Jago Douma 3f559dd3ec
Merge pull request #14696 from nextcloud/backport/13401/stable15
[stable15] improve lookup server behaviour
2019-03-18 10:07:15 +01:00
Morris Jobke ee6426024d
Fix missing $config dependency in RetryJob
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-18 08:34:15 +01:00
Daniel Kesselberg 6e56160123
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-18 08:33:58 +01:00
Nextcloud bot 590ea7c5fb
[tx-robot] updated from transifex 2019-03-18 01:12:37 +00:00
Bjoern Schiessle edbe99d44e
increase timespan between each retry
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2019-03-17 20:39:41 +01:00
Bjoern Schiessle 23c57b22cb
improve lookup server behaviour
Don't try to connect to the lookup server if the lookup server was disabled
by the admin or an empty lookup server URL was given

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2019-03-17 20:39:40 +01:00
Nextcloud bot cec3fd4dcf
[tx-robot] updated from transifex 2019-03-17 01:13:33 +00:00
Nextcloud bot d33cec3d7d
[tx-robot] updated from transifex 2019-03-16 01:12:43 +00:00
Morris Jobke ab492adb9a
Merge pull request #14699 from nextcloud/backport/14693/stable15
[stable15] dont try to restore a trashbin item to a readonly target
2019-03-15 10:56:31 +01:00
Morris Jobke b42e4b19ee
Merge pull request #14700 from nextcloud/backport/14690/stable15
[stable15] throw a proper error if rename fails in dav
2019-03-15 10:53:40 +01:00
Nextcloud bot 9ebf78a88d
[tx-robot] updated from transifex 2019-03-15 01:15:29 +00:00
Morris Jobke d734a4ba7b
Merge pull request #14672 from nextcloud/backport/14640/disable-failing-tests
[stable15] Disable fragile tests
2019-03-15 00:25:06 +01:00
Robin Appelman 19a3ac67a7 throw a proper error if rename fails in dav
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-14 19:28:58 +00:00
Robin Appelman 7b1b161280 dont try to restore a trashbin item to a readonly target
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-14 19:27:29 +00:00
Nextcloud bot 92634ec842
[tx-robot] updated from transifex 2019-03-14 16:08:44 +00:00
Morris Jobke 06c80c77c2
Add time between SMB test runs and properly log full changeset
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-14 16:43:19 +01:00
Julius Härtl 1d5149aff6 Use SCSS variables since CSS vars are not loaded on public pages
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-14 07:52:10 +00:00
Morris Jobke 6ff4371348
Wait up to 10 seconds for incoming changes from SMB notifier
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 22:18:16 +01:00
Morris Jobke 684bb8608d
Do not run fragile TrashbinTest
Fails with:

There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

OR

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 22:16:27 +01:00
Robin Appelman 57471cca04 prevent recursion when moving a file to the trashbin
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-13 16:17:30 +00:00
Morris Jobke e957b0a271
Merge pull request #14591 from nextcloud/backport/14464/stable15
[stable15] resolve user and groups in nested groups first before filtering the results
2019-03-08 17:31:39 +01:00
Marius Blüm d0fdcbbd20 Mention Open Cloud Mesh in Federated User Settings
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-08 08:43:19 +00:00
Arthur Schiwon a358c4d81f
remove unused use statement
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:54 +01:00
Arthur Schiwon a6c0d53a3e
fix nested group retrieval also for 2 other cases
and also consolidate logic in one method

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:25 +01:00
Roland Tapken 3384e25154
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:38:15 +01:00
Roland Tapken 0a469e8f23
Reduce queries to LDAP by caching nested groups
Nested groups are now cached in a CappedMemoryCache object to reduce
queries to the LDAP backend.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:37:21 +01:00
Roland Tapken 0997fd999e
user_ldap: really resolve nested groups
The previous patch fixed the problem only for one level of indirection
because groupsMatchFilter() had been applied on each recursive call (and
thus there would be no second level if the first level fails the check).

This new implementation replaces the recursive call with a stack that
iterates all nested groups before filtering with groupsMatchFilter().

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:36:21 +01:00
Roland Tapken fe169b021d
user_ldap: Filter groups after nexted groups
Currently groupsMatchFilter is called before nested groups are resolved.
This basicly breaks this feature since it is not possible to inherit
membership in a group from another group.

Minimal example:

  Group filter: (&(objectClass=group),(cn=nextcloud))
  Nested groups: enabled

  cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local
    objectClass: group

  cn=IT,ou=groups,dn=company,dn=local
    objectClass: group
    memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local

  cn=John Doe,ou=users,dn=company,dn=local
    objectClass: person
    memberOf: cn=IT,ou=groups,dn=company,dn=local

Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group
filter, John wouldn't be a member of group 'nextcloud'.

This patch fixes this by filtering the groups after all nested groups
have been collected. If nested groups is disabled the result will be the
same as without this patch.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:36:14 +01:00
Roeland Jago Douma f5f4673827
Have streams of files_external in sync
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-07 12:59:47 +01:00
Roeland Jago Douma 390917a9e5 Do not send notification if no active 2fa
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 09:17:38 +00:00
Roeland Jago Douma f42309f356 Clear backupcodes reminder if no 2FA is enabled
Fixes #14125

Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 09:17:38 +00:00