gitlab_omniauth-ldap 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7ceaa4ec67ee276ca4d7f8c20bc1326f31fc3f
-  data.tar.gz: 43ac5e5252e03e8780695d7a05c15aa0c2f4df0a
+  metadata.gz: 4d5b4eb5376fab8ef4f9e5e006ba83aa214402e0
+  data.tar.gz: 372d5d8f78a286cfe1328695f11323704a8297b6
 SHA512:
-  metadata.gz: b772560d1bdf110ce019fddc837e0332cd9449934f20deed0bbf034c91fe683f19f1a492f258ebd86f920427c4813227669a18a05b955cd2f4c3bd4538c7665e
-  data.tar.gz: bd91d1d785dd0931e3c2602622324eec46017c9b91d30b695d6edbacb1cb920b2a8ff80855d97363b59873dee1bfe50ee152a1f25da9a86e2ebd9b17fa29c0d6
+  metadata.gz: e2154945f44fa50434692911fafa1fdc098d4758603c6391be558b701ae4f87b712aef88501c98fa00dda0160e74995172067f9c24f97b051da29e8145f4e0bf
+  data.tar.gz: 5d9b8cd9c5e488f1a643c6bae705f79290bcf04588a50e638bc1d6a80e2d67ba3fedfd122d4ca405b32e58a7fa0edcd0f58ef6736dba02876bf7bfdfab122e4e

data/CHANGELOG

@@ -1,2 +1,5 @@
+## 2.0.4
+  - Improve log message when invalid credentials are used
+
 ## 2.0.3
   - Protects against wrong request method call to callback

data/lib/omniauth-ldap/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module LDAP
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end

data/lib/omniauth/strategies/ldap.rb

@@ -4,6 +4,9 @@ module OmniAuth
   module Strategies
     class LDAP
       include OmniAuth::Strategy
+
+      InvalidCredentialsError = Class.new(StandardError)
+
       @@config = {
         'name' => 'cn',
         'first_name' => 'givenName',
@@ -45,7 +48,9 @@ module OmniAuth
         begin
           @ldap_user_info = @adaptor.bind_as(:filter => filter(@adaptor), :size => 1, :password => request['password'])
 
-          return fail!(:invalid_credentials) if !@ldap_user_info
+          unless @ldap_user_info
+            return fail!(:invalid_credentials, InvalidCredentialsError.new("Invalid credentials for #{request['username']}"))
+          end
 
           @user_info = self.class.map_user(@@config, @ldap_user_info)
           super
@@ -54,7 +59,7 @@ module OmniAuth
         end
       end
 
-      def filter adaptor
+      def filter(adaptor)
         if adaptor.filter and !adaptor.filter.empty?
           username = Net::LDAP::Filter.escape(@options[:name_proc].call(request['username']))
           Net::LDAP::Filter.construct(adaptor.filter % { username: username })

data/spec/omniauth/strategies/ldap_spec.rb

@@ -69,8 +69,10 @@ describe "OmniAuth::Strategies::LDAP" do
 
       it 'should redirect to error page' do
         post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
-        last_response.should be_redirect
-        last_response.headers['Location'].should =~ %r{invalid_credentials}
+
+        expect(last_response).to be_redirect
+        expect(last_response.headers['Location']).to match('invalid_credentials')
+        expect(last_request.env['omniauth.error'].message).to eq('Invalid credentials for ping')
       end
 
       it 'should redirect to error page when there is exception' do
@@ -132,8 +134,9 @@ describe "OmniAuth::Strategies::LDAP" do
           it 'should redirect to error page' do
             post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
 
-            last_response.should be_redirect
-            last_response.headers['Location'].should =~ %r{invalid_credentials}
+            expect(last_response).to be_redirect
+            expect(last_response.headers['Location']).to match('invalid_credentials')
+            expect(last_request.env['omniauth.error'].message).to eq('Invalid credentials for ping')
           end
           context 'and filter is set' do
             it 'should bind with filter' do
@@ -141,8 +144,9 @@ describe "OmniAuth::Strategies::LDAP" do
               Net::LDAP::Filter.should_receive(:construct).with('uid=ping')
               post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
 
-              last_response.should be_redirect
-              last_response.headers['Location'].should =~ %r{invalid_credentials}
+              expect(last_response).to be_redirect
+              expect(last_response.headers['Location']).to match('invalid_credentials')
+              expect(last_request.env['omniauth.error'].message).to eq('Invalid credentials for ping')
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_omniauth-ldap
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ping Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A LDAP strategy for OmniAuth.