adauth 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a01855a1bb516984482d2cbdaa7020445431786
-  data.tar.gz: 077068256ee217f616c28322931be7500e8fb967
+  metadata.gz: aeeb73f38e7343acd9777fa9b949a154ace2c707
+  data.tar.gz: 4ffbfe5b29bbc5feff541ca6aacd0cac9c88d4b3
 SHA512:
-  metadata.gz: 6e9fd1e2c0af98fff7ce34b6bfe0300490a718c5408d4d7da9f49f84d709070c4ec1163a9fa4ebc90f579295ffa10b7068ba819f3822d4d39241561790af6db5
-  data.tar.gz: 120341150092ad1327e8cac8a20ba4c321215c504c2964265920cd33762a4670b87bbeaf9b66c86cce5c99f6ce5827673531f4aaaa91d7f2a2d743fad48838cc
+  metadata.gz: e2687af1a484c73eddbda0db7f82e9518f2afac6cd3a527d2660434a0229bf02d890eb556747e9dffa9c7f43188d564b7c97289cc311669a4f0eaecdfdb3fb93
+  data.tar.gz: 831d7edbf365a72fcbe75dca4ec97b596d7582d334371ce7f634154dee366877e6c47e6a1855343545223e9ad5516098c5389dc9b452ad75d55ebf93a7c19628

data/lib/adauth/ad_object.rb

@@ -108,9 +108,11 @@ module Adauth
           @cn_groups_nested = cn_groups
           cn_groups.each do |group|
             ado = Adauth::AdObjects::Group.where('name', group).first
-            groups = convert_to_objects ado.cn_groups
-            groups.each do |g|
-              @cn_groups_nested.push g if !(@cn_groups_nested.include?(g))
+            if ado
+              groups = convert_to_objects ado.cn_groups
+              groups.each do |g|
+                @cn_groups_nested.push g if !(@cn_groups_nested.include?(g))
+              end
             end
           end
           return @cn_groups_nested
@@ -199,4 +201,4 @@ module Adauth
           end
         end
     end
-end
+end

data/lib/adauth/authenticate.rb

@@ -23,7 +23,7 @@ module Adauth
     
     # Check if the user is allowed to login
     def self.allowed_to_login(user)
-      (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))
+      (((@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)))
     end
     
     private

data/lib/adauth/version.rb

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

metadata

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