X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=bea43724918963d82462dce1310c4aa232acfa1b;hb=9e1e7b0639b1265bf39acd330122f40123451c56;hp=6e94c75fadba29cc2f2826af9499871902cdfda0;hpb=2525bf73603cb6487cfcea096e2dc347ad360394;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 6e94c75..bea4372 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -15,34 +15,38 @@ ReplayCacheFile = ConfModule.replaycachefile; EX_TEMPFAIL = 75; EX_PERMFAIL = 65; # EX_DATAERR Error = 'Message Error'; -SeenRSA = 0; +SeenKey = 0; SeenDNS = 0; +DNS = {} ArbChanges = {"c": "..", "l": ".*", - "facsimiletelephonenumber": ".*", - "telephonenumber": ".*", - "postaladdress": ".*", - "postalcode": ".*", - "loginshell": ".*", - "emailforward": "^([^<>@]+@.+)?$", - "ircnick": ".*", - "onvacation": ".*", - "labeledurl": ".*"}; + "facsimileTelephoneNumber": ".*", + "telephoneNumber": ".*", + "postalAddress": ".*", + "postalCode": ".*", + "loginShell": ".*", + "emailForward": "^([^<>@]+@.+)?$", + "ircNick": ".*", + "icqUin": "^[0-9]*$", + "onVacation": ".*", + "labledURI": ".*"}; DelItems = {"c": None, "l": None, - "facsimiletelephonenumber": None, - "telephonenumber": None, - "postaladdress": None, - "postalcode": None, - "emailforward": None, - "ircnick": None, - "onvacation": None, - "labeledurl": None, + "facsimileTelephoneNumber": None, + "telephoneNumber": None, + "postalAddress": None, + "postalCode": None, + "emailForward": None, + "ircNick": None, + "onVacation": None, + "labledURI": None, "latitude": None, "longitude": None, - "sshrsaauthkey": None}; + "icqUin": None, + "sshRSAAuthKey": None, + "sshDSAAuthKey": None}; # Decode a GPS location from some common forms def LocDecode(Str,Dir): @@ -110,15 +114,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 # : value @@ -127,12 +136,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 @@ -154,54 +168,68 @@ 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); + Match = SSH2AuthSplit.match(Str); if Match == None: return None; - global SeenRSA; - if SeenRSA: - Attrs.append((ldap.MOD_ADD,"sshrsaauthkey",Str)); + 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; + Attrs.append((ldap.MOD_REPLACE,"sshRSAAuthKey",Str)); + SeenKey = 1; return "SSH Keys replaced with "+FormatSSHAuth(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: + 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; - Rec = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"dnszoneentry="+G[0]+" *",["uid"]); + Rec = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"dnsZoneEntry="+G[0]+" *",["uid"]); for x in Rec: if GetAttr(x,"uid") != GetAttr(DnRecord,"uid"): 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)); + Attrs.append((ldap.MOD_ADD,"dnsZoneEntry",Str)); return "DNS Entry added "+Str; - Attrs.append((ldap.MOD_REPLACE,"dnszoneentry",Str)); + Attrs.append((ldap.MOD_REPLACE,"dnsZoneEntry",Str)); SeenDNS = 1; return "DNS Entry replaced with "+Str; # 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 = []; @@ -220,7 +248,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); @@ -240,6 +268,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); @@ -340,7 +371,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 @@ -370,7 +402,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; @@ -380,14 +411,17 @@ try: l.simple_bind_s("",""); # Search for the matching key fingerprint - Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyfingerprint=" + Res[2][1]); + 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: @@ -395,9 +429,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);