Morris Jobke
8abf6e0ed1
fixed code
2016-06-20 18:50:56 +02:00
Vincent Petry
9edcdb33c7
Merge pull request #24950 from owncloud/stable9-fixdynamicldapgroupaccess
...
[stable9] Fixed dynamic group ldap access
2016-06-10 11:07:28 +02:00
Vincent Petry
fba4460342
Add unit test for LDAP multi group caching
2016-06-09 18:02:09 +02:00
Vincent Petry
b37f2e230b
Use array_merge when reading cached groups members
2016-06-08 11:24:22 +02:00
Roeland Jago Douma
0efe3ba62e
Use a capped memory cache for the user/group cache
...
For #24403
When upgrading huge installations this can lead to memory problems as
the cache will only grow and grow.
Capping this memory will make sure we don't run out while during normal
operation still basically cache everything.
2016-06-01 21:31:14 +02:00
Arthur Schiwon
087f005936
formatting, white-space changes only
2016-06-01 16:28:02 +02:00
alexweirig
f112ece1f2
fixed possible indention problem
...
spaces -> tab conversion
2016-06-01 16:27:57 +02:00
alexweirig
c342dcbcee
Fixing group handling
...
added back the cache processing and fixed
2016-06-01 16:27:52 +02:00
alexweirig
6d74ef71b5
Fixed dynamic group ldap access
...
getUserGroups:
Using $userDN instead of $uid to query LDAP
Converting groupDN to group name using API instead of substring
Removing cache processing at the end of the method
2016-06-01 16:27:42 +02:00
Thomas Müller
750aeda8b7
Yo-ho-oh - Murder all band 'o pirates - backport of #24550
2016-05-11 11:22:08 +02:00
Thomas Müller
80a31b7565
Merge pull request #24242 from owncloud/stable9-backport-24052
...
[stable9] Fix LDAP race conditions
2016-04-26 14:34:57 +02:00
Morris Jobke
5b126cde48
Fix LDAP race conditions
...
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
return only non-null values
2016-04-25 13:32:40 +02:00
Arthur Schiwon
8ebde1e74d
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-25 12:41:52 +02:00
Thomas Müller
af7c34d9a6
Merge pull request #23401 from owncloud/backport-23282-stable9
...
[stable9] fix writing to cache when fallback server should be used immediately
2016-03-24 13:30:44 +01:00
Thomas Müller
656c7f38b6
Merge pull request #23478 from owncloud/backport-l10n
...
Backport translations to stable9
2016-03-22 17:44:59 +01:00
Joas Schilling
4fdb2254a4
Backport translations to stable9
2016-03-22 13:10:33 +01:00
Arthur Schiwon
f6b6813f5f
Avatar must be saved after login is done and external storages set up properly, fixes #21555
2016-03-21 22:20:50 +01:00
Arthur Schiwon
d282affec2
fix writing to cache when fallback server should be used immediately
2016-03-18 20:34:23 +01:00
Arthur Schiwon
38d137c34c
remove deprecated ldap_sort
2016-03-10 17:08:25 +01:00
Arthur Schiwon
dd556d77da
untangle different user manager instances, fixes #22770
2016-03-03 17:26:52 +01:00
Lukas Reschke
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Jenkins for ownCloud
5800585039
[tx-robot] updated from transifex
2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c
[tx-robot] updated from transifex
2016-02-28 01:55:12 -05:00
Thomas Müller
dfaebc36d2
Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
...
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Jenkins for ownCloud
32f4bea0ae
[tx-robot] updated from transifex
2016-02-25 01:58:06 -05:00
Arthur Schiwon
b9b85e32be
take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled.
2016-02-24 21:32:03 +01:00
Jenkins for ownCloud
fe29feae9a
[tx-robot] updated from transifex
2016-02-17 01:56:11 -05:00
Thomas Müller
fd21bfd9e8
Merge pull request #22358 from owncloud/fix-22278
...
Fix race condition when switching filter mode. Fixes #22278
2016-02-15 12:02:35 +01:00
Jenkins for ownCloud
be34cea970
[tx-robot] updated from transifex
2016-02-15 01:55:28 -05:00
Jenkins for ownCloud
2344c8e07d
[tx-robot] updated from transifex
2016-02-13 01:55:39 -05:00
Arthur Schiwon
62aac81c45
Fix race condition when switching filter mode. Fixes #22278
2016-02-12 21:51:06 +01:00
Jenkins for ownCloud
f8607ac132
[tx-robot] updated from transifex
2016-02-12 01:56:04 -05:00
Jenkins for ownCloud
5165998723
[tx-robot] updated from transifex
2016-02-11 01:55:35 -05:00
Jenkins for ownCloud
9ebcc4ce31
[tx-robot] updated from transifex
2016-02-10 01:56:05 -05:00
Arthur Schiwon
d19c47a381
More fixed tests :)
2016-02-09 18:11:30 +01:00
Arthur Schiwon
3a796d1e15
Consolidate getQuota and setQuota methods in User instance
2016-02-09 17:16:43 +01:00
Jenkins for ownCloud
e749a02e6b
[tx-robot] updated from transifex
2016-02-09 01:55:36 -05:00
Jenkins for ownCloud
4130639a7e
[tx-robot] updated from transifex
2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0
[tx-robot] updated from transifex
2016-02-07 01:55:33 -05:00
Thomas Müller
69a4cd2898
Merge pull request #22102 from owncloud/ldap_2nddispname-master
...
[LDAP] add second field for additional/optional display name attribute
2016-02-06 13:27:01 +01:00
Jenkins for ownCloud
9fa09b67e6
[tx-robot] updated from transifex
2016-02-06 01:55:36 -05:00
Arthur Schiwon
e370b601db
fix unit tests
2016-02-03 22:45:33 +01:00
alexweirig
cd19b648c6
change error logging
...
replaced variable with print_r call
2016-02-03 21:50:27 +01:00
alexweirig
f4d4bed10b
Fixed undefined variable $dnGroup and variable name
...
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.
I think this makes more sense.
2016-02-03 21:50:27 +01:00
alexweirig
39aac2c66b
Refactored code to avoid performance problem
...
Moved the dynamic group processing to the top and removed condition in memberOf processing.
Also, changed variable name $value to $memberUrl
2016-02-03 21:50:27 +01:00
Alex Weirig
0d797637f3
code changes for user_ldap Dynamic Group Membership
...
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.
Added public function getDynamicGroupMembers.
Updated function _groupMembers.
Updated function getUserGroups.
2016-02-03 21:50:27 +01:00
Arthur Schiwon
c1871f5787
Port of test_ldap_2nddispname to master
2016-02-03 13:55:39 +01:00
Jenkins for ownCloud
92a1d1c0e3
[tx-robot] updated from transifex
2016-02-03 01:55:26 -05:00
Jenkins for ownCloud
9861a7f6cc
[tx-robot] updated from transifex
2016-02-02 01:55:41 -05:00