X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=7c62c8886b223eea35f4a207d9826713e9b9c762;hb=8bedb26f6cfb5410fdfee34a78ff4644f6d5ced0;hp=680b14defe14383a25c3659523a320cb2ee5840c;hpb=01939936733285ba75e071638936a05bc944276f;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 680b14d..7c62c88 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -30,7 +30,7 @@ ArbChanges = {"c": "..",
               "ircNick": ".*",
               "icqUin": "^[0-9]*$",
               "onVacation": ".*",
-              "labledURI": ".*"};
+              "labeledURI": ".*"};
 
 DelItems = {"c": None,
             "l": None,
@@ -41,10 +41,11 @@ DelItems = {"c": None,
             "emailForward": None,
             "ircNick": None,
             "onVacation": None,
-            "labledURI": None,
+            "labeledURI": None,
 	    "latitude": None,
 	    "longitude": None,
             "icqUin": None,
+            "dnsZoneEntry": None,
 	    "sshRSAAuthKey": None,
 	    "sshDSAAuthKey": None};
 
@@ -114,15 +115,20 @@ def DoArbChange(Str,Attrs):
    if Match == None:
       return None;
    G = Match.groups();
-   
-   if ArbChanges.has_key(G[0]) == 0:
+
+   attrName = G[0].lower();
+   for i in ArbChanges.keys():
+      if i.lower() == attrName:
+         attrName = i;
+         break;
+   if ArbChanges.has_key(attrName) == 0:
       return None;
-      
-   if re.match(ArbChanges[G[0]],G[1]) == None:
-      raise Error, "Item does not match the required format"+ArbChanges[G[0]];
 
-   Attrs.append((ldap.MOD_REPLACE,G[0],G[1]));
-   return "Changed entry %s to %s"%(G[0],G[1]);
+   if re.match(ArbChanges[attrName],G[1]) == None:
+      raise Error, "Item does not match the required format"+ArbChanges[attrName];
+
+   Attrs.append((ldap.MOD_REPLACE,attrName,G[1]));
+   return "Changed entry %s to %s"%(attrName,G[1]);
 
 # Handle changing a set of arbitary fields
 #  <field>: value
@@ -131,12 +137,17 @@ def DoDel(Str,Attrs):
    if Match == None:
       return None;
    G = Match.groups();
- 
-   if DelItems.has_key(G[0]) == 0:
-      return "Cannot erase entry %s"%(G[0]);
 
-   Attrs.append((ldap.MOD_DELETE,G[0],None));
-   return "Removed entry %s"%(G[0]);
+   attrName = G[0].lower();
+   for i in DelItems.keys():
+      if i.lower() == attrName:
+         attrName = i;
+         break;
+   if DelItems.has_key(attrName) == 0:
+      return "Cannot erase entry %s"%(attrName);
+
+   Attrs.append((ldap.MOD_DELETE,attrName,None));
+   return "Removed entry %s"%(attrName);
 
 # Handle a position change message, the line format is:
 #  Lat: -12412.23 Long: +12341.2342
@@ -161,11 +172,12 @@ def DoPosition(Str,Attrs):
 # Handle an SSH authentication key, the line format is:
 #  [options] 1024 35 13188913666680[..] [comment]
 def DoSSH(Str,Attrs):
-   Match = SSHAuthSplit.match(Str);
+   Match = SSH2AuthSplit.match(Str);
    if Match == None:
-      Match = SSH2AuthSplit.match(Str);
-      if Match == None:
-         return None;
+      Match = re.compile('^1024 (\d+) ').match(Str)
+      if Match is not None:
+         return "SSH1 keys not supported anymore"
+      return None;
    
    global SeenKey;
    if SeenKey:
@@ -260,6 +272,9 @@ def HandleChange(Reply,DnRecord,Key):
 
    # Modify the record
    l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]);
+   oldAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
+   if (string.find(GetAttr(oldAttrs[0],"userPassword"),"*LK*")  != -1):
+      raise Error, "This account is locked";
    Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
    l.modify_s(Dn,Attrs);
 
@@ -360,7 +375,8 @@ try:
    Msg = GetClearSig(Email);
 
    ErrMsg = "Message is not PGP signed:"
-   if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1:
+   if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1 and \
+      string.find(Msg[0],"-----BEGIN PGP MESSAGE-----") == -1:
       raise Error, "No PGP signature";
    
    # Check the signature
@@ -390,7 +406,6 @@ try:
    Rply = RC.Check(Res[1]);
    if Rply != None:
       raise Error, Rply;
-   RC.Add(Res[1]);
 
    # Connect to the ldap server
    ErrType = EX_TEMPFAIL;
@@ -401,13 +416,16 @@ try:
 
    # Search for the matching key fingerprint
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + Res[2][1]);
+
+   ErrType = EX_PERMFAIL;
    if len(Attrs) == 0:
       raise Error, "Key not found"
    if len(Attrs) != 1:
       raise Error, "Oddly your key fingerprint is assigned to more than one account.."
 
+   RC.Add(Res[1]);
+
    # Determine the sender address
-   ErrType = EX_PERMFAIL;
    ErrMsg = "A problem occured while trying to formulate the reply";
    Sender = Email.getheader("Reply-To");
    if Sender == None:
@@ -415,9 +433,6 @@ try:
    if Sender == None:
       raise Error, "Unable to determine the sender's address";
 
-   if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*")  != -1):
-      raise Error, "This account is locked";
-
    # Formulate a reply
    Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
    Reply = "To: %s\nReply-To: %s\nDate: %s\n" % (Sender,ReplyTo,Date);