Commit graph

359 commits

Author SHA1 Message Date
Arthur Schiwon
a1aff3e8a1 LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors 2013-09-27 13:34:16 +02:00
Arthur Schiwon
81cf4a22ef LDAP: coding style 2013-09-27 13:34:15 +02:00
Arthur Schiwon
bb162b1f94 LDAP: get rid of some PHP Warnings 2013-09-27 13:34:15 +02:00
Arthur Schiwon
d4f92494a2 LDAP: make Access be a dependency to the user and group backend instead of inheriting it. 2013-09-27 13:34:15 +02:00
Arthur Schiwon
f04aa1af5d LDAP: don't check var type when you can specify the type in the parameter list 2013-09-27 13:34:15 +02:00
Arthur Schiwon
b9cd22cf78 LDAP: use wrapper, not direct function call 2013-09-27 13:34:15 +02:00
Arthur Schiwon
5090ca3eb4 LDAP: add phpdoc 2013-09-27 13:34:15 +02:00
Arthur Schiwon
6e850e0bee LDAP: establish wrapper interface to allow proper mocking 2013-09-27 13:34:15 +02:00
Arthur Schiwon
52454e39b7 LDAP: move is_resource check to ldap wrapper to make it mockable 2013-09-27 13:34:15 +02:00
Arthur Schiwon
d34fbf3a86 LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing 2013-09-27 13:34:15 +02:00
Arthur Schiwon
1a020e0696 Resolve merge conflict 2013-09-27 13:34:15 +02:00
Arthur Schiwon
321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Arthur Schiwon
c482512e23 LDAP: fix wrong hook name 2013-08-22 00:00:33 +02:00
Kondou
c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Bart Visscher
dda5eb2530 Merge pull request #4486 from owncloud/ldap_adjust_cache
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Jan-Christoph Borchardt
ce9103d522 Merge pull request #4426 from owncloud/ldap_settings_design
Ldap settings design
2013-08-18 01:52:51 -07:00
Arthur Schiwon
f41c4312ff LDAP: use memcache if available 2013-08-17 17:22:54 +02:00
Arthur Schiwon
c538ac3081 LDAP: only connect to LDAP once on login 2013-08-17 12:16:51 +02:00
Arthur Schiwon
479f893f6d LDAP: Show Host name in configuration drop down 2013-08-15 15:55:06 +02:00
Arthur Schiwon
f6d133955e LDAP: fix background job, resolves #3528 2013-07-19 18:41:29 +02:00
Arthur Schiwon
5387e5c354 LDAP: even better check for emptiness, fixes #3815 2013-07-10 11:39:47 +02:00
Jörn Friedrich Dreyer
88fc410c19 fix numRows usage in user_ldap 2013-06-24 16:29:58 +02:00
Arthur Schiwon
4976f2e0d3 LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 2013-06-04 10:32:54 +02:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
blizzz
1656cc2e7c Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
Fix ldap sqlite n js
2013-05-31 12:17:46 -07:00
blizzz
eafb241068 Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
Fix ldap offline host handling
2013-05-31 11:10:33 -07:00
Arthur Schiwon
2ff9677cd1 LDAP: sqlite compatibility for emptyiing tables 2013-05-31 20:07:13 +02:00
Arthur Schiwon
bd7771867b LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links 2013-05-30 16:55:21 +02:00
Arthur Schiwon
86d72b9a61 LDAP: fix possible recursion 2013-05-25 11:03:58 +02:00
Arthur Schiwon
bfa715768a LDAP: fix handling when LDAP Host is offline 2013-05-25 11:02:51 +02:00
Arthur Schiwon
beaa10b823 Merge branch 'master' into ldap_configurable_username_n_uuid 2013-05-13 12:41:22 +02:00
Arthur Schiwon
796ee8c4c0 LDAP: Implement clear mappings functionality 2013-05-08 17:47:07 +02:00
Arthur Schiwon
3f1717d3d5 LDAP: implement UUID and internal username override 2013-05-08 14:56:52 +02:00
Arthur Schiwon
c9b3da5bbc LDAP: better variable name 2013-05-08 14:55:56 +02:00
Arthur Schiwon
bc23010670 LDAP: implement r+w for new settings 2013-05-08 14:05:08 +02:00
Bart Visscher
175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
Arthur Schiwon
d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +02:00
Arthur Schiwon
1e2b872160 LDAP: cachekey in set method needs to match with that one from get 2013-05-03 15:13:37 +02:00
Arthur Schiwon
22a8e7ad55 LDAP: remove restriction from group names to be in line with core behaviour again 2013-05-03 14:11:06 +02:00
Robin Appelman
7948341a86 Rework background job system 2013-04-20 23:27:46 +02:00
kondou
d6b13ccd12 Use !== and === in user_ldap app – Part 2 2013-04-20 22:46:37 +02:00
Arthur Schiwon
0f4e02b6fc LDAP: avoid irritating log output 2013-03-19 14:40:30 +01:00
Arthur Schiwon
504f5f229f LDAP: remove unnecessary func call, was a leftover from earlier refactor 2013-03-19 14:40:05 +01:00
Arthur Schiwon
f38932fb80 LDAP: specify appid when selecting from appconfig 2013-03-19 14:39:56 +01:00
Arthur Schiwon
1e07801c95 LDAP: compatibility with Novell eDirectory UUID 2013-03-11 13:30:06 +01:00
Arthur Schiwon
055fadd10d LDAP: escape some more chars for proper search filter, fixes #1673 2013-03-05 14:33:20 +01:00
Arthur Schiwon
b08894ba77 LDAP: error codes can be negative, too 2013-03-05 13:47:03 +01:00
Brice Maron
dbb9b68331 Fix quoting of query for user_ldap ref #1983 2013-03-02 16:26:15 +01:00
Arthur Schiwon
64551ee06f LDAP: sort users on server-side 2013-02-26 22:27:09 +01:00
Frank Karlitschek
f50be25704 Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
2013-02-25 08:23:32 -08:00
Arthur Schiwon
e4e915fa3b LDAP: simplify default for user home settings, fixes wrong display of default value in settings 2013-02-22 21:26:07 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt
90939c8f12 Merge pull request #1708 from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
Arthur Schiwon
a28df74ee5 LDAP: check array with isset first to avoid warnings about undefined index 2013-02-16 02:33:19 +01:00
Bart Visscher
92a36ca8b8 Join short comment lines 2013-02-15 15:45:34 +01:00
Bart Visscher
1ef2ecd6e8 Style cleanup user_ldap 2013-02-14 22:16:48 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Arthur Schiwon
1e45453da2 LDAP: format dn before using it, not other way round. fixes #1605 2013-02-13 14:49:18 +01:00
blizzz
b6ee118841 Merge pull request #1604 from owncloud/fix_ldap_internalname_generation
Improve generation of interal user names resp. group display names
2013-02-12 03:37:40 -08:00
Arthur Schiwon
afc9fe419a adjust copyright 2013-02-10 21:53:27 +01:00
Arthur Schiwon
dbb4be903c LDAP: change generation of internal names. Use UUID for users. Change to sequential numbers for groups as they are still used as display names 2013-02-10 21:52:57 +01:00
Frank Karlitschek
764409117a Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
Arthur Schiwon
15e383fd01 Typo 2013-02-07 16:05:45 +01:00
Arthur Schiwon
781d247b39 LDAP: better detect timeouts. do not try to reconnect. do not try to bind when connection failed. makes ownCloud more responsive, esp. with multiple server connections configured 2013-02-06 14:32:00 +01:00
Arthur Schiwon
e122fdbcb6 LDAP: when ldaps and tls are configured, disable the latter one - they do not work together. ldaps already creates a secure connection. 2013-02-06 14:30:17 +01:00
Arthur Schiwon
af2acadc66 LDAP: fix settings handling of homeFolderNamingRule option 2013-02-06 13:04:35 +01:00
Arthur Schiwon
afacaf8bc2 string fragment was added by accident and does not belong here 2013-01-31 18:00:07 +01:00
Thomas Mueller
19714151e2 spell check 2013-01-31 17:53:01 +01:00
Thomas Mueller
5862f3d140 spell check 2013-01-31 17:51:59 +01:00
Arthur Schiwon
1a854454d6 LDAP: avoid attempts to save null as configvalue 2013-01-31 02:00:29 +01:00
Arthur Schiwon
b5ed8b2751 LDAP: fix wrong index 2013-01-31 01:46:54 +01:00
Arthur Schiwon
b3b0544e17 LDAP: make it possible to define attributes that should be considered on searches 2013-01-31 01:46:34 +01:00
Arthur Schiwon
e8db1e884e LDAP: some inline documentation 2013-01-30 03:44:11 +01:00
Arthur Schiwon
19867b1d08 LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix 2013-01-30 02:39:44 +01:00
Arthur Schiwon
2749a14171 LDAP: make it possible to enable/disable server configurations 2013-01-24 22:39:05 +01:00
Arthur Schiwon
5b9e181198 LDAP: implement deleteConfiguration feature 2013-01-24 14:11:53 +01:00
Arthur Schiwon
3bf38c7a84 LDAP: add missing new LDAP Helper 2013-01-24 13:01:43 +01:00
Arthur Schiwon
319dcd45e1 LDAP: Clear cache on saving settings 2013-01-24 12:44:30 +01:00
Arthur Schiwon
b979bf6f1c LDAP: fix default 2013-01-23 23:46:55 +01:00
Arthur Schiwon
83d9e1e2f0 make sure that Configuration is read when getConfiguration is called. And give back the appropriate result. 2013-01-23 23:40:21 +01:00
Arthur Schiwon
10876aba89 fix more config keys for save settings handling 2013-01-20 18:30:14 +01:00
Arthur Schiwon
0c3466325b fix continue in switch, add another key to skip 2013-01-20 18:27:39 +01:00
Arthur Schiwon
6d84aa93d3 Ajaxifiy Settings Save 2013-01-20 18:02:44 +01:00
Arthur Schiwon
229a25f41a fix mixed key and value 2013-01-18 13:53:26 +01:00
Arthur Schiwon
229d484200 LDAP: gather defaults in one place, simplify readConfiguration 2013-01-18 13:35:40 +01:00
Arthur Schiwon
d8be83029b make sure port is used as backup port if not specified. documentation. determine connection error earlier. 2013-01-17 13:56:37 +01:00
Arthur Schiwon
59a6068246 fix undeclared variable 2013-01-17 13:46:32 +01:00
Arthur Schiwon
3d56cf3a5b LDAP: add support for backup/replica servers 2013-01-17 13:31:14 +01:00
Arthur Schiwon
4699f36e44 LDAP: fix read configuration, remove unnecessary debug output 2013-01-16 14:58:49 +01:00
Arthur Schiwon
ad1113c2cb LDAP: fix parameter passed not as expected 2013-01-16 14:56:57 +01:00
Arthur Schiwon
09c54722a8 add LDAP User and Group proxies to suppoer multiple servers 2013-01-11 18:13:22 +01:00
Arthur Schiwon
fab5817f67 documentation for the Connection constructor 2013-01-10 23:34:24 +01:00
Arthur Schiwon
0784bcb8d7 introduce configPrefix to allow settings for multiple LDAP servers 2013-01-10 23:30:26 +01:00
Arthur Schiwon
4a8c25eef5 dechex not necessary, do not waste time with it 2013-01-08 19:25:19 +01:00
Arthur Schiwon
19fa78d1ee Code style 2013-01-08 19:00:49 +01:00
Arthur Schiwon
ec1caa7d35 support LDAP search using multiple base DNs also with paged results, implements #395 2013-01-04 23:57:55 +01:00
Arthur Schiwon
81489ad860 support multiple base DNs 2013-01-03 21:38:53 +01:00
Arthur Schiwon
3b82be5e64 Base DNs will be used as array, now, to support usage of multiple DNs 2013-01-03 21:18:21 +01:00
Bart Visscher
df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher
68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher
f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher
8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
blizzz
680ff3a51b Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
Lorenzo M. Catucci
de34f771c2 Exclude LDAP backend from global user searches
triggered by itself.
2012-12-07 17:19:30 +01:00
Arthur Schiwon
4cb760a924 LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn (#631) 2012-12-03 12:55:42 +01:00
Arthur Schiwon
495a8da354 port 95cee0e from stable45 2012-11-21 19:29:56 +01:00
Arthur Schiwon
aebd4fd32d port dd694b5 from stable45 2012-11-21 19:28:29 +01:00
Arthur Schiwon
24e13419a3 LDAP: escape values in the DN, fixes #419 2012-11-21 19:25:10 +01:00
Arthur Schiwon
d79e9a2da7 LDAP: cherrypick objectGUID handling from stable45, was part of PR 344 2012-11-12 17:00:23 +01:00
Arthur Schiwon
6339e71bdc LDAP: fix typo in config value handling. 2012-11-06 20:16:37 +01:00
blizzz
64ac208fb2 Merge pull request #258 from wardragon/ldap_existence_check_no_refactor
LDAP: improved object existence check
2012-11-06 07:24:15 -08:00
Lorenzo M. Catucci
ca24f4767b Return an empty array on succesful existence check 2012-11-05 17:35:09 +01:00
Lorenzo M. Catucci
510191db68 Return true or false from readAttribute if $attr is empty
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Arthur Schiwon
3f85432df9 LDAP: make filter in readAttribute configurable 2012-10-27 19:43:07 +02:00
Arthur Schiwon
5b3c9518dc LDAP: improve slicing 2012-10-27 17:46:01 +02:00
Arthur Schiwon
33aa630af3 LDAP: add error handling for failed searches 2012-10-27 17:46:01 +02:00
Arthur Schiwon
b942c1253e remove TODO comment, it's done 2012-10-27 17:46:01 +02:00
Arthur Schiwon
605281da9b LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow. 2012-10-27 12:19:08 +02:00
Arthur Schiwon
ee6fc22d4b LDAP: sourced out paged search init into initPagedSearch method, making search slicker again 2012-10-27 12:19:08 +02:00
Arthur Schiwon
84130b885f LDAP: add support for paged searches. 2012-10-26 21:54:34 +02:00
Arthur Schiwon
fc446d0af4 LDAP: know, wether server supports paged search 2012-10-26 21:54:34 +02:00
Arthur Schiwon
3f78a8190f LDAP: check for resource before unbinding 2012-10-26 21:54:34 +02:00
Felix Moeller
e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Arthur Schiwon
800fd5fd79 LDAP: check if index is set, fix Notices 2012-10-15 17:17:37 +02:00
Arthur Schiwon
33e9399ba3 LDAP: fix sharing doesn't work with ldap groups, oc-1819 2012-10-01 18:27:58 +02:00
Arthur Schiwon
2a7a928ae9 LDAP: replace expensive recursiveArraySearch with direct SQL search, leading to a performance boost. Imorives UX especially on directories with tons of users, solves complains on ML and probably fixes oc.1080 2012-09-21 13:03:28 +02:00
Arthur Schiwon
57c02d16ca LDAP: add forgotten class, fixes oc-1803 2012-09-20 16:59:28 +02:00
Arthur Schiwon
f66c441f77 LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625 2012-09-19 15:37:05 +02:00
Arthur Schiwon
6444c27e6a LDAP: fix MySQL-query with DUAL table by removing wrong backticks. Got broke when they were added to SQL queries. 2012-09-17 22:50:08 +02:00
Arthur Schiwon
224e55e590 LDAP: fix debug message with undefined variable 2012-08-29 19:37:18 +02:00
Arthur Schiwon
741a21292e LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method. 2012-08-29 19:37:18 +02:00
Arthur Schiwon
8be8f6fff2 LDAP: Remove unnecessary debug output, fixes a Notice 2012-08-29 19:37:18 +02:00
Arthur Schiwon
4c4aa92eef LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master. 2012-08-29 01:23:51 +02:00
Arthur Schiwon
42a9969304 LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use 2012-08-28 14:24:50 +02:00
Arthur Schiwon
5985d00c6f LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected. 2012-08-27 21:32:56 +02:00
Jörn Friedrich Dreyer
fa3497f6ed add backticks to SQL, use limit parameter instead of LIMIT SQL 2012-08-25 01:52:27 +02:00
Arthur Schiwon
d5c111a984 LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens). 2012-08-23 18:29:43 +02:00
Arthur Schiwon
536fbb9189 LDAP: fix potentially unavailable LDAP resource, which can prevent successful login 2012-08-22 15:22:52 +02:00
Arthur Schiwon
63c454c7b2 LDAP: make refreshInterval for background jobs configurable in the DB 2012-08-22 12:44:46 +02:00
Arthur Schiwon
056d9adb23 LDAP: bg jobs: sane default refresh interval 2012-08-22 12:44:46 +02:00
Arthur Schiwon
c48732987e LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs. 2012-08-22 12:44:46 +02:00
Arthur Schiwon
95c33e466c LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only.
Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
2012-08-05 23:00:47 +02:00
Arthur Schiwon
6fd48675e6 remove accidentally added blank lines 2012-08-05 22:03:47 +02:00
Arthur Schiwon
c3cbb463e3 add missing \ 2012-08-05 21:35:37 +02:00
Arthur Schiwon
d546718179 LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302 2012-08-05 21:28:59 +02:00
Arthur Schiwon
b465fc84ae LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:42:33 +02:00
Arthur Schiwon
6fbed6a588 LDAP: add Test Configuration functionality in the settings 2012-07-26 18:11:12 +02:00
Arthur Schiwon
6c92a85d49 LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced. 2012-07-26 16:11:32 +02:00
Arthur Schiwon
b893aa9567 code style 2012-07-26 16:11:32 +02:00
Arthur Schiwon
b94631de0c LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:40:48 +02:00
Arthur Schiwon
71b862e571 LDAP: replace deprecated constant 2012-07-25 15:11:58 +02:00
Arthur Schiwon
6285cc2604 LDAP: remove debug output 2012-07-25 13:19:07 +02:00
Arthur Schiwon
ab1d9507a9 code style 2012-07-25 13:18:31 +02:00
Arthur Schiwon
b10f7aafb7 LDAP: silence warning, but handle the error 2012-07-25 12:56:09 +02:00
Arthur Schiwon
25ad1d5c3e LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly. 2012-07-25 12:56:09 +02:00