cratus 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f416f10ddf55e3793e1c74b6a366298c49784234
-  data.tar.gz: b81b929aaea8e813d3f2077ce683888e4ac5bf4d
+  metadata.gz: 95854c5b9a4fc245547081d9a0b87b59c68262d8
+  data.tar.gz: 2a74ec2d2bc5078a22217315b55c7c6679109023
 SHA512:
-  metadata.gz: 683028dbe910819bf36a842f01a88ceedeb5ca4b5b13f33c9b11501d9a8ed906296ea0a982830cf2a40ed514eda9e86a7b18f5d0173247048920eaeff1191b48
-  data.tar.gz: aa0671bc02866fab124a1361ad5187594e5c10ef90c390e2de5052ce35be50e731e4f9abc0e119806d1fbdaf37fb46ecc7d0cf56049c80dcf4f5df07e07a4d64
+  metadata.gz: db3ae770253d2b97fbb5dacf1b75d63c4fe886fba393bf03e8639e059b0a0a30daaef64f9251827a912bd2d11c3a0c4c28493b3e004ccd92e9efe6cbcca283b4
+  data.tar.gz: c6c2563ed6498dbb4dd6f495d79c4863d2910a6d7a1d3e9480c03d17732cb3ccc8bba248ef4b58fe27a0e81bde50f9392848e697c6d1c0808c851571bca2ee83

data/lib/cratus/user.rb

@@ -34,8 +34,24 @@ module Cratus
       @raw_ldap_data[Cratus.config.user_lockout_attribute].last
     end
 
+    # https://fossies.org/linux/web2ldap/pylib/w2lapp/schema/plugins/activedirectory.py
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms676843(v=vs.85).aspx
+    #
     def locked?
-      lockouttime != '0'
+      return false if lockouttime == '0'
+      epoch = 116_444_736_000_000_000
+      current = Time.now.to_i * 10_000_000
+      current - (lockouttime - epoch) < lockoutduration
+    end
+
+    def lockoutduration
+      raw_results = Cratus::LDAP.search(
+        '(objectClass=domain)',
+        basedn: Cratus.config.basedn,
+        attrs: 'lockoutDuration',
+        scope: 'object'
+      ).last
+      Integer(raw_results[:lockoutduration].last) * -1
     end
 
     def member_of

data/lib/cratus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cratus
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize