active_directory 1.5.5 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d449033589eaaa462c257b527459168c87adb334
+  data.tar.gz: e564ced04b9c6db1105f4e053fd66cd211e25101
+SHA512:
+  metadata.gz: 9daaae94f3e5a87bdab9b2e35f7a29769303c2b1a22cb7eee81ebe31fab57063e4ee04680009fdd1c93db096c9bc36ee4dd8e98d3e94f6e9ce8e86a4ac49a854
+  data.tar.gz: 25ad84712752a54175df9c6904e38cff0befa84ac612e2b51f2ead76af01ae1364e41adeb9f50a2f26645107c7a502c5c7be2d63b605cdbfeb58e1feb7b2f84a

data/README.md

@@ -5,7 +5,7 @@ Ruby Integration with Microsoft's Active Directory system based on original code
 See documentation on ActiveDirectory::Base for more information.
 
 Caching:
-Queries for membership and group membership are based on the distinguished name of objects.  Doing a lot of queries, especially for a Rails app, is a sizable slowdown.  To alleviate the problem, I've implemented a very basic cache for queries which search by :distinguishedname.  This is diabled by default.  All other queries are unaffected.
+Queries for membership and group membership are based on the distinguished name of objects.  Doing a lot of queries, especially for a Rails app, is a sizable slowdown.  To alleviate the problem, I've implemented a very basic cache for queries which search by :distinguishedname.  This is disabled by default.  All other queries are unaffected.
 
 
 A code example is worth a thousand words:

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.6.0

data/active_directory.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: active_directory 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{active_directory}
-  s.version = "1.5.5"
+  s.name = "active_directory"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Adam T Kerr"]
-  s.date = %q{2011-04-28}
-  s.description = %q{ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying an Active Directory data store.  This is a fork of the activedirectory gem.}
-  s.email = %q{ajrkerr@gmail.com}
+  s.date = "2015-01-29"
+  s.description = "ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying an Active Directory data store.  This is a fork of the activedirectory gem."
+  s.email = "ajrkerr@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -36,13 +38,12 @@ Gem::Specification.new do |s|
     "lib/active_directory/member.rb",
     "lib/active_directory/user.rb"
   ]
-  s.homepage = %q{http://github.com/ajrkerr/active_directory}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{An interface library for accessing Microsoft's Active Directory.}
+  s.homepage = "http://github.com/ajrkerr/active_directory"
+  s.rubygems_version = "2.4.5"
+  s.summary = "An interface library for accessing Microsoft's Active Directory."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<net-ldap>, [">= 0.1.1"])

data/lib/active_directory.rb

@@ -81,5 +81,15 @@ module ActiveDirectory
       :memberof => :GroupDnArray,
       :member => :MemberDnArray,
     },
+
+    #Computer objects
+    :Computer => {
+      :objectguid => :Binary,
+      :whencreated => :Date,
+      :whenchanged => :Date,
+      :objectsid => :Binary,
+      :memberof => :GroupDnArray,
+      :member => :MemberDnArray,
+    },
   }
 end

data/lib/active_directory/base.rb

@@ -422,7 +422,8 @@ module ActiveDirectory
 			begin
 				attributes.merge!(required_attributes)
 				if @@ldap.add(:dn => dn.to_s, :attributes => attributes)
-					return find_by_distinguishedName(dn.to_s)
+					ldap_obj= @@ldap.search(:base => dn.to_s)
+					return new(ldap_obj[0])
 				else
 					return nil
 				end
@@ -555,7 +556,7 @@ module ActiveDirectory
 		end
 
 		def set_attr(name, value)
-			@attributes[name.to_sym] = encode_field(name, value)
+			@attributes[name.to_sym] = self.class.encode_field(name, value)
 		end
 
 		##

data/lib/active_directory/group.rb

@@ -98,7 +98,7 @@ module ActiveDirectory
 		# belong to this Group, or any of its subgroups, are returned.
 		# 
 		def member_users(recursive = false)
-                        @member_users = User.find(:all, :distinguishedname => @entry.member).delete_if { |u| u.nil? }
+                        @member_users = User.find(:all, :distinguishedname => @entry[:member]).delete_if { |u| u.nil? }
                         if recursive then
                           self.member_groups.each do |group|
                             @member_users.concat(group.member_users(true))
@@ -117,7 +117,7 @@ module ActiveDirectory
 		# belong to this Group, or any of its subgroups, are returned.
 		# 
 		def member_groups(recursive = false)
-                        @member_groups ||= Group.find(:all, :distinguishedname => @entry.member).delete_if { |g| g.nil? }
+                        @member_groups ||= Group.find(:all, :distinguishedname => @entry[:member]).delete_if { |g| g.nil? }
                         if recursive then
                           self.member_groups.each do |group|
                             @member_groups.concat(group.member_groups(true))

data/lib/active_directory/member.rb

@@ -28,7 +28,7 @@ module ActiveDirectory
 			group_dns = memberOf
 			return false if group_dns.nil? || group_dns.empty?
 			#group_dns = [group_dns] unless group_dns.is_a?(Array)
-			group_dns.include?(usergroup.dn)
+			group_dns.map{ |g| g.dn }.include?(usergroup.dn)
 		end
 
 		#

data/lib/active_directory/user.rb

@@ -24,6 +24,7 @@ module ActiveDirectory
 
 		UAC_ACCOUNT_DISABLED = 0x0002
 		UAC_NORMAL_ACCOUNT   = 0x0200 # 512
+		UAC_PASSWORD_NEVER_EXPIRES = 0x10000 #65536
 
 		def self.filter # :nodoc:
 			Net::LDAP::Filter.eq(:objectClass,'user') & ~Net::LDAP::Filter.eq(:objectClass,'computer')
@@ -104,6 +105,37 @@ module ActiveDirectory
 			userAccountControl.to_i & UAC_ACCOUNT_DISABLED != 0
 		end
 
+		#
+		# Disables the account
+		#
+		def disable
+			new_mask = userAccountControl.to_i | UAC_ACCOUNT_DISABLED
+			update_attributes userAccountControl: new_mask.to_s
+		end
+
+		#
+		# Enables the account
+		#
+		def enable
+			new_mask = userAccountControl.to_i ^ UAC_ACCOUNT_DISABLED
+			update_attributes userAccountControl: new_mask.to_s
+		end
+
+
+		#
+		# Returns true if this account is expired.
+		#
+		def expired?
+			!lockoutTime.nil? && lockoutTime.to_i != 0
+		end
+
+		#
+		# Returns true if this account has a password that does not expire.
+		#
+		def password_never_expires?
+			userAccountControl.to_i & UAC_PASSWORD_NEVER_EXPIRES != 0
+		end
+
 		#
 		# Returns true if the user should be able to log in with a correct
 		# password (essentially, their account is not disabled or locked

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_directory
 version: !ruby/object:Gem::Version
-  version: 1.5.5
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam T Kerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-28 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
-  requirement: &2153664380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153664380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: ActiveDirectory uses Net::LDAP to provide a means of accessing and modifying
   an Active Directory data store.  This is a fork of the activedirectory gem.
 email: ajrkerr@gmail.com
@@ -51,26 +53,25 @@ files:
 - lib/active_directory/user.rb
 homepage: http://github.com/ajrkerr/active_directory
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An interface library for accessing Microsoft's Active Directory.
 test_files: []