Skip to content

Sync with intridea/omniauth-ldap #10

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

Merged
merged 27 commits into from Feb 1, 2014
Merged

Sync with intridea/omniauth-ldap #10

merged 27 commits into from Feb 1, 2014

Conversation

ghost
Copy link

@ghost ghost commented Jan 31, 2014

There are some useful updates in https://github.com/intridea/omniauth-ldap. This merges the current master of https://github.com/intridea/omniauth-ldap into https://github.com/gitlabhq/omniauth-ldap. This merge should handle PR #3, PR #6 and PR #7.

Why this as opposed to PR #9? It appears PR #9 missed some commits from https://github.com/intridea/omniauth-ldap and those meet the needs of PR #3.

syndicut and others added 27 commits July 4, 2012 02:07
Net::LDAP::Entry returns empty array if key not
exists, so we should check for key with respond_to?
When exception is raised from middleware host application can not
handle it. This is why OmniAuth uses #failure! which sends message to
application so it can do something about it
AD allows bind with with correct username and empty password
so application will think user successfully authenticated which
is a serious mistake
Reformatted specs and reworked way to propagate InvalidCredentials error to application
This way it can be used with rubygems.org API
The Gemfile.lock shouldn't be included in a gem-based repository
because it may artificially lock obsolete gems.

An example of this is rb-fsevent which at the version it was
locked at is incompatable with OS X 10.8

If something does need the version locked, specify it in the
.gemspec or Gemfile itself.
…into syndicut-map-userinfo-fix

Conflicts:
	spec/omniauth/strategies/ldap_spec.rb
add license information to the gemspec
Update net-ldap gem to avoid errors with some LDAP Servers
…agecorp-master

Conflicts:
	README.md
	spec/omniauth/strategies/ldap_spec.rb
Update version to match intridea/omniauth-ldap.
Add test for alternate fields.
@ghost
Copy link
Author

ghost commented Jan 31, 2014

@randx Any chance this can get merged? There are a few things broken with the current implementation and this addresses those. I made sure that none of the existing functionality was changed (as can be seen by the tests).

@dzaporozhets
Copy link

@jhollingsworth looks good. I will merge it

dzaporozhets added a commit that referenced this pull request Feb 1, 2014
@dzaporozhets dzaporozhets merged commit e728b00 into gitlabhq:master Feb 1, 2014
@dzaporozhets
Copy link

@jhollingsworth I expect you want me to build new gem version?

@ghost
Copy link
Author

ghost commented Feb 1, 2014

@randx That would be nice to have with the next GitLab release. I currently have my system all patched up. Thanks for doing this.

@@ -3,7 +3,6 @@
module OmniAuth
module Strategies
class LDAP
class MissingCredentialsError < StandardError; end

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a good idea @randx?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind, it looked for a minute like we were no longer raising an error for missing credentials. I see it uses the fail! method now.

@dzaporozhets
Copy link

@ghost ghost deleted the sync-intridea-omniauth-ldap branch February 4, 2014 01:31
@commodo
Copy link

commodo commented Jun 25, 2014

Regarding #9
Rebased from latest master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

8 participants