Commit Graph

49195 Commits

Author SHA1 Message Date
Roeland Jago Douma 1b27e9578d
Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmp
Use a tmp file for swift writes
2019-03-06 15:33:15 +01:00
Morris Jobke 540ec4f3df
Merge pull request #14563 from nextcloud/fix/jquery-version
Pin the jquery version to 2.1.4
2019-03-06 15:32:48 +01:00
Morris Jobke 65b0e2727d
Merge pull request #14561 from Nutomic/wrong-username-message
Change login error message to "wrong username or password"
2019-03-06 15:26:12 +01:00
Ari Selseng d16cfb519e Avoid calculating folder size for parent that needs scan.
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-06 15:23:37 +01:00
Morris Jobke 5c6a46314a
Fix transifex sync for files_sharing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 15:02:07 +01:00
Morris Jobke 7479de71e7
Merge pull request #14567 from nextcloud/fix/noid/transifex-excludes
Update generated webpack files to .l10nignore
2019-03-06 14:42:48 +01:00
Morris Jobke 88f0697cb9
Update generated webpack files to .l10nignore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 14:27:11 +01:00
Morris Jobke d77bab9a26
Merge pull request #14560 from nextcloud/tests/noid/fully-check-compliant-apps
Fully check compliant apps
2019-03-06 14:00:10 +01:00
Christoph Wurst 9549d79faa
Pin the jquery version to 2.1.4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-03-06 12:22:49 +01:00
Felix Ableitner 1c1cd10f0d Change login error message to "wrong username or password" (fixes #14460)
Signed-off-by: Felix Ableitner <me@nutomic.com>
2019-03-06 11:59:03 +01:00
Morris Jobke bdf95ef0ec
Merge pull request #14558 from nextcloud/fix/13790/fix-comment
Fix unnecessary boolean cast
2019-03-06 11:42:14 +01:00
Joas Schilling e13253c66a
"Fix" the unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-06 11:06:03 +01:00
Morris Jobke d004164fcc
Merge pull request #13327 from nextcloud/allow-bracket-notation-for-remove-ipv6-address
Allow bracket IPv6 address format inside IPAdress Normalizer
2019-03-06 10:34:02 +01:00
Morris Jobke 58f6a777b1
Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa
Clear backupcode reminder when no 2fa
2019-03-06 10:16:58 +01:00
Morris Jobke 4b49e2eb52
Fix unnecessary boolean cast
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 10:12:58 +01:00
Morris Jobke fde4c54136
Merge pull request #13790 from fretn/master
Fix for crashing occ files:scan
2019-03-06 10:12:14 +01:00
Arthur Schiwon e36cede994
remove unused use statement
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-06 00:34:29 +01:00
Arthur Schiwon 987db8e6c5
add missing config bits to integration tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-06 00:09:23 +01:00
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
Morris Jobke 7fa0615e6d
Merge pull request #14541 from nextcloud/ci/noid/disable-fragile-tests
Disable fragile tests for now
2019-03-05 22:31:38 +01:00
Roeland Jago Douma 3d17ab0936
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-05 20:21:37 +01:00
Roeland Jago Douma 1c29a01956
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-05 20:14:16 +01:00
Roeland Jago Douma c1c594f2ad
Merge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-test
Reduce errors in checker tests
2019-03-05 19:53:26 +01:00
Morris Jobke debd32b461
Merge pull request #14175 from skydiablo/master
Fix ObjectStorage expired token (v3)
2019-03-05 18:59:45 +01:00
Joas Schilling a788da6ac2
Make the file strict
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 18:01:14 +01:00
Joas Schilling c5ab74348c
Avoid duplicate App container creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 17:55:35 +01:00
Morris Jobke a4b34abe45
Merge pull request #14373 from nextcloud/ci/noid/add-bundle-test
Add test for updated CA bundle
2019-03-05 17:14:01 +01:00
Morris Jobke a48043f8c9
Merge pull request #14544 from nextcloud/fix/admin-2fa-settings-leftover
Remove leftover input that causes undefined index errors
2019-03-05 16:25:39 +01:00
Morris Jobke dd2496b275
Use proper dependency injection for app manager
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:00:47 +01:00
Morris Jobke 789aaa489d
Fix whitespace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:48:50 +01:00
Morris Jobke 8322cec951
Suppress phan exceptions because they are catched by a class_exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:46:56 +01:00
Daniel Kesselberg 75337ff621
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-05 15:20:47 +01:00
Morris Jobke 2bbef58153
Add test for updated CA bundle
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:10:33 +01:00
Christoph Wurst 4fb896b2a1
Remove leftover input that causes undefined index errors
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-03-05 14:53:39 +01:00
Morris Jobke 36c750ae1e
Merge pull request #14451 from nextcloud/bugfix/noid/error-message-on-password-change
Check if password can be changed for the users backend in OCS api
2019-03-05 14:27:22 +01:00
Morris Jobke 40e04c8391
Disable fragile tests for now
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 14:23:08 +01:00
Morris Jobke 97aa7c4ced
Fully check compliant apps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 14:06:38 +01:00
Morris Jobke cacb6279c4
Reduce errors in checker tests by creating the data dir
* only created if it doesn't exist yet

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 13:53:03 +01:00
Julius Härtl add43bc19c
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:44:25 +01:00
Morris Jobke c91ae1133e
Merge pull request #14502 from nextcloud/feature/noid/add-activities-for-group-membership-changes
Add activities for group membership changes
2019-03-05 11:22:31 +01:00
Morris Jobke 5decee6887
Merge pull request #14302 from nextcloud/enhancement/noid/fulltextsearch-final-class
nc16/fulltetsearch: moving final class to private, new interface in public
2019-03-05 11:21:44 +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 d3d885f9fd
Dump autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 10:40:02 +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