Commit Graph

48638 Commits

Author SHA1 Message Date
Arthur Schiwon dfc7007242
with LDAP server set offline, config cannot be controlled via ocs anymore
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-05 23:13:49 +01:00
Arthur Schiwon 5dd2207c95
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-05 11:07:40 +01:00
Roland Tapken 459b8a4845
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:40 +01:00
Roland Tapken e7c506cff1
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-05 11:07:40 +01:00
Roland Tapken afb182650e
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-05 11:07:40 +01:00
Roland Tapken c2d8a36d9a
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-05 11:07:35 +01:00
Morris Jobke 1aad0100b5
Merge pull request #14529 from nextcloud/regression/13491/fix-missing-dependency
Fix missing $config dependency in RetryJob
2019-03-05 11:01:39 +01:00
Morris Jobke 1a92142051
Merge pull request #14528 from nextcloud/bugfix/noid/fix-database-configuration
Fix database configuration
2019-03-05 11:00:38 +01:00
Morris Jobke a4585b35c0
Fix missing $config dependency in RetryJob
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 10:08:27 +01:00
Morris Jobke 679afa251b
Merge pull request #14519 from nextcloud/feature/config-undefined
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
2019-03-05 10:06:09 +01:00
Morris Jobke ede5f4486a
Merge pull request #14470 from felixn/master
use node API for free space calculation in versions app
2019-03-05 09:40:11 +01:00
Joas Schilling c32c91d1da
Fix whitespaces
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 09:31:45 +01:00
Joas Schilling e18cc22ed9
Fix database configuration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 09:28:36 +01:00
Morris Jobke c72b442203
Merge pull request #14501 from nextcloud/version/noid/16.0.0-alpha-1
16.0.0 Alpha 1
2019-03-04 22:23:55 +01:00
Roeland Jago Douma 243bc96ad9
Merge pull request #14480 from cowai/reconnect-db-notify
Reconnect to DB after timeout for Notify command. Fixes #14479
2019-03-04 21:36:12 +01:00
Roeland Jago Douma eb175584f6
Merge pull request #14514 from nextcloud/fix/no_debug_output
Do not just write foobar
2019-03-04 21:26:20 +01:00
Daniel Kesselberg 7406f42fdf
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-04 19:12:46 +01:00
Morris Jobke 79ec7bbcf6
Merge pull request #13871 from PLUTEX/master
dav: Fix handling of chunked WebDAV upload
2019-03-04 17:43:31 +01:00
Morris Jobke 36b7fc7bef
Merge pull request #14499 from nextcloud/fix/svg-api/dark-mode
Do not cut full color on accessibility svg color invert
2019-03-04 17:39:24 +01:00
Morris Jobke 3b155c8f14
Merge pull request #14510 from nextcloud/smb-3.1.1
update icewind/smb to 3.1.1
2019-03-04 17:17:19 +01:00
Roeland Jago Douma c8d1b29407
Do not just write foobar
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 17:14:32 +01:00
Robin Appelman 41f8bfbe93
update icewind/smb to 3.1.1
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-04 16:41:22 +01:00
Ari Selseng 1ac9a9a1bb Correct log attribute
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 15:02:15 +01:00
Roeland Jago Douma 138fdf0793
Merge pull request #13401 from nextcloud/improve-lookup-server-behaviour
improve lookup server behaviour
2019-03-04 14:25:24 +01:00
Ari Selseng 3218e0f70d Added logging to Notify command.
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 14:23:13 +01:00
Morris Jobke bbb168a8ba
Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-setting
Remove the upload and memory setting
2019-03-04 13:32:37 +01:00
Morris Jobke daee222534
Merge pull request #12978 from tobiasKaminsky/noteOnDav
Add note to dav endpoint
2019-03-04 12:58:09 +01:00
Morris Jobke 51202c9768
16.0.0 Alpha 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 12:45:49 +01:00
Joas Schilling c6a69ba925
Remove the upload and memory setting
* Remove unneeded private method phpFileSize()
* Bump autoloader
* Remove setUploadLimit tests
* Remove integrity check hacks for upload limit

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 12:14:22 +01:00
Morris Jobke 814bf0de20
Merge pull request #14493 from nextcloud/tech-debt/noid/remove-php5-config
Remove unused php5 config from .htaccess
2019-03-04 12:07:40 +01:00
John Molakvoæ (skjnldsv) 3bb2c87648
Do not cut full color on accessibility svg color invert
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 11:24:23 +01:00
Morris Jobke 92b5743bf4
Remove unused php5 config from .htaccess
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 11:24:10 +01:00
Morris Jobke 358c9e649b
Merge pull request #14494 from nextcloud/tests/noid/make-header.feature-more-robust
Make header.feature more robust by running it on apache
2019-03-04 11:08:13 +01:00
Morris Jobke 4b2efd94f9
Make header.feature more robust by running it on apache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-04 10:22:16 +01:00
Morris Jobke b41ae8c98a
Merge pull request #14484 from nextcloud/fix/users-and-groups/vue-multiselect
Fix/users and groups/vue multiselect
2019-03-04 10:19:57 +01:00
Roeland Jago Douma aa69b9d67d
Merge pull request #14465 from nextcloud/dependabot/npm_and_yarn/vue-multiselect-2.1.4
Bump vue-multiselect from 2.1.3 to 2.1.4
2019-03-04 10:00:22 +01:00
dependabot[bot] fc64871c7d
Bump vue-multiselect from 2.1.3 to 2.1.4
Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/shentao/vue-multiselect/releases)
- [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.3...2.1.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 09:27:06 +01:00
John Molakvoæ feefb0ca89
Merge pull request #14467 from nextcloud/dependabot/npm_and_yarn/vue-and-vue-template-compiler-2.6.8
Bump vue and vue-template-compiler
2019-03-04 09:17:57 +01:00
Roeland Jago Douma 35d5d57839
Merge pull request #14468 from nextcloud/fix/inline-input-confirm-button
Fix default input element height
2019-03-04 08:49:41 +01:00
John Molakvoæ (skjnldsv) cf37899bca
Build
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 08:47:10 +01:00
Christoph Wurst aee348c5f5
Update apps/dav/lib/Connector/Sabre/Node.php
Co-Authored-By: tobiasKaminsky <tobias@nextcloud.com>
2019-03-04 08:24:14 +01:00
Morris Jobke c706009ced
Merge pull request #14488 from nextcloud/fix/dav/has-photo
Fix dav has-photo plugin extend
2019-03-03 23:23:16 +01:00
Morris Jobke 3b9ced22dc
Merge pull request #14489 from nextcloud/fix/accessibility/l10n
Add accessibility translations
2019-03-03 23:22:06 +01:00
John Molakvoæ (skjnldsv) a3447ed49a
Add accessibility translations
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 19:49:44 +01:00
John Molakvoæ (skjnldsv) d6e9a2ea15
Fix dav has-photo plugin extend
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 19:06:22 +01:00
John Molakvoæ (skjnldsv) 584d52bf08
Settings build update
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 11:49:34 +01:00
John Molakvoæ (skjnldsv) 92dd5a6c41
Use nextcloud-vue multiselect
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-03 11:48:39 +01:00
Ari Selseng 71a0cdceaa Reconnect to DB after timeout for Notify command. Fixes #14479
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-03 01:36:27 +01:00
Felix Nieuwenhuizen 56457505af set availableSpace to 0 if userFolder not found
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-03-02 13:55:11 +01:00
Felix Nieuwenhuizen 0f43d1dfaa use node API for free space calculation in versions app (same method as trashbin app)
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
2019-03-02 13:44:47 +01:00