X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=6764c88414bca87a22f43d7a4c20131a291bd13e;hb=205ad9a922a6940ad5c85104f3fd08c5b4874138;hp=4e3b39dff3e3925b4f13b63072deb1109d698004;hpb=b646eaa10995f71469f5fb18c432d13bf3f884ac;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 4e3b39d..6764c88 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -16,6 +16,7 @@ EX_TEMPFAIL = 75;
 EX_PERMFAIL = 65;      # EX_DATAERR
 Error = 'Message Error';
 SeenRSA = 0;
+SeenDSA = 0;
 SeenDNS = 0;
 
 ArbChanges = {"c": "..",
@@ -44,7 +45,8 @@ DelItems = {"c": None,
 	    "latitude": None,
 	    "longitude": None,
             "icquin": None,
-	    "sshrsaauthkey": None};
+	    "sshrsaauthkey": None,
+	    "sshdsaauthkey": None};
 
 # Decode a GPS location from some common forms
 def LocDecode(Str,Dir):
@@ -172,13 +174,30 @@ def DoSSH(Str,Attrs):
    SeenRSA = 1;
    return "SSH Keys replaced with "+FormatSSHAuth(Str);
 
+# Handle a SSH DSA authentication key, the line format is:
+#  ssh-dss [key] [comment]
+def DoSSH2(Str,Attrs):
+   Match = SSHDSAAuthSplit.match(Str);
+   if Match == None:
+      return None;
+
+   global SeenDSA;
+   if SeenDSA:
+     Attrs.append((ldap.MOD_ADD,"sshdsaauthkey",Str));
+     return "SSH2 Key added "+FormatSSH2Auth(Str);
+      
+   Attrs.append((ldap.MOD_REPLACE,"sshdsaauthkey",Str));
+   SeenDSA = 1;
+   return "SSH2 Keys replaced with "+FormatSSH2Auth(Str);
+
 # Handle changing a dns entry
 #  host in a 12.12.12.12
 #  host in cname foo.bar.    <- Trailing dot is required
 def DoDNS(Str,Attrs,DnRecord):
    if re.match('^[\w-]+\s+in\s+a\s+\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$',\
         Str,re.IGNORECASE) == None and \
-      re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
+      re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None and \
+      re.match("^[\w-]+\s+in\s+mx\s+\d{1,3}\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
      return None;     
 
    # Check if the name is already taken
@@ -203,7 +222,7 @@ def DoDNS(Str,Attrs,DnRecord):
 # Handle an [almost] arbitary change
 def HandleChange(Reply,DnRecord,Key):
    global PlainText;
-   Lines = string.split(PlainText,"\r\n");
+   Lines = re.split("\n *\r?",PlainText);
 
    Result = "";
    Attrs = [];
@@ -222,7 +241,7 @@ def HandleChange(Reply,DnRecord,Key):
          else:
            Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \
                  DoArbChange(Line,Attrs) or DoSSH(Line,Attrs) or \
-                 DoDel(Line,Attrs);
+		 DoSSH2(Line,Attrs) or DoDel(Line,Attrs);
       except:
          Res = None;
          Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);