casino-ldap_authenticator 2.0.0.pre.1 → 2.0.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1

data/README.md

@@ -1,4 +1,4 @@
-# casino-ldap_authenticator [![Build Status](https://travis-ci.org/rbCAS/casino-ldap_authenticator.png?branch=master)](https://travis-ci.org/rbCAS/casino-ldap_authenticator)
+# casino-ldap_authenticator [![Build Status](https://travis-ci.org/rbCAS/casino-ldap_authenticator.png?branch=master)](https://travis-ci.org/rbCAS/casino-ldap_authenticator) [![Coverage Status](https://coveralls.io/repos/rbCAS/casino-ldap_authenticator/badge.png)](https://coveralls.io/r/rbCAS/casino-ldap_authenticator)
 
 Provides mechanism to use LDAP as an authenticator for [CASino](https://github.com/rbCAS/CASino).
 

data/casino-ldap_authenticator.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rspec', '~> 2.12'
   s.add_development_dependency 'simplecov', '~> 0.7'
+  s.add_development_dependency 'coveralls'
 
   s.add_runtime_dependency 'net-ldap', '~> 0.3'
-  s.add_runtime_dependency 'casino', '~> 3.0.0.pre.1'
+  s.add_runtime_dependency 'casino', '~> 3.0.0'
 end

data/lib/casino/ldap_authenticator.rb

@@ -42,8 +42,11 @@ class CASino::LDAPAuthenticator
       @ldap.auth(@options[:admin_user], @options[:admin_password])
     end
     @user_plain = @ldap.bind_as(:base => @options[:base], :size => 1, :password => @password, :filter => user_filter)
-    if @user_plain.is_a?(Array)
-      @user_plain = @user_plain.first
+    if @user_plain != false
+      @user_plain = @ldap.search(:base => @options[:base], :filter => user_filter, :attributes => @options[:extra_attributes].values)
+      if @user_plain.is_a?(Array)
+        @user_plain = @user_plain.first
+      end
     end
   end
 

data/lib/casino/ldap_authenticator/version.rb

@@ -1,5 +1,5 @@
 module CASino
   class LDAPAuthenticator
-    VERSION = '2.0.0.pre.1'
+    VERSION = '2.0.0'
   end
 end

data/spec/casino/ldap_authenticator_spec.rb

@@ -8,7 +8,7 @@ describe CASino::LDAPAuthenticator do
     :base => 'dc=users,dc=example.com',
     :encryption => 'simple_tls',
     :username_attribute => 'uid',
-    :extra_attributes => { :email => 'mail', :fullname => :displayname }
+    :extra_attributes => { :email => 'mail', :fullname => :displayname, :memberof => 'memberof'}
   } }
   let(:subject) { described_class.new(options) }
   let(:connection) { Object.new }
@@ -24,9 +24,11 @@ describe CASino::LDAPAuthenticator do
     let(:username) { 'test' }
     let(:password) { 'foo' }
     let(:user_filter) { Net::LDAP::Filter.eq(options[:username_attribute], username) }
+    let(:extra_attributes) { ['mail', :displayname, 'memberof'] }
 
     before(:each) do
       connection.stub(:bind_as)
+      connection.stub(:search)
     end
 
     it 'does the connection setup' do
@@ -41,7 +43,12 @@ describe CASino::LDAPAuthenticator do
       subject.validate(username, password)
     end
 
-    context 'when validation succeeds' do
+    it 'calls the #search method on the LDAP connection' do
+      connection.should_receive(:search).with(:base => options[:base], :filter => user_filter, :attributes => extra_attributes)
+      subject.validate(username, password)
+    end
+
+    context 'when validation succeeds for user with missing data' do
       let(:fullname) { 'Example User' }
       let(:email) { "#{username}@example.org" }
       let(:ldap_entry) {
@@ -55,6 +62,41 @@ describe CASino::LDAPAuthenticator do
         connection.stub(:bind_as) do
           ldap_entry
         end
+        connection.stub(:search) do
+          ldap_entry
+        end
+      end
+
+      it 'returns the user data with blank value for missing data' do
+        subject.validate(username, password).should == {
+          username: username,
+          extra_attributes: {
+            :email => email,
+            :fullname => fullname,
+            :memberof => ''
+          }
+        }
+      end
+    end
+
+    context 'when validation succeeds for user with complete data' do
+      let(:fullname) { 'Example User' }
+      let(:email) { "#{username}@example.org" }
+      let(:membership) { "cn=group1" }
+      let(:ldap_entry) {
+        entry = Net::LDAP::Entry.new
+        {:uid => username, :displayname => fullname, :mail => email, :memberof => membership}.each do |key, value|
+          entry[key] = [value]
+        end
+        entry
+      }
+      before(:each) do
+        connection.stub(:bind_as) do
+          ldap_entry
+        end
+        connection.stub(:search) do
+          ldap_entry
+        end
       end
 
       it 'returns the user data' do
@@ -62,7 +104,8 @@ describe CASino::LDAPAuthenticator do
           username: username,
           extra_attributes: {
             :email => email,
-            :fullname => fullname
+            :fullname => fullname,
+            :memberof => membership
           }
         }
       end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start do
   add_filter '/spec'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: casino-ldap_authenticator
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Nils Caspar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.1
+        version: 3.0.0
 description: This gem can be used to allow the CASino backend to authenticate against
   an LDAP server.
 email:
@@ -104,6 +120,7 @@ files:
 - .rspec
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,9 +147,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23