aker 3.0.2 → 3.0.3

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Aker History
 ============
 
+3.0.3
+-----
+- Added: search_domain configuration option to LDAP authority. (#15)
+  This new option is mandatory; the lack of this option in prior
+  versions of the authority meant that they would not work with LDAP
+  servers other than Northwestern's.
+
 3.0.2
 -----
 - Added missing LICENSE file. Aker is made available under the MIT

data/lib/aker/ldap/authority.rb

@@ -82,6 +82,10 @@ module Aker::Ldap
     # @option config [String] :server The hostname for the LDAP server
     #   (required)
     #
+    # @option config [String] :search_domain The search base to use
+    #   when looking up users. E.g., `"dc=example,dc=org"`.
+    #   (required)
+    #
     # @option config [Integer] :port (636) The port to use to connect to the
     #  LDAP server
     #
@@ -161,6 +165,12 @@ module Aker::Ldap
       @config[:use_tls].nil? ? true : @config[:use_tls]
     end
 
+    ##
+    # The search domain to use when finding user records.
+    def search_domain
+      @config[:search_domain]
+    end
+
     ##
     # The mapping between attributes from the LDAP server and
     # {Aker::User} attributes. This mapping is used in two ways:
@@ -351,8 +361,7 @@ module Aker::Ldap
     def find_by_criteria(ldap, *criteria)
       filter = criteria.collect { |c| create_criteria_filter(c) }.inject { |a, f| a | f }
       return [] unless filter
-      base = "dc=northwestern,dc=edu"
-      ldap.search(:filter => filter, :base => base)
+      ldap.search(:filter => filter, :base => search_domain) || []
     end
 
     def one_value(ldap_entry, key)
@@ -362,6 +371,7 @@ module Aker::Ldap
 
     def validate_config!
       self.server or raise "The server parameter is required for ldap."
+      self.search_domain or raise 'The search_domain parameter is required for ldap.'
       if self.user.nil? ^ self.password.nil?
         raise "For ldap, both user and password are required if one is set."
       end

data/lib/aker/version.rb

@@ -1,3 +1,3 @@
 module Aker
-  VERSION = "3.0.2"
+  VERSION = '3.0.3'
 end

data/spec/aker/ldap/authority_spec.rb

@@ -23,7 +23,10 @@ module Aker::Ldap
 
     # Minimal valid set
     let(:params) {
-      { :server => '127.0.0.1' }
+      {
+        :server => '127.0.0.1',
+        :search_domain => 'dc=northwestern,dc=edu'
+      }
     }
 
     def actual
@@ -60,6 +63,11 @@ module Aker::Ldap
         lambda { actual }.should raise_error("The server parameter is required for ldap.")
       end
 
+      it 'requires the search domain' do
+        params[:search_domain] = nil
+        lambda { actual }.should raise_error('The search_domain parameter is required for ldap.')
+      end
+
       it "does not require a user name" do
         params[:user] = nil
         params[:password] = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aker
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Rhett Sutphin
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 -05:00
-default_executable: 
+date: 2011-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubytree
@@ -240,7 +239,6 @@ files:
 - spec/matchers.rb
 - spec/mock_builder.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/NUBIC/aker
 licenses: []
 
@@ -270,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A flexible authentication and authorization framework for Rack applications.