Import from samosa: The LDAP server in woody doesn't provide an

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

diff --git a/ud-mailgate b/ud-mailgate
index 6764c88..916ea6b 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -15,9 +15,9 @@ ReplayCacheFile = ConfModule.replaycachefile;
 EX_TEMPFAIL = 75;
 EX_PERMFAIL = 65;      # EX_DATAERR
 Error = 'Message Error';
-SeenRSA = 0;
-SeenDSA = 0;
+SeenKey = 0;
 SeenDNS = 0;
+DNS = {}
 
 ArbChanges = {"c": "..",
              "l": ".*",
@@ -158,50 +158,36 @@ 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 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 and \
-      re.match("^[\w-]+\s+in\s+mx\s+\d{1,3}\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None:
+   cname = re.match("^[-\w]+\s+in\s+cname\s+[-\w.]+\.$",Str,re.IGNORECASE);
+   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 cname == 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
-   G = re.match('^([\w-+]+)\s',Str).groups();
+   G = re.match('^([-\w+]+)\s',Str).groups();
 
    # Check for collisions
    global l;
@@ -211,6 +197,19 @@ def DoDNS(Str,Attrs,DnRecord):
          return "DNS entry is already owned by " + GetAttr(x,"uid")
 
    global SeenDNS;
+   global DNS;
+
+   if cname:
+     if DNS.has_key(G[0]):
+       return "CNAME and other RR types not allowed: "+Str
+     else:
+       DNS[G[0]] = 2
+   else:
+     if DNS.has_key(G[0]) and DNS[G[0]] == 2:
+       return "CNAME and other RR types not allowed: "+Str
+     else:
+       DNS[G[0]] = 1
+     
    if SeenDNS:
      Attrs.append((ldap.MOD_ADD,"dnszoneentry",Str));
      return "DNS Entry added "+Str;
@@ -241,7 +240,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 \
-                DoSSH2(Line,Attrs) or DoDel(Line,Attrs);
+                DoDel(Line,Attrs);
       except:
          Res = None;
          Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);