wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
48882 commits 157 branches 562 tags 714 MiB
Commit graph

48882 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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