5c21e94db8
add missing config bits to integration tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:48 +01:00
3ea24fa630
with LDAP server set offline, config cannot be controlled via ocs anymore
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:41 +01:00
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
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
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
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
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
95bc1a0198
Merge pull request #14580 from nextcloud/backport/14579/stable15
...
[stable15] Have streams of files_external in sync
2019-03-07 15:02:16 +01:00
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
3de750c88c
Merge pull request #14570 from nextcloud/backport/14424/stable15
...
[stable15] Use a tmp file for swift writes
2019-03-06 20:35:46 +01:00
30e790606e
Use a tmp file for swift writes
...
Else this leads to a seekable stream error with chunked uploads
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 14:34:15 +00:00
3acee4f1b4
Merge pull request #14416 from nextcloud/backport/14343/stable15
...
[stable15] Parse multiple navigation items
2019-03-06 13:16:25 +01:00
0da0ee1ce4
Merge pull request #14559 from nextcloud/backport/14553/stable15
...
[stable15] Clear backupcode reminder when no 2fa
2019-03-06 11:57:03 +01:00
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
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
4f4dad20fa
Merge pull request #14546 from nextcloud/backport/14373/stable15
...
[stable15] Add test for updated CA bundle
2019-03-05 19:52:35 +01:00
46061d9d6b
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-05 16:14:44 +00:00
d2e12d6aa7
Add test for updated CA bundle
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:14:44 +00:00
30e9a17790
Merge pull request #14542 from nextcloud/backport/14451/stable15
...
[stable15] Check if password can be changed for the users backend in OCS api
2019-03-05 16:19:22 +01:00
37ba2562cf
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:05 +00:00
b88eb01798
Merge pull request #14531 from nextcloud/backport/14528/stable15
...
[stable15] Fix database configuration
2019-03-05 12:23:22 +01:00
facde54bf5
Fix whitespaces
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 10:02:09 +00:00
6cc0d9fa20
Fix database configuration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 10:02:08 +00:00
6e5a93026c
Merge pull request #14517 from nextcloud/backport/13871/stable15
...
[stable15] dav: Fix handling of chunked WebDAV upload
2019-03-05 10:05:25 +01:00
0f95b95a24
Merge pull request #14516 from nextcloud/backport/14499/stable15
...
[stable15] Do not cut full color on accessibility svg color invert
2019-03-05 10:02:28 +01:00
ec9e82a689
Merge pull request #14521 from nextcloud/backport/14514/stable15
...
[stable15] Do not just write foobar
2019-03-05 10:00:44 +01:00
3d5904b5cc
Do not just write foobar
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 20:26:59 +00:00
b89b7ae885
Merge pull request #14512 from nextcloud/smb-3.0.2-15
...
update icewind/smb to 3.0.2
2019-03-04 17:45:25 +01:00
6c5c01974f
dav: Fix handling of chunked WebDAV upload
...
When $data is null (which can happen when $request->getBodyAsStream() returns
null), the Exceptions says "copied bytes: 0, expected filesize: 0", which
sounds more like success...
2019-03-04 16:44:21 +00:00
2ca4473e28
Do not cut full color on accessibility svg color invert
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 16:40:03 +00:00
af15979eb9
Merge pull request #14503 from nextcloud/backport/stable15/14390
...
[stable15] Fix expire date change eventhandler
2019-03-04 17:35:57 +01:00
594075f841
update icewind/smb to 3.0.2
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-04 16:40:45 +01:00
e1ef77be98
Add handler for change event of the expire date field
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-04 13:00:43 +01:00
4ee9069b7e
Merge pull request #14472 from felixn/stable15
...
Fix for issue #13319 : load oc-backbone-webdav before loading versions app
2019-03-04 12:19:34 +01:00
e2462626e6
Merge pull request #14497 from nextcloud/backport/14494/stable15
...
[stable15] Make header.feature more robust by running it on apache
2019-03-04 11:33:53 +01:00
a4908e28ba
Merge pull request #14495 from nextcloud/backport/14440/stable15
...
[stable15] Run tests that fail with "no such process" over to apache server
2019-03-04 11:32:37 +01:00
2dc7d375d2
Make header.feature more robust by running it on apache
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 10:08:54 +00:00
b8b0f492f7
Run tests that fail with "no such process" over to apache server
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 09:23:18 +00:00
71b5b9678c
Merge pull request #14490 from nextcloud/backport/14489/stable15
...
[stable15] Add accessibility translations
2019-03-03 23:24:37 +01:00
22ff4c566f
Add accessibility translations
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 22:23:45 +00:00
1f3dfc4949
Merge pull request #14462 from nextcloud/backport/14456/stable15
...
[stable15] Fix a bug with smb notify having leading slash when it should not
2019-03-03 13:46:31 +01:00
b0c0bf84f6
Fix for issue #13319 : load oc-backbone-webdav before loading versions app
...
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-03-02 15:54:20 +01:00
054637f731
Fix a bug with smb notify having leading slash when it should not
...
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-01 20:04:31 +00:00
068b754d31
[tx-robot] updated from transifex
2019-03-01 01:12:48 +00:00
d067cf4116
Merge pull request #14438 from nextcloud/backport/14318/stable15
...
[stable15] Fix referrer policy meta tags.
2019-02-28 16:13:22 +01:00
c60f8248fe
Remove additional referrer policy meta tag.
...
Signed-off-by: Dominik Wasielewski <d-wasi@web.de>
2019-02-28 12:47:08 +00:00
80dfe0f484
Remove unnecessary meta tags.
...
Signed-off-by: Dominik Wasielewski <d-wasi@web.de>
2019-02-28 12:47:08 +00:00
2184cc4970
Merge pull request #14387 from nextcloud/backport/14346/stable15
...
[stable15] fix(EMailTemplate): malformed HTML in some cases
2019-02-28 13:45:38 +01:00
988524d6b9
Merge pull request #14414 from nextcloud/backport/13844/stable15
...
[stable15] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
2019-02-28 09:43:17 +01:00
92d0c28de4
Merge pull request #14376 from nextcloud/backport/13514/stable15
...
[stable15] Fix grid toggle button on public page
2019-02-28 09:42:02 +01:00
Arthur Schiwon
Roland Tapken
Roeland Jago Douma
Roeland Jago Douma
Morris Jobke
Daniel Kesselberg
Julius Härtl
Joas Schilling
Jan-Philipp Litza
John Molakvoæ (skjnldsv)
Robin Appelman
Felix Nieuwenhuizen
Ari Selseng
Nextcloud bot
Dominik Wasielewski