active_directory_login 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baef92b6272c840ab3428b6b52fc5c02dc57df34
-  data.tar.gz: f7ff2c4d5c1a572b71f592c1f826298f43dc9d93
+  metadata.gz: 47fbbe0fe7ddb8fd3ec3ba897b83d98ba377e915
+  data.tar.gz: bfa62e77801d567ca7d95fff669f792c8f84b443
 SHA512:
-  metadata.gz: 403aaf0040444a1f2131bb1fceaf95d6661118a837dc863a71c0dd53349a3058db183249981ff31a3855948c489c959121c55292be5a59c4307205b912754301
-  data.tar.gz: 1196a1046bdca046ff467108dee81e7f208f2b3690d2d44b7042a4529363b94347810cf18e9f6962249c15b375390350a5f93b1d6636f98d91c1ae0092466ea4
+  metadata.gz: 613463170d1b6f58ce61c69171f277901a0f6c5e93641db2a98ecc6c22ac3c26123ad5f5bf03dab4ae28a689c29eddd84ff11d7a0290dd336df220ff1d3353ad
+  data.tar.gz: 70010927678048f1713484efade2d723f113bab7d2766e5cbabc34f09c543a27ebc191e9ab2a9b1cbf2bbb6aa77cfb64d9b224f7a2641684a0b007ede983cefb

data/lib/active_directory_login.rb

@@ -28,7 +28,7 @@ module ActiveDirectoryLogin
 
     def_delegators :default_client, :validate!, :sync_groups, :benched
 
-    def_delegators :default_client, :with_user, :lock_user, :authenticate_user, :has_member_access?, :create_or_update_user
+    def_delegators :default_client, :find_user, :with_user, :lock_user, :authenticate_user, :has_member_access?, :create_or_update_user
 
     #logger modelled on https://github.com/pusher/pusher-gem/blob/master/lib/pusher.rb
     attr_writer :logger

data/lib/active_directory_login/client.rb

@@ -174,18 +174,16 @@ module ActiveDirectoryLogin
         allowed = User.where(email: staff_member_emails, staff: false)
         staff_allowed_emails = allowed.collect(&:email)
         allowed.update_all(staff: true)
-        pending = staff_member_emails - staff_allowed_emails
         
         disallowed = User.where.not(email: staff_member_emails).where(staff: true)
         staff_disallowed_emails = disallowed.collect(&:email)
         disallowed.update_all(staff: false)
-        pending = pending - staff_disallowed_emails
 
         staff_unchanged = User.where(email: staff_member_emails, staff: true)
         staff_unchanged_emails = staff_unchanged.collect(&:email)
-        pending = pending - staff_unchanged_emails
 
         # create any new staff
+        pending = Array(staff_member_emails - staff_allowed_emails - staff_disallowed_emails - staff_unchanged_emails)
         pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end
@@ -200,19 +198,17 @@ module ActiveDirectoryLogin
         allowed = User.where(email: superuser_member_emails, superuser: false)
         superuser_allowed_emails = allowed.collect(&:email)
         allowed.update_all(superuser: true)
-        pending = superuser_member_emails - superuser_allowed_emails
         
         disallowed = User.where.not(email: superuser_member_emails).where(superuser: true)
         superuser_disallowed_emails = disallowed.collect(&:email)
         disallowed.update_all(superuser: false)
-        pending = pending - superuser_disallowed_emails
 
         superuser_unchanged = User.where(email: superuser_member_emails, superuser: true)
         superuser_unchanged_emails = superuser_unchanged.collect(&:email)
-        pending = pending - superuser_unchanged_emails
-
+        
         # create any new superuser
-        pending.each do |pending_email|
+        pending = Array(superuser_member_emails - superuser_allowed_emails - superuser_disallowed_emails - superuser_unchanged_emails)
+         pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end
         superuser_created_emails = pending
@@ -222,7 +218,6 @@ module ActiveDirectoryLogin
 
         ## update users
         user_group = find_group(user_dn)
-        # member_cns = user_group.entry[:member]
 
         member_emails = user_group.member.collect(&:mail).map(&:downcase)
         member_emails = member_emails - superuser_member_emails - staff_member_emails
