X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=UDLdap.py;h=b546112af6a3abb636e5f0a4b0f62a6fd00cb4c4;hb=0fde94b6b3add31a1c17933cfda802bdabfe831e;hp=01553459bcac7d769faca1a08d9fb600d3d85157;hpb=b6f36909f626ad4c95ae63996583e34f23d77ff1;p=mirror%2Fuserdir-ldap.git

diff --git a/UDLdap.py b/UDLdap.py
index 0155345..b546112 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -1,6 +1,8 @@
 import ldap
 import time
+import datetime
 import userdir_ldap
+import sys
 
 class Account:
     array_values = ['objectClass', 'keyFingerPrint', 'mailWhitelist', 'mailRBL',
@@ -41,7 +43,7 @@ class Account:
         elif key in self.defaults:
             return self.defaults[key]
         else:
-            raise IndexError
+            raise IndexError, "No such key: %s (dn: %s)"%(key, self.dn)
 
     def __contains__(self, key):
         return key in self.attributes
@@ -53,15 +55,17 @@ class Account:
 
     # not locked locked,  just reset to something invalid like {crypt}*SSLRESET* is still active
     def pw_active(self):
-        if self['userPassword'] == '{crypt}*LK*':
+        if not 'userPassword' in self:
             return False
-        if self['userPassword'].startswith("{crypt}!"):
+        if self['userPassword'].upper() == '{CRYPT}*LK*':
+            return False
+        if self['userPassword'].upper().startswith("{CRYPT}!"):
             return False
         return True
 
     def get_password(self):
         p = self['userPassword']
-        if not p.startswith('{crypt}') or len(p) > 50:
+        if not p.upper().startswith('{CRYPT}') or len(p) > 50:
             return p
         else:
             return p[7:]
@@ -108,6 +112,24 @@ class Account:
         tokens.append(mailbox)
         return ' '.join(tokens)
 
+    def is_allowed_by_hostacl(self, host):
+        if not 'allowedHost' in self: return False
+        if host in self['allowedHost']: return True
+        # or maybe it's a date limited ACL
+        for entry in self['allowedHost']:
+            list = entry.split(None,1)
+            if len(list) == 1: continue
+            (h, expire) = list
+            if host != h: continue
+            try:
+                parsed = datetime.datetime.strptime(expire, '%Y%m%d')
+            except ValueError:
+                print >>sys.stderr, "Cannot parse expiry date in '%s' in hostACL entry for %s."%(entry, self['uid'])
+                return False
+            return parsed >= datetime.datetime.now()
+        return False
+
+
 # vim:set et:
 # vim:set ts=4:
 # vim:set shiftwidth=4: