Let disabled-users generation use Account class

[mirror/userdir-ldap.git] / UDLdap.py

diff --git a/UDLdap.py b/UDLdap.py
index 3dc2b74..9e2d2ee 100644 (file)
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -31,7 +31,10 @@ class Account:
             if key in self.array_values:
                 return self.attributes[key]
             elif key in self.int_values:
-                return int(self.attributes[key][0])
+                if len(self.attributes[key]) == 1:
+                    return int(self.attributes[key][0])
+                else:
+                    raise ValueError, 'non-array value has not exactly one value'
             else:
                 return self.attributes[key][0]
         elif key in self.defaults:
@@ -51,6 +54,8 @@ class Account:
     def pw_active(self):
         if self['userPassword'] == '{crypt}*LK*':
             return False
+        if self['userPassword'].startswith("!"):
+            return False
         return True
 
     # not expired
@@ -63,6 +68,9 @@ class Account:
     def numkeys(self):
         return len(self['keyFingerPrint'])
 
+    def is_active_user(self):
+        return self['accountStatus'] == 'active' and self.numkeys() != 0
+
     def latitude_dec(self, anonymized=False):
         return userdir_ldap.DecDegree(self['latitude'], anonymized)
     def longitude_dec(self, anonymized=False):