X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=UDLdap.py;h=096f117cde0c3a822e3bf5f76d6ff5b4f7cd0d23;hb=6b038cc113dde577b9cc19c62656bf6d2b41362d;hp=447368df5a0912172cf23e39ba72694dac38f408;hpb=d2d6818e697a6e286375e6f2279abaab6dff555a;p=mirror%2Fuserdir-ldap.git

diff --git a/UDLdap.py b/UDLdap.py
index 447368d..096f117 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -1,9 +1,10 @@
 import ldap
 import time
+import userdir_ldap
 
 class Account:
-    array_values = ['keyFingerPrint']
-    int_values = ['shadowExpire']
+    array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey', 'sudoPassword']
+    int_values = ['shadowExpire', 'gidNumber']
     defaults = {
                  'accountStatus': 'active',
                  'keyFingerPrint': []
@@ -29,7 +30,11 @@ class Account:
         if key in self.attributes:
             if key in self.array_values:
                 return self.attributes[key]
-            elif key in self.int_values:
+
+            if not len(self.attributes[key]) == 1:
+                raise ValueError, 'non-array value has not exactly one value'
+
+            if key in self.int_values:
                 return int(self.attributes[key][0])
             else:
                 return self.attributes[key][0]
@@ -50,6 +55,8 @@ class Account:
     def pw_active(self):
         if self['userPassword'] == '{crypt}*LK*':
             return False
+        if self['userPassword'].startswith("!"):
+            return False
         return True
 
     # not expired
@@ -62,6 +69,14 @@ 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):
+        return userdir_ldap.DecDegree(self['longitude'], anonymized)
+
     def verbose_status(self):
         status = []
         status.append('mail: %s'  %(['disabled', 'active'][ self.has_mail() ]))