-
Notifications
You must be signed in to change notification settings - Fork 161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[wishlist] merge changes from gitlab_omniauth-ldap #82
Open
pravi
wants to merge
25
commits into
omniauth:master
Choose a base branch
from
gitlabhq:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If no username or password is provided a MissingCredentialsError is raised which causes a Rack caught exception and a 500 Error in gitlab. Omniauth provides a way to raise such errors to the application by using the 'fail!' method to pass the exception to the registered failure handler. For gitlab this is the omniauth_controller code. This is required to resolve gitlab issue #1077. Signed-off-by: Pat Thoyts <[email protected]>
Report missing credentials to the Rails application.
Newer LDAP servers fail with older versions of net-ldap. Update to the fixed version. Signed-off-by: David Aguilar <[email protected]>
Gemfile.lock: update net-ldap to fix LDAP authentication issues
Update version to match intridea/omniauth-ldap. Add test for alternate fields.
Sync with intridea/omniauth-ldap
net-ldap version update There is a bug in net-ldap < 0.5.0 preventing connections to Microsoft servers. Pushing the net-ldap dependency version should fix it. See the following net-ldap issue for a description. ruby-ldap/ruby-net-ldap#80 See merge request !2
Considering we are bumping net-ldap from 0.3.1 to 0.7.0 I thought a minor version bump might be called for.
Signed-off-by: Dmitriy Zaporozhets <[email protected]>
Bump net ldap Related to gitlab/gitlabhq#1700 See merge request !1
Signed-off-by: Dmitriy Zaporozhets <[email protected]>
Escape wildcards in username. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086. Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1644. See merge request !2
At least the changes for |
It seems like GitLab.org development of the fork has moved to https://gitlab.com/gitlab-org/omniauth-ldap since. |
@MrBerg you can see this discussion with maintainers of the fork here https://gitlab.com/gitlab-org/gitlab-ce/issues/13280 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gitlab_omniauth-ldap was created as a fork when omniauth-ldap was inactive. Now that omniauth-ldap is active again, it makes sense to integrate their changes back into omniauth-ldap and combine efforts. It would be a good idea to give some of them commit access here.