cratus 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03546e33c0cbcd721059db8bee9f197fc831b55c
-  data.tar.gz: 9880fb938e1a84cd89fc28d0f4d762a6b3d5371a
+  metadata.gz: 2a7f6ee41d2c3cb44be9ed8cb997b5f04d5863a3
+  data.tar.gz: 183f3884544b5e1849b381544c0cf483edb97795
 SHA512:
-  metadata.gz: 0aeb98394522da853724b82fda06d2a429185c29115cb0b74f275362cc8ad738902a144dcf1da5861fc970f012309915927a76c3dee9da5771d160c3d4ce927c
-  data.tar.gz: 80ecee4931f58e86b5cb497d1a34ac0699b9738f65f4734b4217b29273273f9f924af8a0968ba31696394d2d80f03b8eb50da28037498f7706835fea4805d1ae
+  metadata.gz: 6fbbd87ce2d16d4e9edb2f9e0103d3e52a6eb687839ca96e0507b3f8acbf1fbd1887aaff7dddd3fc1f29533e5550392efcfe41f213b0deb11cc6df34003d4184
+  data.tar.gz: 0332fbe4a461dd29ee3ce5fa17e81ab7aef9db17b95fd353d9fa459ffa2370f193bccfa7cc7b9c3951335f5cf695d0484cb2159d6780bc037812bcaaa2883ace

data/lib/cratus/config.rb

@@ -14,6 +14,7 @@ module Cratus
         user_dn_attribute: :samaccountname,
         user_objectclass: :user,
         user_basedn: 'ou=users,dc=example,dc=com',
+        user_account_control_attribute: :userAccountControl,
         user_department_attribute: :department,
         user_lockout_attribute: :lockouttime,
         user_mail_attribute: :mail,

data/lib/cratus/user.rb

@@ -7,11 +7,7 @@ module Cratus
     def initialize(username)
       @username = username
       @search_base = self.class.ldap_search_base
-      @raw_ldap_data = Cratus::LDAP.search(
-        "(#{self.class.ldap_dn_attribute}=#{@username})",
-        basedn: @search_base,
-        attrs: self.class.ldap_return_attributes
-      ).last
+      refresh
     end
 
     # Add a user to a group
@@ -32,6 +28,25 @@ module Cratus
       @raw_ldap_data[Cratus.config.user_department_attribute].last
     end
 
+    # Disables an enabled user
+    def disable
+      if enabled?
+        Cratus::LDAP.replace_attribute(
+          dn,
+          Cratus.config.user_account_control_attribute,
+          ['514']
+        )
+        refresh
+      else
+        true
+      end
+    end
+
+    def disabled?
+      status = @raw_ldap_data[Cratus.config.user_account_control_attribute].last
+      status.to_s == '514'
+    end
+
     def dn
       @raw_ldap_data[:dn].last
     end
@@ -40,6 +55,25 @@ module Cratus
       @raw_ldap_data[Cratus.config.user_mail_attribute].last
     end
 
+    # Enables a disabled user
+    def enable
+      if disabled?
+        Cratus::LDAP.replace_attribute(
+          dn,
+          Cratus.config.user_account_control_attribute,
+          ['512']
+        )
+        refresh
+      else
+        true
+      end
+    end
+
+    def enabled?
+      status = @raw_ldap_data[Cratus.config.user_account_control_attribute].last
+      status.to_s == '512'
+    end
+
     def fullname
       @raw_ldap_data[Cratus.config.user_displayname_attribute].last
     end
@@ -90,6 +124,32 @@ module Cratus
 
     alias groups member_of
 
+    def refresh
+      @raw_ldap_data = Cratus::LDAP.search(
+        "(#{self.class.ldap_dn_attribute}=#{@username})",
+        basedn: @search_base,
+        attrs: self.class.ldap_return_attributes
+      ).last
+    end
+
+    # Unlocks a user
+    # @return `true` on success (or if user is already unlocked)
+    # @return `false` when the account is disabled (unlocking not permitted)
+    def unlock
+      if locked? && enabled?
+        Cratus::LDAP.replace_attribute(
+          dn,
+          Cratus.config.user_lockout_attribute,
+          ['0']
+        )
+        refresh
+      elsif disabled?
+        false
+      else
+        true
+      end
+    end
+
     def <=>(other)
       @username <=> other.username
     end
@@ -121,7 +181,8 @@ module Cratus
         Cratus.config.user_mail_attribute.to_s,
         Cratus.config.user_displayname_attribute.to_s,
         Cratus.config.user_memberof_attribute.to_s,
-        Cratus.config.user_lockout_attribute.to_s
+        Cratus.config.user_lockout_attribute.to_s,
+        Cratus.config.user_account_control_attribute.to_s
       ]
     end
 

data/lib/cratus/version.rb

@@ -2,7 +2,7 @@
 module Cratus
   def self.version
     major = 0 # Breaking, incompatible releases
-    minor = 4 # Compatible, but new features
+    minor = 5 # Compatible, but new features
     patch = 0 # Fixes to existing features
     [major, minor, patch].map(&:to_s).join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cratus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize