Jan-Willem van der Meer
02fb3116d5
Add provider to LdapGroupLink tests
2014-10-16 12:28:47 +02:00
Jan-Willem van der Meer
89ac11df5c
Merge branch 'feature-multi-ldap-servers' into feature-multiple-ldap-push-authentication
2014-10-10 12:22:46 +02:00
Jan-Willem van der Meer
74e79105cd
Cleanup provider validation
2014-10-10 11:31:33 +02:00
Jan-Willem van der Meer
8271fac0a9
Make AD check for access work properly
2014-10-10 10:46:07 +02:00
Jan-Willem van der Meer
19d811e6bf
Make LDAP authentication work with multiple LDAP servers
2014-10-09 19:09:36 +02:00
Jan-Willem van der Meer
6373c84d5f
Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers
...
Conflicts:
app/models/user.rb
config/gitlab.yml.example
spec/lib/gitlab/ldap/access_spec.rb
2014-10-09 12:26:19 +02:00
Jan-Willem van der Meer
f8c8ae29a2
Use LDAP::Config in all of the adapter methods
2014-10-08 15:33:50 +02:00
Jan-Willem van der Meer
212b406f49
Rename ssh_sync_key to old convention to prevent confusion
2014-10-08 15:24:15 +02:00
Jan-Willem van der Meer
1bc99369dc
Adapt tests to refactoring
...
- Use smarter instance methods
- Support multiple LDAP servers
2014-10-07 17:25:13 +02:00
Jan-Willem van der Meer
4ef74844c3
Adapt to new LDAP::Config class
2014-10-07 12:31:30 +02:00
Jan-Willem van der Meer
e151bbbb28
Extract LDAP config to seperate class
2014-10-07 12:22:16 +02:00
Dmitriy Zaporozhets
9afa80bbae
Fix EE code after membership refactoring
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-03 14:09:07 +03:00
Dmitriy Zaporozhets
a5972170ad
Merge remote-tracking branch 'origin/master' into ee-7-4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/projects/team_members_controller.rb
app/finders/projects_finder.rb
app/models/group.rb
app/models/project_team.rb
app/models/users_group.rb
config/gitlab.yml.example
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/ldap.md
features/steps/group.rb
features/steps/project/project.rb
2014-10-02 13:24:59 +03:00
Jan-Willem van der Meer
ad1c2f79d9
Refactor Gitlab::LDAP::User to instance methods
2014-10-01 14:11:50 +02:00
Marin Jankovski
f7aba277e7
Add option to gitlab config to specify if LDAP server is active directory.
2014-09-30 12:07:31 +02:00
Jan-Willem van der Meer
f3346a472e
Patch oauth refactoring into EE
2014-09-11 11:53:52 +02:00
Jan-Willem van der Meer
11bb67c3c6
Test authenticate method for Gitlab::LDAP::User
2014-09-08 14:53:59 +02:00
Jan-Willem van der Meer
5b86dab03b
Move auth hash to a seperate class
2014-09-04 12:55:10 +02:00
Jan-Willem van der Meer
6c4b51e263
Reset ldab.enabled setting after test
...
Should prevent CI failure
2014-09-04 11:38:43 +02:00
Jan-Willem van der Meer
41f46bfac3
Add basic tests for LDAP::Access.update_permissions
2014-09-03 11:47:48 +02:00
Jan-Willem van der Meer
a68b1963a3
Less private methods, more test ordering
2014-09-03 11:28:32 +02:00
Jan-Willem van der Meer
61d0bf0bad
Match method order for implementation and class
...
This will prevent a mess, and keeps everything clean.
In addition i made the non interface methods private
2014-09-03 10:38:07 +02:00
Jan-Willem van der Meer
1a59ce4ee7
Add extra tests around OAUTH / LDAP find_or_create
2014-09-03 10:29:03 +02:00
Jan-Willem van der Meer
f019821dbf
In between patches fixup
2014-09-03 10:18:20 +02:00
Jan-Willem van der Meer
9d3eb09158
Move LDAP tests to proper location
...
Same patch as gitlab-ce
https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1053
2014-09-03 10:10:55 +02:00
Jan-Willem van der Meer
c0323b40ee
Refactor: beter naming for active directory disabled users
2014-09-01 16:35:18 +02:00
Jan-Willem van der Meer
92a9964940
Add basic find / create specs for LDAP user
2014-09-01 15:30:46 +02:00
Dmitriy Zaporozhets
14f5199cdc
Merge branch 'feature-ldap-tests' into 'master'
...
Feature ldap tests
Move specs to proper places. Relates to #154
This is already mergeable, will continue in a new branch for additions & refactorings.
See merge request !1053
2014-08-30 07:16:45 +00:00
Jan-Willem van der Meer
0d5ae2802e
Move and rename ldap / oauth specs
2014-08-29 17:30:42 +02:00
Jan-Willem van der Meer
97547428bd
Rename ldap tests even further
2014-08-29 16:04:00 +02:00
Jacob Vosmaer
614ca3ec65
Remove LDAP::Access#find_user
...
This method existed to allow LDAP users to take over existing GitLab
accounts if the part before the '@' of their LDAP email attribute
matched the username of an existing GitLab user. I propose to disable
this behavior in order to prevent unintended GitLab account takeovers.
After this change it is still possible to take over an existing GitLab
account with your LDAP credentials, as long as the GitLab account email
address matches the LDAP user email address.
2014-08-29 15:38:05 +02:00
Jan-Willem van der Meer
6840a276d5
Fix naming convention of LDAP tests
2014-08-29 13:49:01 +02:00
Jan-Willem van der Meer
5238efd80c
Only return found LDAP groups for processing
2014-08-29 11:09:06 +02:00
Jan-Willem van der Meer
2e21c362db
Replace Group id with the answer to the answer to life the universe and everything
2014-08-15 19:50:47 +02:00
Jan-Willem van der Meer
3ba7a3a5ca
Remove traces from ldab_cn and ldap_access
...
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
2014-08-15 12:33:05 +02:00
Jan-Willem van der Meer
5ff230a11d
Add more use cases for update_ldap_group_links to unit tests
2014-08-15 12:07:30 +02:00
Jan-Willem van der Meer
2541571014
Add unit test for update_ldap_group_links
...
This is the first stage, need to add some other to test revoking and
upgrading of the permissions
2014-08-15 11:31:52 +02:00
Jan-Willem van der Meer
f6252e8784
Use rspec's 'create anyway' syntax
2014-08-15 10:40:44 +02:00
Jan-Willem van der Meer
bb93dfb2c8
Remove old code
2014-08-14 12:54:26 +02:00
Jan-Willem van der Meer
673b9a373b
Add method to get the current cns the user has access to
2014-08-13 16:48:36 +02:00
Jan-Willem van der Meer
22b0b2b40e
Match rails naming convention
...
Otherwise IDE won't be able to find the tests
2014-08-13 11:00:19 +02:00
Jacob Vosmaer
526959ab63
Use a scope to add/remove LDAP keys
...
For some reason I needed to add a reload statement in the specs.
2014-07-09 12:13:09 +02:00
Marvin Frick
423960a435
adds spec for LDAPKeys (+4 squashed commits)
...
Squashed commits:
[812406c] fixes bug from last refactoring
[53e9508] hides "delete" button if a key is a LDAPKey
[bafc66b] refactores update_ssh_keys in own method
[7895858] makes name of ssh public key configurable
2014-07-08 12:41:12 +02:00
Marvin Frick
4be5c5a7a2
adds feature to sync GitLab admins with LDAP group
2014-06-23 18:17:14 +02:00
Marin Jankovski
7ab468317b
Merge branch 'ldap_email_downcase' into 'master'
...
Fix LDAP email upper case bug
2014-05-22 06:59:13 +00:00
Jacob Vosmaer
4ce8287e02
Add failing spec for upper case LDAP emails
2014-05-21 13:51:58 +02:00
Marin Jankovski
95ef8f9756
Merge remote-tracking branch 'ce/master'
...
Conflicts:
VERSION
doc/install/installation.md
doc/integration/README.md
doc/integration/external-issue-tracker.md
lib/gitlab/markdown.rb
spec/lib/gitlab/ldap/ldap_access_spec.rb
2014-05-21 13:10:37 +02:00
Jacob Vosmaer
be1120e968
Improve ad_disabled method name
2014-05-14 19:13:06 +02:00
Jacob Vosmaer
d54133b09f
Add spec for LDAP::Access#allowed?
2014-05-14 18:26:49 +02:00
Jacob Vosmaer
982d4d51e8
Backport Adapter#dn_matches_filter? from EE
2014-05-14 18:11:14 +02:00
