adauth 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeeb73f38e7343acd9777fa9b949a154ace2c707
-  data.tar.gz: 4ffbfe5b29bbc5feff541ca6aacd0cac9c88d4b3
+  metadata.gz: ba854aa4c49708e90a10761e4eeeb50387995ca6
+  data.tar.gz: 8bdd4ba583b83515ee07b200d1c69a88a3bf051b
 SHA512:
-  metadata.gz: e2687af1a484c73eddbda0db7f82e9518f2afac6cd3a527d2660434a0229bf02d890eb556747e9dffa9c7f43188d564b7c97289cc311669a4f0eaecdfdb3fb93
-  data.tar.gz: 831d7edbf365a72fcbe75dca4ec97b596d7582d334371ce7f634154dee366877e6c47e6a1855343545223e9ad5516098c5389dc9b452ad75d55ebf93a7c19628
+  metadata.gz: 2a038027f3d791f37a11d77ce726b9184521af0ca81206973944709a64d95843702a04d9174465c729c40910adcee434a6ce4ba86e2176899a14999bfa89e1ec
+  data.tar.gz: 64b9becd466aee82b0c50f5a6ca813bfb58343ba643307145ce7a7369f20e7b220d3903a9aa9f8b394d8c7b5f54e55aa7b65d4b74c19a81950a9205a61f8dfdc

data/lib/adauth/ad_objects/group.rb

@@ -48,7 +48,11 @@ module Adauth
             end
             
             def cn_groups
-              memberof.split(/.*?CN=(.*?),.*/)
+              if memberof.nil?
+                []
+              else
+                memberof.split(/.*?CN=(.*?),.*/)
+              end
             end
         end
     end

data/lib/adauth/authenticate.rb

@@ -20,14 +20,18 @@ module Adauth
             return false
         end
     end
-    
+
     # Check if the user is allowed to login
     def self.allowed_to_login(user)
-      (((@config.allowed_groups.empty? && @config.denied_groups.empty?) || allowed_from_arrays(@config.allowed_groups, @config.denied_groups, user.cn_groups_nested)) && ((@config.allowed_ous.empty? && @config.denied_ous.empty?) || allowed_from_arrays(@config.allowed_ous, @config.denied_ous, user.dn_ous)))
+      if (@config.allowed_groups.empty? && @config.allowed_ous.empty?) && (@config.denied_groups.empty? && @config.denied_ous.empty?)
+        return true
+      else
+        return (allowed_from_arrays(@config.allowed_groups, @config.denied_groups, user.cn_groups_nested) && allowed_from_arrays(@config.allowed_ous, @config.denied_ous, user.dn_ous))
+      end
     end
-    
+
     private
-    
+
     def self.allowed_from_arrays(allowed, denied, test)
       return true if allowed.empty? && denied.empty?
       return true if !((allowed & test).empty?)

data/lib/adauth/rails/model_bridge.rb

@@ -20,7 +20,7 @@ module Adauth
         #
         # AdauthSearchField = [:login, :name]
         #
-        # This will cause RailsModel.find_by_name(AdauthObject.login)
+        # This will cause RailsModel.where(:name => AdauthObject.login).first_or_initialize
         #
         # The Order is [adauth_field, rails_field]
         module ModelBridge
@@ -50,10 +50,13 @@ module Adauth
 
                 # Used to create the RailsModel if it doesn't exist and update it if it does
                 def return_and_create_from_adauth(adauth_model)
-                    find_method = "find_by_#{self::AdauthSearchField.last}".to_sym
-                    rails_model = (self.send(find_method, adauth_model.send(self::AdauthSearchField.first)) || create_from_adauth(adauth_model))
+                    adauth_field = self::AdauthSearchField.first
+                    adauth_search_value = adauth_model.send(adauth_field)
+                    rails_search_field = self::AdauthSearchField.second
+                    # Model#where({}).first_or_initialize is also compatible with Mongoid (3.1.0+)
+                    rails_model = self.send(:where, { rails_search_field => adauth_search_value }).first_or_initialize
                     rails_model.update_from_adauth(adauth_model)
-                    return rails_model
+                    rails_model
                 end
             end
         end

data/lib/adauth/version.rb

@@ -1,4 +1,4 @@
 module Adauth
     # Adauths Version Number
-    Version = '2.0.4'
-end
+    Version = '2.0.5'
+end

data/spec/adauth_authenticate_spec.rb

@@ -5,12 +5,17 @@ describe Adauth, "#authenticate" do
         default_config
         Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_a Adauth::AdObjects::User
     end
-    
+
     it "should return false for failed authentication" do
         default_config
         Adauth.authenticate(test_data("domain", "query_user"), "foo").should be_false
     end
-    
+
+    it "should return false for a user that does not exist" do
+      default_config
+      Adauth.authenticate("foo", "bar").should be_false
+    end
+
     it "should allow the user if allowed groups are used" do
       Adauth.configure do |c|
           c.domain = test_data("domain", "domain")
@@ -23,7 +28,7 @@ describe Adauth, "#authenticate" do
       end
       Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_a Adauth::AdObjects::User
     end
-    
+
     it "should allow the user if allowed ous are used" do
       Adauth.configure do |c|
           c.domain = test_data("domain", "domain")
@@ -36,7 +41,20 @@ describe Adauth, "#authenticate" do
       end
       Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_a Adauth::AdObjects::User
     end
-    
+
+    it "should reject a user not in an allowed ou" do
+      Adauth.configure do |c|
+          c.domain = test_data("domain", "domain")
+          c.port = test_data("domain", "port")
+          c.base = test_data("domain", "base")
+          c.server = test_data("domain", "server")
+          c.query_user = test_data("domain", "query_user")
+          c.query_password = test_data("domain", "query_password")
+          c.allowed_ous = ["Users2"]
+      end
+      Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_false
+    end
+
     it "should reject a user if denied group is used" do
         Adauth.configure do |c|
             c.domain = test_data("domain", "domain")
@@ -49,7 +67,7 @@ describe Adauth, "#authenticate" do
         end
         Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_false
     end
-    
+
     it "should reject a user if denied ous is used" do
         Adauth.configure do |c|
             c.domain = test_data("domain", "domain")
@@ -62,4 +80,4 @@ describe Adauth, "#authenticate" do
         end
         Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password")).should be_false
     end
-end
+end

data/spec/adauth_issue_spec.rb

@@ -10,4 +10,4 @@ describe "issue #37" do
     ldap_user = Adauth.authenticate(test_data("domain", "query_user"), test_data("domain", "query_password"))
     ldap_user.should be_a Adauth::AdObjects::User
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adauth
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Adam "Arcath" Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake