active_directory_login 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35dbce9c799a3b240d53d37db932486d6b13b138
-  data.tar.gz: 897280b514e3103f8be0fbf6ea37f2482064458a
+  metadata.gz: bde1eff05aead0e087f583609f5c402284e7e705
+  data.tar.gz: 0129cc791a556e88f2092121d558bd5275e8cd27
 SHA512:
-  metadata.gz: a59a6f2317c42c66fbf0773a435a64ec474c3bca2a7ff64bb0d6c4ef9e9f03e72a576e565cd879d25bb995b642ac75a0c8ff07ad51f41507d3545719becf9187
-  data.tar.gz: e628d1e43fe5e7d8ea607a66cf43de44810377cacc1d35fd333cd5dd4bee9bfd49c19dfad41e3dc2297c5adb4a0241e7cebaad42958355cfb1171517e58dd550
+  metadata.gz: c3cbe0ad635d7e64f057d299768fd55810284dfff9ac4ec38f83d0237b4be083cc8fa6e4c1a803704bc27986813337995a141f8f1540a6a02a4173f79b07e95d
+  data.tar.gz: 743a5549e04b87219b295d44f060441d2b69759344c2ce697d090e983942f3cad031c4bf95d14a7136a18e11beb1b5f36fbd455c61c4b876b9629de1e6a6ecd7

data/lib/active_directory_login/client.rb

@@ -93,8 +93,8 @@ module ActiveDirectoryLogin
     end
 
     def query
-      ad_email = @ad_user.mail.downcase
-      @query =  User.where { (provider == User::LDAP) & (email =~ ad_email) }
+      ad_username = @ad_user.sAMAccountName.downcase
+      @query =  User.where { (provider == User::LDAP) & (username =~ ad_username) }
     end
 
     def create_or_update_user
@@ -123,10 +123,10 @@ module ActiveDirectoryLogin
       ensure_connection
       raise NoSearchKey unless username_or_email && !username_or_email.empty?
 
-      ad_key  = (username_or_email =~ /@/) ? :mail : :sAMAccountName
-      ad_user = ActiveDirectory::User.find(:first, ad_key => username_or_email)
-      if ad_user.nil? # User hasnt used their primary email so try the secondary
-        ad_user = ActiveDirectory::User.find(:first,  "msrtcsip-primaryuseraddress" => "sip:#{username_or_email}")
+      if (username_or_email =~ /@/)
+        ad_user = ActiveDirectory::User.find(:first, proxyaddresses: "smtp:#{username_or_email}")
+      else
+        ad_user = ActiveDirectory::User.find(:first, sAMAccountName: username_or_email)
       end
       ad_user
     end
@@ -171,91 +171,93 @@ module ActiveDirectoryLogin
 
         # update staff
         staff_group = find_group(staff_dn)
-        staff_member_emails = staff_group.member.collect(&:mail).map(&:downcase)
-        
-        allowed = User.where(email: staff_member_emails, staff: false)
-        staff_allowed_emails = allowed.collect(&:email)
+        staff_member_names = staff_group.member.map { |u| u.sAMAccountName.downcase }
+
+        # users not flagged as staff in docgenie but in AD staff group
+        allowed = User.where { (lower(username).in staff_member_names) & (staff == false) }
         allowed.update_all(staff: true)
+        staff_allowed_names = allowed.map { |u| u.username.downcase }
         
-        disallowed = User.where.not(email: staff_member_emails).where(staff: true)
-        staff_disallowed_emails = disallowed.collect(&:email)
+        # users flagged as staff in docgenie but not in AD staff group
+        disallowed = User.where { (lower(username).not_in staff_member_names) & (staff == true) }
         disallowed.update_all(staff: false)
+        staff_disallowed_names = disallowed.map { |u| u.username.downcase }
 
-        staff_unchanged = User.where(email: staff_member_emails, staff: true)
-        staff_unchanged_emails = staff_unchanged.collect(&:email)
+        # users flagged as staff in docgenie and in AD staff group
+        staff_unchanged = User.where { (lower(username).in staff_member_names) & (staff == true) }
+        staff_unchanged_names = staff_unchanged.map { |u| u.username.downcase }
 
-        # create any new staff
-        pending = Array(staff_member_emails - staff_allowed_emails - staff_unchanged_emails)
-        pending.each do |pending_email|
-          with_user(pending_email, SecureRandom.hex){ create_or_update_user }
+        # users in AD staff group but not in docgenie (at all)
+        pending = Array(staff_member_names - staff_allowed_names - staff_unchanged_names)
+        pending.each do |pending_name|
+          with_user(pending_name, SecureRandom.hex){ create_or_update_user }
         end
-        staff_created_emails = pending
+        staff_created_names = pending
 
 
         ## update superuser
         superuser_group = find_group(superuser_dn)
-        superuser_member_emails = superuser_group.member.collect(&:mail).map(&:downcase)
-        superuser_member_emails = superuser_member_emails - staff_member_emails
+        superuser_member_names = superuser_group.member.map { |u| u.sAMAccountName.downcase } - staff_member_names
         
-        allowed = User.where(email: superuser_member_emails, superuser: false)
-        superuser_allowed_emails = allowed.collect(&:email)
+        allowed = User.where { (lower(username).in superuser_member_names) & (staff == false) }
         allowed.update_all(superuser: true)
+        superuser_allowed_names = allowed.map { |u| u.username.downcase }
         
-        disallowed = User.where.not(email: superuser_member_emails).where(superuser: true)
-        superuser_disallowed_emails = disallowed.collect(&:email)
+        disallowed = User.where { (lower(username).not_in superuser_member_names) & (staff == true) }
         disallowed.update_all(superuser: false)
+        superuser_disallowed_names = disallowed.map { |u| u.username.downcase }
 
-        superuser_unchanged = User.where(email: superuser_member_emails, superuser: true)
-        superuser_unchanged_emails = superuser_unchanged.collect(&:email)
+        superuser_unchanged = User.where { (lower(username).in superuser_member_names) & (staff == true) }
+        superuser_unchanged_names = superuser_unchanged.map { |u| u.username.downcase }
         
         # create any new superuser
-        pending = Array(superuser_member_emails - superuser_allowed_emails - superuser_unchanged_emails)
-        pending.each do |pending_email|
-          with_user(pending_email, SecureRandom.hex){ create_or_update_user }
+        pending = Array(superuser_member_names - superuser_allowed_names - superuser_unchanged_names)
+        pending.each do |pending_name|
+          with_user(pending_name, SecureRandom.hex){ create_or_update_user }
         end
-        superuser_created_emails = pending
+        superuser_created_names = pending
 
 
 
 
         ## update users
         user_group = find_group(user_dn)
-        member_emails = user_group.member.collect(&:mail).map(&:downcase)
-        member_emails = member_emails - superuser_member_emails - staff_member_emails
+        member_names = user_group.member.map { |u| u.sAMAccountName.downcase }
+        member_names = member_names - superuser_member_names - staff_member_names
         
-        allowed = User.where(email: member_emails, staff: false, superuser: false).where.not(locked_at: nil)
-        user_allowed_emails = allowed.collect(&:email)
+        allowed = User.where { (lower(username).in member_names) & (staff == false) & (superuser == false) & (locked_at != nil) }
         allowed.update_all(locked_at: nil)
+        user_allowed_names = allowed.map { |u| u.username.downcase }
         
-        disallowed = User.where.not(email: member_emails).where(staff: false, superuser: false)
-        user_disallowed_emails = disallowed.collect(&:email)
-        disallowed.each {|u| u.lock_access! }
+        disallowed = User.where { (lower(username).not_in member_names) & (staff == false) & (superuser == false) & (locked_at == nil) }
+        disallowed.each { |u| u.lock_access! }
+        user_disallowed_names = disallowed.map { |u| u.username.downcase }
 
-        user_unchanged = User.where(email: member_emails, staff: false, superuser: false)
-        user_unchanged_emails = user_unchanged.collect(&:email)
+        user_unchanged = User.where { (lower(username).in member_names) & (staff == false) & (superuser == false) & (locked_at == nil) }
+        user_unchanged_names = user_unchanged.map { |u| u.username.downcase }
         
         #create any new user
-        pending = Array(member_emails - user_allowed_emails - user_unchanged_emails)
-        pending.each do |pending_email|
-          with_user(pending_email, SecureRandom.hex){ create_or_update_user }
+        pending = Array(member_names - user_allowed_names - user_unchanged_names)
+        pending.each do |pending_name|
+          with_user(pending_name, SecureRandom.hex){ create_or_update_user }
         end
-        user_created_emails = pending
+        user_created_names = pending
         
         #report on changes
-        ActiveDirectoryLogin.logger.info "Staff allowed: #{staff_allowed_emails}"
-        ActiveDirectoryLogin.logger.info "Staff disallowed: #{staff_disallowed_emails}"
-        ActiveDirectoryLogin.logger.info "Staff created: #{staff_created_emails}"
-        ActiveDirectoryLogin.logger.info "Staff unchanged: #{staff_unchanged_emails}"
+        ActiveDirectoryLogin.logger.info "Staff allowed: #{staff_allowed_names}"
+        ActiveDirectoryLogin.logger.info "Staff disallowed: #{staff_disallowed_names}"
+        ActiveDirectoryLogin.logger.info "Staff created: #{staff_created_names}"
+        ActiveDirectoryLogin.logger.info "Staff unchanged: #{staff_unchanged_names}"
         
-        ActiveDirectoryLogin.logger.info "Superusers allowed: #{superuser_allowed_emails}"
-        ActiveDirectoryLogin.logger.info "Superusers disallowed: #{superuser_disallowed_emails}"
-        ActiveDirectoryLogin.logger.info "Superusers created: #{superuser_created_emails}"
-        ActiveDirectoryLogin.logger.info "Superusers unchanged: #{superuser_unchanged_emails}"
+        ActiveDirectoryLogin.logger.info "Superusers allowed: #{superuser_allowed_names}"
+        ActiveDirectoryLogin.logger.info "Superusers disallowed: #{superuser_disallowed_names}"
+        ActiveDirectoryLogin.logger.info "Superusers created: #{superuser_created_names}"
+        ActiveDirectoryLogin.logger.info "Superusers unchanged: #{superuser_unchanged_names}"
         
-        ActiveDirectoryLogin.logger.info "User allowed: #{user_allowed_emails}"
-        ActiveDirectoryLogin.logger.info "User disallowed: #{user_disallowed_emails}"
-        ActiveDirectoryLogin.logger.info "User created: #{user_created_emails}"
-        ActiveDirectoryLogin.logger.info "User unchanged: #{user_unchanged_emails}"
+        ActiveDirectoryLogin.logger.info "User allowed: #{user_allowed_names}"
+        ActiveDirectoryLogin.logger.info "User disallowed: #{user_disallowed_names}"
+        ActiveDirectoryLogin.logger.info "User created: #{user_created_names}"
+        ActiveDirectoryLogin.logger.info "User unchanged: #{user_unchanged_names}"
       end
 
       #report new numbers of users 
@@ -288,4 +290,4 @@ module ActiveDirectoryLogin
 
 
   end #class
-end
+end

data/lib/active_directory_login/version.rb

@@ -1,3 +1,3 @@
 module ActiveDirectoryLogin
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

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