upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-22 18:16:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
46204 commits 942 branches 1211 tags 8.6 GiB
Commit graph

19036 commits

Author SHA1 Message Date
Morris Jobke
5cdb4f97e3
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:20:13 +01:00
Morris Jobke
67aab99962
Merge pull request #14592 from nextcloud/backport/14464/stable14 
[stable14] resolve user and groups in nested groups first before filtering the results
 2019-03-08 17:31:30 +01:00
Marius Blüm
9c8bcf9c62 Mention Open Cloud Mesh in Federated User Settings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:43:21 +00:00
Arthur Schiwon
7fa490fde4
remove unused use statement 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-07 22:47:40 +01:00
Arthur Schiwon
a23ef68ffe
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:47:06 +01:00
Roland Tapken
a202fc808d
Fixed unit test: groupsMatchFilter will not be called multiple times anymore. 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2019-03-07 22:46:20 +01:00
Roland Tapken
f88a09140d
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:46:14 +01:00
Roland Tapken
177901d079
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:46:08 +01:00
Roland Tapken
8f57824707
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:45:58 +01:00
Julius Härtl
05f3abaf6b Check if password can be changed for the users backend in OCS api 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-05 13:28:47 +00:00
Robin Appelman
79abac9084
update icewind/smb to 3.0.2 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-04 16:38:46 +01:00
Nextcloud bot
affd0dcaf2
[tx-robot] updated from transifex 2019-03-01 01:12:57 +00:00
Roeland Jago Douma
84c2dfd442
Merge pull request #14415 from nextcloud/backport/13844/stable14 
[stable14] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
 2019-02-28 09:43:31 +01:00
Nextcloud bot
1d33283332
[tx-robot] updated from transifex 2019-02-28 01:12:58 +00:00
Felix Nieuwenhuizen
39cbc6e09e Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota) 
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
 2019-02-27 14:56:54 +00:00
Nextcloud bot
a05e578d36
[tx-robot] updated from transifex 2019-02-27 01:12:27 +00:00
Nextcloud bot
1274001632
[tx-robot] updated from transifex 2019-02-26 01:12:30 +00:00
Nextcloud bot
7cb9934638
[tx-robot] updated from transifex 2019-02-25 01:12:37 +00:00
Nextcloud bot
8a48ad749e
[tx-robot] updated from transifex 2019-02-24 01:14:01 +00:00
Nextcloud bot
41455c6df4
[tx-robot] updated from transifex 2019-02-23 01:13:03 +00:00
Nextcloud bot
71b5f7a640
[tx-robot] updated from transifex 2019-02-22 01:12:29 +00:00
Nextcloud bot
e7d5630947
[tx-robot] updated from transifex 2019-02-21 01:12:22 +00:00
Nextcloud bot
d4d62435e9
[tx-robot] updated from transifex 2019-02-20 01:12:14 +00:00
Roeland Jago Douma
cf6cbf4870 Catch Request exception in testRemoteUrl 
Else the background job fails hard if the remote has for example an
invalid certificate.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-19 07:06:27 +00:00
Nextcloud bot
53b295456d
[tx-robot] updated from transifex 2019-02-19 01:12:27 +00:00
Nextcloud bot
84354c3008
[tx-robot] updated from transifex 2019-02-18 01:12:29 +00:00
Nextcloud bot
a906a9c216
[tx-robot] updated from transifex 2019-02-17 01:13:48 +00:00
Nextcloud bot
bcc1250173
[tx-robot] updated from transifex 2019-02-16 01:12:44 +00:00
Nextcloud bot
2a1c76b499
[tx-robot] updated from transifex 2019-02-15 01:13:12 +00:00
Roeland Jago Douma
80ecaf06a6
Merge pull request #14206 from nextcloud/backport/14200/stable14 
[stable14] ensure attribute names are lower cased
 2019-02-14 19:43:46 +01:00
Arthur Schiwon
ecd70ca011
ensure attribute names are lower cased 
otherwise they will be skipped when the results is being formatted and the
lower-cased result keys do not match.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-02-14 15:36:37 +01:00
Morris Jobke
e31f44978d
Fix style of warning for EoL version 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-02-14 15:28:00 +01:00
Nextcloud bot
afa91c75e5
[tx-robot] updated from transifex 2019-02-14 01:12:47 +00:00
Nextcloud bot
13af316b8d
[tx-robot] updated from transifex 2019-02-13 01:12:35 +00:00
Nextcloud bot
7192688c98
[tx-robot] updated from transifex 2019-02-12 01:12:47 +00:00
Nextcloud bot
cb67b6776c
[tx-robot] updated from transifex 2019-02-11 01:12:40 +00:00
Nextcloud bot
933ff3d466
[tx-robot] updated from transifex 2019-02-10 01:13:48 +00:00
Nextcloud bot
79f02c13e8
[tx-robot] updated from transifex 2019-02-09 01:12:58 +00:00
Nextcloud bot
868b6dbcae
[tx-robot] updated from transifex 2019-02-08 01:12:58 +00:00
Roeland Jago Douma
50390558ae
Merge pull request #14096 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/stable14/lodash-4.17.11 
[Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/updatenotification
 2019-02-07 22:37:39 +01:00
Roeland Jago Douma
dc811dfa18
Merge pull request #14092 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/stable14/lodash-4.17.11 
[Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/oauth2
 2019-02-07 22:36:09 +01:00
dependabot[bot]
74f9fefbd5
[Security] Bump lodash in /apps/updatenotification 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-07 21:15:33 +01:00
dependabot[bot]
697dcee5cd
[Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/oauth2 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-07 21:10:54 +01:00
Roeland Jago Douma
81b035e99a
Rebuild 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-07 21:08:28 +01:00
dependabot[bot]
eccf1c72d7
[Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/accessibility 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Changelog](https://github.com/lodash/lodash/blob/master/CHANGELOG)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-07 19:06:01 +00:00
Morris Jobke
028038e5a3
Merge pull request #14069 from nextcloud/smb-3.0.1-14 
[14] update icewind/smb to 3.0.1
 2019-02-07 16:36:55 +01:00
Nextcloud bot
707b1c7909
[tx-robot] updated from transifex 2019-02-06 22:18:42 +00:00
Robin Appelman
c6a52efb29
update icewind/smb to 3.0.1 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-02-06 18:12:41 +01:00
Nextcloud bot
ffaff1b2ab
[tx-robot] updated from transifex 2019-02-06 11:27:51 +00:00
Arthur Schiwon
37e7f3dae6
ignore non existing users when retrieving details of group members 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-01-30 20:06:35 +01:00