Commit graph

118 commits

Author SHA1 Message Date
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
Arthur Schiwon
4ed926b954 fix retrievel of group members and cache group members 2014-09-18 17:12:35 +02:00
Arthur Schiwon
da490bdbbe support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:32:21 +02:00
Arthur Schiwon
fe0b75ccab also adapt result check from readAttribute 2014-06-27 20:09:16 +02:00
Arthur Schiwon
df7678f01e specify no attribute for group exists check, as done with users 2014-06-27 18:49:11 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Robin McCorkell
e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Andreas Fischer
e04d956cac Remove spaces around | operator in doc block. 2014-05-16 22:21:57 +01:00
Robin McCorkell
a17f9111a0 PHPDoc fixes for user_ldap 2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Arthur Schiwon
45e42c25de Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Bart Visscher
bad41c05b8 Fix PHPdoc in user_ldap
using scrutinizer patch
2014-04-15 21:05:49 +02:00
Arthur Schiwon
142fc5f3af fix return value when a search string was passed to return integer instead of array 2014-04-08 12:53:59 +02:00
Arthur Schiwon
96cb75f5cf implement countUsersInGroup in LDAP group backend 2014-04-08 12:04:38 +02:00
Alexander Bergolth
c76d952dac make getGroupsChunk() protected instead of private 2014-03-13 10:57:19 +01:00
Alexander Bergolth
7f8b04d3e0 adapt coding style 2014-03-13 09:33:07 +01:00