Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e6020d2
adapt info and give its own name
blizzz May 22, 2019
70bbbb2
remove some not needed components
blizzz May 22, 2019
c9b04ec
convert app init script to Application
blizzz May 22, 2019
1b30bc1
namespace adjustments
blizzz May 24, 2019
6a1b379
keep LDAPConnect working like this for now…
blizzz May 29, 2019
8a5fbb0
fix initialisation for now, add LDAPUserManager dep on LDAP provider
blizzz May 29, 2019
7481f16
conditionally, use actor's LDAP connection and prevent fallback to local
blizzz Jun 3, 2019
1587f5d
Use and LDIF as user creation template
blizzz Jun 3, 2019
dd2795e
User LDIF Template Editor WebUI
blizzz Jun 11, 2019
871f6b7
register hooks on app load
blizzz Jun 14, 2019
57e3b37
add displayname to default template
blizzz Jun 14, 2019
6a2f094
remove duplicate entry
blizzz Jun 14, 2019
fec2fa2
add DI and clean uo setDisplayNameRoutine
blizzz Jun 17, 2019
594dd32
makes us of proper deletion process of the LDAP user
blizzz Jun 18, 2019
8b10c7e
method signatures for changing details and email
blizzz Jun 18, 2019
5bb1d08
updates phpdoc
blizzz Jun 18, 2019
4fc1785
uses API method to flag LDAP user as deleted
blizzz Jun 18, 2019
5c4701e
formatting and cleanup
blizzz Jun 18, 2019
386f5da
removes uid generation as this will be done by provisioning API
blizzz Jun 18, 2019
3cf9151
removes unnecessary construct argument
blizzz Jun 18, 2019
f705241
resolves IConfig dependency on LDAPUserManager
blizzz Jun 18, 2019
ca39d03
adds UI for switches
blizzz Jun 18, 2019
7fd173e
adds UI switches for newUser.requireEmail and newUser.generateUserID
blizzz Jun 18, 2019
5aaddbb
adds Avatar switch
blizzz Jun 18, 2019
900c655
polishes classes:
blizzz Jun 18, 2019
7b98187
removes unneeded log statements
blizzz Jun 18, 2019
774a099
fetches first LDAP configuration prefix instead of guessing
blizzz Jun 19, 2019
e176c08
inserts ILogger dep
blizzz Jun 19, 2019
f976df0
sanitizes the DN before creating the user, so the further process suc…
blizzz Jun 19, 2019
65fdf7b
ensures that display name is initially set, even if not set in LDIF
blizzz Jun 19, 2019
80ea212
removes unneeded file
blizzz Jun 19, 2019
ed16efc
adds test infrastructure and first tests
blizzz Jun 19, 2019
f0c4b1f
fixes syntax for PHP 7.1
blizzz Jun 20, 2019
3f03cf8
adds missing files for integration tests, resolves cyclic dep
blizzz Jun 20, 2019
14f2f1a
bootstraps only, when an active configuration is available.
blizzz Jun 20, 2019
21d00fe
satisfies AppConfiguration traits desire for the testing app
blizzz Jun 20, 2019
0b51150
resolves dependency hell, all traits are already inherited
blizzz Jun 20, 2019
e9b0ab3
fixed default template, an extinct placeholder was used
blizzz Jun 20, 2019
8acbc41
sets user base
blizzz Jun 20, 2019
66b02ee
fixes conversion issue, an array is returned here of course
blizzz Jun 20, 2019
6809496
removes unnecessary objectclass from default template
blizzz Jun 20, 2019
b0da046
fixes lookup being not key insensitive
blizzz Jun 20, 2019
43f8ed0
fixes expected status code
blizzz Jun 20, 2019
4338fed
adjusts to server config switch changes
blizzz Jun 21, 2019
a21af4f
add test for dynamic user id and thus run against master
blizzz Jun 25, 2019
25b8c55
extend tests with displayname
blizzz Jun 25, 2019
a92ceda
also run tests without a cache
blizzz Jun 25, 2019
9bd731d
fix deletion of users (figured without redis)
blizzz Jun 26, 2019
0660d97
uses the user deletion method that deletes the user just once...
blizzz Jun 26, 2019
f9e2464
add test for creating group and creating a new user with that membership
blizzz Jun 27, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 142 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
kind: pipeline
name: checkers
steps:
- name: compatibility
image: nextcloudci/php7.1:php7.1-16
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: master
DB: sqlite
commands:
# Pre-setup steps
- wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
- cd ../server
# Code checker
- ./occ app:check-code $APP_NAME -c strong-comparison
- ./occ app:check-code $APP_NAME -c deprecation
- name: syntax-php7.0
image: nextcloudci/php7.0:php7.0-17
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: stable16
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- name: syntax-php7.1
image: nextcloudci/php7.1:php7.1-15
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: stable16
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- name: syntax-php7.2
image: nextcloudci/php7.2:php7.2-9
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: stable16
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
- name: syntax-php7.3
image: nextcloudci/php7.3:php7.3-2
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: stable16
DB: sqlite
commands:
- composer install
- ./vendor/bin/parallel-lint --exclude ./vendor/ .
trigger:
branch:
- master
- stable*
event:
- pull_request
- push
---
kind: pipeline
name: integration-master
steps:
- name: integration
image: nextcloudci/php7.1:php7.1-16
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: master
DB: sqlite
commands:
# Pre-setup steps
- wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
- cd ../server/
- php occ config:system:set redis host --value=cache
- php occ config:system:set redis port --value=6379 --type=integer
- php occ config:system:set redis timeout --value=0 --type=integer
- php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
- php occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
- php occ app:enable user_ldap
- php occ app:enable $APP_NAME
- cd apps/$APP_NAME
- cd tests/integration
- ./run.sh

services:
- name: cache
image: redis
- name: openldap
image: nextcloudci/openldap:openldap-7
environment:
SLAPD_DOMAIN: nextcloud.ci
SLAPD_ORGANIZATION: Nextcloud
SLAPD_PASSWORD: admin
SLAPD_ADDITIONAL_MODULES: memberof

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: integration-master-nocache
steps:
- name: integration
image: nextcloudci/php7.1:php7.1-16
environment:
APP_NAME: ldap_write_support
CORE_BRANCH: master
DB: sqlite
commands:
# Pre-setup steps
- wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
- cd ../server/
- php occ app:enable user_ldap
- php occ app:enable $APP_NAME
- cd apps/$APP_NAME
- cd tests/integration
- ./run.sh

services:
- name: openldap
image: nextcloudci/openldap:openldap-7
environment:
SLAPD_DOMAIN: nextcloud.ci
SLAPD_ORGANIZATION: Nextcloud
SLAPD_PASSWORD: admin
SLAPD_ADDITIONAL_MODULES: memberof

trigger:
branch:
- master
- stable*
event:
- pull_request
- push
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
js/
node_modules/

/vendor/

/tests/integration/vendor/
/tests/integration/composer.lock
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

174 changes: 0 additions & 174 deletions Makefile

This file was deleted.

9 changes: 0 additions & 9 deletions TODO.txt

This file was deleted.

Loading