upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
31851 commits 1035 branches 1221 tags 8.3 GiB
Commit graph

133 commits

Author SHA1 Message Date
Joas Schilling
ca6a7d9e6a
Run the license script 2016-07-22 09:48:05 +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
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
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
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
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
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Arthur Schiwon
133e3fe89d remove uselessly used parameter, read all user attributes also when looking up users in groups 2015-11-06 15:21:56 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Lukas Reschke
733542a264 Fix style 2015-10-16 10:36:38 +02:00
Frédéric Fortier
f178f612d8 Revert "adjust to nested group fix 
This reverts commit 845485cfe, which fixes #19816 regression.
 2015-10-16 09:39:07 +02:00
Arthur Schiwon
2fddb1367a fix primary group retrieval 2015-10-09 14:12:59 +02:00
Arthur Schiwon
a876efda50 treat dn as any other attribute when building the search() return array 2015-10-08 21:18:34 +02:00
Arthur Schiwon
dd2e887a8d adjust handling changed return array structure from search() and fetchList() 2015-10-08 20:32:15 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Arthur Schiwon
845485cfe6 adjust to nested group fix 2015-09-23 16:38:39 +02:00
Morris Jobke
27af0e82dd Merge pull request #18042 from GreenArchon/master 
Properly nest groups when using memberOf to detect group membership, …
 2015-08-26 11:42:47 +02:00
Frédéric Fortier
a55f233e9f fix more review comments for #18042 / #17759 2015-08-07 08:59:12 -04:00
Frédéric Fortier
e0469d0013 Take review comments into consideration for pr #18042 / issue #17759 2015-08-04 11:19:57 -04:00
Frédéric Fortier
7604bcb3cb Properly nest groups when using memberOf to detect group membership, fixes #17759 2015-08-03 20:15:22 -04:00
Morris Jobke
933f087d21 Merge pull request #17526 from owncloud/fix-17516 
LDAP: when checking group for matching filter, also take base DN into…
 2015-07-27 08:38:45 +02:00
blizzz
bfb90d10ed Merge pull request #17046 from nicolas-grekas/fix-16654 
Do not use OC*::mb_*_replace(), they are useless
 2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Arthur Schiwon
bfdf39b9bd LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516 2015-07-09 12:19:04 +02:00
Arthur Schiwon
8625a8cf23 ensure groups match filter when using memberOf to read users group, refs #17119 2015-06-26 16:42:11 +02:00
Arthur Schiwon
090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Arthur Schiwon
76dfc87227 add primary group users to resultset before caching 2015-05-19 12:56:07 +02:00
Arthur Schiwon
6b218039ba Fixes returns of group memberships and counting if all members have the specific groups as primary set. 2015-05-19 12:56:07 +02:00
Arthur Schiwon
460a78436f move away from deprecated consts 2015-04-20 11:22:11 +02:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Arthur Schiwon
7520d0fb3d offset needs to be considered in computed limit 2015-03-23 16:51:40 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Lukas Reschke
52495dc995 Merge pull request #13740 from owncloud/fix-12190-2 
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
 2015-02-24 16:37:49 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Arthur Schiwon
73600cfdd8 and escape the search term 2015-01-29 00:27:05 +01:00
Arthur Schiwon
953a88785b 💄 2015-01-28 23:57:04 +01:00
Arthur Schiwon
31de757514 fix counting of users in primary group 2015-01-28 15:52:59 +01:00
Arthur Schiwon
4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon
5170dc3ae6 fix retrievel of group members and cache group members 
fix changed variable name
 2014-10-17 20:14:52 +02:00
Vincent Petry
59f9107dd9 Log warning when no uid was found for user 
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
 2014-10-09 14:58:53 +02:00
Vincent Petry
f7fc0067e0 Revert "[WIP] fix retrieval of group members and cache group members" 2014-10-09 11:06:48 +02:00
Arthur Schiwon
3b3ad0bc4f fix changed variable name 2014-10-01 21:44:36 +02:00