@@ -230,24 +225,21 @@ module ActiveDirectoryLogin
         allowed = User.where(email: member_emails, staff: false, superuser: false).where.not(locked_at: nil)
         user_allowed_emails = allowed.collect(&:email)
         allowed.update_all(locked_at: nil)
-        pending = member_emails - user_allowed_emails
         
-        disallowed = User.where.not(email: member_emails, staff: false, superuser: false)
+        disallowed = User.where.not(email: member_emails).where(staff: false, superuser: false)
         user_disallowed_emails = disallowed.collect(&:email)
         disallowed.each {|u| u.lock_access! }
 
         user_unchanged = User.where(email: member_emails, staff: false, superuser: false)
         user_unchanged_emails = user_unchanged.collect(&:email)
-        pending = pending - user_unchanged_emails
-
-        # binding.pry
-
-        #create any new superuser
+        
+        #create any new user
+        pending = Array(pending - user_allowed_emails - user_unchanged_emails)
         pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end
         user_created_emails = pending
-
+        
         #report on changes
         ActiveDirectoryLogin.logger.info "Staff allowed: #{staff_allowed_emails}"
         ActiveDirectoryLogin.logger.info "Staff disallowed: #{staff_disallowed_emails}"
@@ -263,13 +255,9 @@ module ActiveDirectoryLogin
         ActiveDirectoryLogin.logger.info "User disallowed: #{user_disallowed_emails}"
         ActiveDirectoryLogin.logger.info "User created: #{user_created_emails}"
         ActiveDirectoryLogin.logger.info "User unchanged: #{user_unchanged_emails}"
-
-
-
       end
 
- 
-
+      #report new numbers of users 
       ActiveDirectoryLogin.logger.info "Staff: #{User.staff.count}"
       ActiveDirectoryLogin.logger.info "Superusers: #{User.superusers.count}"
       ActiveDirectoryLogin.logger.info "Users: #{User.normals.count}"

data/lib/active_directory_login/version.rb

@@ -1,3 +1,3 @@
 module ActiveDirectoryLogin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/devise/strategies/active_directory_authenticatable.rb

@@ -8,28 +8,27 @@ module Devise
       def authenticate!
         #FIXME enterprise mode was here
         if params[:user]
-
           username_or_email = params[:user][:login]
-
-          ActiveDirectoryLogin.with_user(username_or_email, params[:user][:password]) do
-
-            if ActiveDirectoryLogin.authenticate_user
-              if ActiveDirectoryLogin.has_member_access?
-                user = ActiveDirectoryLogin.create_or_update_user
-                success!(user)
+          if ActiveDirectoryLogin.find_user(username_or_email).nil?
+            fail(:invalid)
+          else
+            ActiveDirectoryLogin.with_user(username_or_email, params[:user][:password]) do
+
+              if ActiveDirectoryLogin.authenticate_user
+                if ActiveDirectoryLogin.has_member_access?
+                  user = ActiveDirectoryLogin.create_or_update_user
+                  success!(user)
+                else
+                  ActiveDirectoryLogin.lock_user
+                  fail(:locked)
+                end
               else
-                ActiveDirectoryLogin.lock_user
-                fail(:locked)
+                fail(:invalid)
               end
-            else
-              fail(:invalid)
-            end
-
-          end #with_user
-
-        end
-      end
-    end
-
-  end
-end
+            end #with_user
+          end
+        end 
+      end # authenticate
+    end # class
+  end  # module
+end # module

data/spec/active_directory_login_spec.rb

@@ -1,94 +1,47 @@
 require 'spec_helper'
 require 'active_directory_login'
 require 'active_directory_login/group_resource'
-require 'active_directory_login/user_resource'
+
 require 'devise/strategies/authenticatable'
 require 'devise'
 describe ActiveDirectoryLogin do
 
   before do
