ssh2 RSA support. have only one SSH key field for all three key styles

[mirror/userdir-ldap.git] / ud-mailgate

diff --git a/ud-mailgate b/ud-mailgate
index 3cd2f00..cdd3fd4 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -15,7 +15,7 @@ ReplayCacheFile = ConfModule.replaycachefile;
 EX_TEMPFAIL = 75;
 EX_PERMFAIL = 65;      # EX_DATAERR
 Error = 'Message Error';
-SeenRSA = 0;
+SeenKey = 0;
 SeenDNS = 0;
 
 ArbChanges = {"c": "..",
@@ -44,7 +44,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):
@@ -156,20 +157,22 @@ def DoPosition(Str,Attrs):
    Attrs.append((ldap.MOD_REPLACE,"longitude",sLong));
    return "Position set to %s/%s (%s/%s decimal degrees)"%(sLat,sLong,Lat,Long);
 
-# Handle a SSH RSA authentication key, the line format is:
+# Handle an SSH authentication key, the line format is:
 #  [options] 1024 35 13188913666680[..] [comment]
 def DoSSH(Str,Attrs):
    Match = SSHAuthSplit.match(Str);
    if Match == None:
-      return None;
+      Match = SSH2AuthSplit.match(Str);
+      if Match == None:
+         return None;
    
-   global SeenRSA;
-   if SeenRSA:
+   global SeenKey;
+   if SeenKey:
      Attrs.append((ldap.MOD_ADD,"sshrsaauthkey",Str));
      return "SSH Key added "+FormatSSHAuth(Str);
       
    Attrs.append((ldap.MOD_REPLACE,"sshrsaauthkey",Str));
-   SeenRSA = 1;
+   SeenKey = 1;
    return "SSH Keys replaced with "+FormatSSHAuth(Str);
 
 # Handle changing a dns entry
@@ -204,7 +207,7 @@ def DoDNS(Str,Attrs,DnRecord):
 # Handle an [almost] arbitary change
 def HandleChange(Reply,DnRecord,Key):
    global PlainText;
-   Lines = re.split("\n *\r",PlainText);
+   Lines = re.split("\n *\r?",PlainText);
 
    Result = "";
    Attrs = [];
@@ -223,7 +226,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);
+                DoDel(Line,Attrs);
       except:
          Res = None;
          Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);