X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=60baacdc2b12433de6030a31f7c68c14d155a5d1;hb=c3bdc0a516ee5036c5d9ff45847e89e972dfb32f;hp=bea43724918963d82462dce1310c4aa232acfa1b;hpb=95ca1068f40ca7516ce9f9dc230fb179acfecd17;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index bea4372..60baacd 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -17,6 +17,10 @@ EX_PERMFAIL = 65;      # EX_DATAERR
 Error = 'Message Error';
 SeenKey = 0;
 SeenDNS = 0;
+mailRBL = {}
+mailRHSBL = {}
+mailWhitelist = {}
+SeenList = {}
 DNS = {}
 
 ArbChanges = {"c": "..",
@@ -27,10 +31,16 @@ ArbChanges = {"c": "..",
 	      "postalCode": ".*",
               "loginShell": ".*",
               "emailForward": "^([^<>@]+@.+)?$",
+              "jabberJID": "^([^<>@]+@.+)?$",
               "ircNick": ".*",
               "icqUin": "^[0-9]*$",
               "onVacation": ".*",
-              "labledURI": ".*"};
+              "labeledURI": ".*",
+              "birthDate": "^([0-9]{4})([01][0-9])([0-3][0-9])$",
+              "mailDisableMessage": ".*",
+	      "mailGreylisting": "^(TRUE|FALSE)$",
+	      "mailCallout": "^(TRUE|FALSE)$",
+};
 
 DelItems = {"c": None,
             "l": None,
@@ -41,12 +51,23 @@ DelItems = {"c": None,
             "emailForward": None,
             "ircNick": None,
             "onVacation": None,
-            "labledURI": None,
+            "labeledURI": None,
 	    "latitude": None,
 	    "longitude": None,
             "icqUin": None,
+            "jabberJID": None,
+            "jpegPhoto": None,
+            "dnsZoneEntry": None,
 	    "sshRSAAuthKey": None,
-	    "sshDSAAuthKey": None};
+	    "sshDSAAuthKey": None,
+            "birthDate" : None,
+            "mailGreylisting": None,
+            "mailCallout": None,
+            "mailRBL": None,
+            "mailRHSBL": None,
+            "mailWhitelist": None,
+            "mailDisableMessage": None,
+            };
 
 # Decode a GPS location from some common forms
 def LocDecode(Str,Dir):
@@ -126,6 +147,29 @@ def DoArbChange(Str,Attrs):
    if re.match(ArbChanges[attrName],G[1]) == None:
       raise Error, "Item does not match the required format"+ArbChanges[attrName];
 
+#   if attrName == 'birthDate':
+#      (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
+#    $bd_yr = $1; $bd_mo = $2; $bd_day = $3;
+#    if ($bd_mo > 0 and $bd_mo <= 12 and $bd_day > 0) {
+#      if ($bd_mo == 2) {
+#	 if ($bd_day == 29 and ($bd_yr == 0 or ($bd_yr % 4 == 0 && ($bd_yr % 100 != 0 || $bd_yr % 400 == 0)))) {
+#	   $bd_ok = 1;
+#	 } elsif ($bd_day <= 28) {
+#	   $bd_ok = 1;
+#	 }
+#      } elsif ($bd_mo == 4 or $bd_mo == 6 or $bd_mo == 9 or $bd_mo == 11) {
+#	if ($bd_day <= 30) {
+#	  $bd_ok = 1;
+#	}
+#      } else {
+#	if ($bd_day <= 31) {
+#	  $bd_ok = 1;
+#	}
+#      }
+#    }
+#  } elsif (not defined($query->param('birthdate')) or $query->param('birthdate') =~ /^\s*$/) {
+#    $bd_ok = 1;
+#  }
    Attrs.append((ldap.MOD_REPLACE,attrName,G[1]));
    return "Changed entry %s to %s"%(attrName,G[1]);
 
@@ -173,6 +217,9 @@ def DoPosition(Str,Attrs):
 def DoSSH(Str,Attrs):
    Match = SSH2AuthSplit.match(Str);
    if Match == None:
+      Match = re.compile('^1024 (\d+) ').match(Str)
+      if Match is not None:
+         return "SSH1 keys not supported anymore"
       return None;
    
    global SeenKey;
@@ -199,7 +246,12 @@ def DoDNS(Str,Attrs,DnRecord):
 
    # Check for collisions
    global l;
-   Rec = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"dnsZoneEntry="+G[0]+" *",["uid"]);
+   # [JT 20070409 - search for both tab and space suffixed hostnames
+   #  since we accept either.  It'd probably be better to parse the
+   #  incoming string in order to construct what we feed LDAP rather
+   #  than just passing it through as is.]
+   filter = "(|(dnsZoneEntry=%s	*)(dnsZoneEntry=%s *))" % (G[0], G[0])
+   Rec = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,filter,["uid"]);
    for x in Rec:
       if GetAttr(x,"uid") != GetAttr(DnRecord,"uid"):
          return "DNS entry is already owned by " + GetAttr(x,"uid")
@@ -226,6 +278,29 @@ def DoDNS(Str,Attrs,DnRecord):
    SeenDNS = 1;
    return "DNS Entry replaced with "+Str;
 
+# Handle an RBL list (mailRBL, mailRHSBL, mailWhitelist)
+def DoRBL(Str,Attrs):
+   Match = re.compile('^mail(rbl|rhsbl|whitelist) ([-a-z0-9.]+)$').match(string.lower(Str))
+   if Match == None:
+      return None
+   
+   if Match.group(1) == "rbl":
+      Key = "mailRBL"
+   if Match.group(1) == "rhsbl":
+      Key = "mailRHSBL"
+   if Match.group(1) == "whitelist":
+      Key = "mailWhitelist"
+   Host = Match.group(2)
+
+   global SeenList
+   if SeenList.has_key(Key):
+     Attrs.append((ldap.MOD_ADD,Key,Host))
+     return "%s added %s" % (Key,Host)
+      
+   Attrs.append((ldap.MOD_REPLACE,Key,Host))
+   SeenList[Key] = 1;
+   return "%s replaced with %s" % (Key,Host)
+
 # Handle an [almost] arbitary change
 def HandleChange(Reply,DnRecord,Key):
    global PlainText;
@@ -248,7 +323,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) or DoRBL(Line,Attrs);
       except:
          Res = None;
          Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value);
@@ -269,7 +344,8 @@ 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):
+   if ((string.find(GetAttr(oldAttrs[0],"userPassword"),"*LK*")  != -1) 
+       or GetAttr(oldAttrs[0],"userPassword").startswith("!")):
       raise Error, "This account is locked";
    Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn;
    l.modify_s(Dn,Attrs);
@@ -339,7 +415,8 @@ def HandleChPass(Reply,DnRecord,Key):
 
    # Check for a locked account
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid"));
-   if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*")  != -1):
+   if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*")  != -1) \
+             or GetAttr(Attrs[0],"userPassword").startswith("!"):
       raise Error, "This account is locked";
 
    # Modify the password