-    @client = ActiveDirectoryLogin::Client.new({
-     auth_method: 'simple',
-     username: 'svcdgauth',
-     password: 'Friday10',
-     host: 'dnzdc3.datacom.co.nz',
-     port: '389',
-     base: 'DC=datacom,DC=co,DC=nz'
-     })
-    @client.connect!
-    @user_resource = ActiveDirectoryLogin::UserResource
-    @group_resource = ActiveDirectoryLogin::GroupResource
-
+    ActiveDirectoryLogin.auth_method = 'simple'
+    ActiveDirectoryLogin.username = 'svcdgauth'
+    ActiveDirectoryLogin.password = 'Friday10'
+    ActiveDirectoryLogin.host = 'dnzdc3.datacom.co.nz'
+    ActiveDirectoryLogin.port = '389'
+    ActiveDirectoryLogin.base = 'DC=datacom,DC=co,DC=nz'
+    ActiveDirectoryLogin.staff_dn = 'CN=DocGenie-Staff,OU=Datacom Systems Wellington,OU=Datacom Systems,OU=Groups - Universal Distribution Lists,DC=datacom,DC=co,DC=nz'
+    ActiveDirectoryLogin.superuser_dn = 'CN=DocGenie-SystemOwners,OU=Datacom Systems Wellington,OU=Datacom Systems,OU=Groups - Universal Distribution Lists,DC=datacom,DC=co,DC=nz'
+    ActiveDirectoryLogin.user_dn = 'CN=DocGenie-Users,OU=Datacom Systems Wellington,OU=Datacom Systems,OU=Groups - Universal Distribution Lists,DC=datacom,DC=co,DC=nz'
   end
 
-  let(:staff_group) {"CN=DocGenie-Staff,OU=Datacom Systems Wellington,OU=Datacom Systems,OU=Groups - Universal Distribution Lists,DC=datacom,DC=co,DC=nz"}
-
   describe '.user' do
 
     it 'requires a value' do
-      expect { @user_resource.find nil
+      expect { ActiveDirectoryLogin.find_user nil
        }.to raise_error ActiveDirectoryLogin::NoSearchKey
      end
 
      it 'requires a value' do
-      expect { @user_resource.find ''
+      expect { ActiveDirectoryLogin.find_user ''
        }.to raise_error ActiveDirectoryLogin::NoSearchKey
      end
 
    end
 
-   it 'finds me by username' do
+   it 'finds Brad by username' do
     login = 'bradmu'
-    user = @user_resource.find login
+    user = ActiveDirectoryLogin.find_user login
     user[:cn].should == "Brad Murray [DATACOM]"
   end
 
-  it 'finds me by email' do
+  it 'finds Brad by email' do
     login = 'brad.murray@datacom.co.nz'
-    user = @user_resource.find login
+    user = ActiveDirectoryLogin.find_user login
     user[:cn].should == "Brad Murray [DATACOM]"
   end
 
-
-  it 'finds me by email' do
-    login = 'brad.murray@datacom.co.nz'
-    user = @user_resource.find login
-    user[:cn].should == "Brad Murray [DATACOM]"
-  end
-
-  it 'finds DocGenie staff group' do
-    group = @group_resource.find staff_group
-    group.name.should == "DocGenie-Staff"
-  end
-
-  it 'can get members of DocGenie staff group' do
-    group = @group_resource.find staff_group
-    group.member.count.should == 5
-    @group_resource.member_names(group).should == ["Patrick Copeland [DATACOM]",
-    "Owen Bannister [DATACOM]",
-    "Tatyana Kudiyarova [DATACOM]",
-    "Brad Murray [DATACOM]",
-    "Blair Nilsson [DATACOM]"]
-  end
-
-  it 'can find user groups' do
-    login = 'owen.bannister@datacom.co.nz'
-    user = @user_resource.find login
-    groups = @user_resource.groups user
-    groups.count.should > 0
-    groups.include?(staff_group).should == true
-  end
-
-    # let(:User) { stub 'User'}
-  it 'can validate me by my groups' do
-    login = 'owen.bannister@datacom.co.nz'
-    user = @user_resource.find login
-
-    permission = @group_resource.has_group_access? @user_resource.groups(user)
-    permission.should == false
-
-    ENV['DG_STAFF_DN'] =  staff_group
-    permission = @group_resource.has_group_access? @user_resource.groups(user)
-    permission.should == true
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_directory_login
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brad Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler