X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=31aa9c1ba0d15d5df7d5c2d8b5845f694e4921af;hb=0d0ec9c38991f84768628eee0de17888f29d48ea;hp=6baf2c4c9f8d0dccf19b3dd593a3f4f81138e941;hpb=eaf577581ba8c1c53fadb91920591f8f6ffa15a4;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 6baf2c4..31aa9c1 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -2,6 +2,7 @@ # -*- mode: python -*- # Prior copyright probably rmurray, troup, joey, jgg -- weasel 2008 +# Copyright (c) 2009 Stephen Gran # Copyright (c) 2008 Peter Palfrader # Copyright (c) 2008 Joerg Jaspert @@ -10,6 +11,7 @@ import pwd, tempfile from userdir_gpg import * from userdir_ldap import * +from userdir_exceptions import * # Error codes from /usr/include/sysexits.h ReplyTo = ConfModule.replyto; @@ -49,6 +51,7 @@ ArbChanges = {"c": "..", "facsimileTelephoneNumber": ".*", "telephoneNumber": ".*", "postalAddress": ".*", + "bATVToken": ".*", "postalCode": ".*", "loginShell": ".*", "emailForward": "^([^<>@]+@.+)?$", @@ -61,8 +64,10 @@ ArbChanges = {"c": "..", "mailDisableMessage": ".*", "mailGreylisting": "^(TRUE|FALSE)$", "mailCallout": "^(TRUE|FALSE)$", + "mailDefaultOptions": "^(TRUE|FALSE)$", "VoIP": ".*", "gender": "^(1|2|9|male|female|unspecified)$", + "mailContentInspectionAction": "^(reject|blackhole|markup)$", }; DelItems = {"c": None, @@ -70,6 +75,7 @@ DelItems = {"c": None, "facsimileTelephoneNumber": None, "telephoneNumber": None, "postalAddress": None, + "bATVToken": None, "postalCode": None, "emailForward": None, "ircNick": None, @@ -82,7 +88,6 @@ DelItems = {"c": None, "jpegPhoto": None, "dnsZoneEntry": None, "sshRSAAuthKey": None, - "sshDSAAuthKey": None, "birthDate" : None, "mailGreylisting": None, "mailCallout": None, @@ -90,7 +95,9 @@ DelItems = {"c": None, "mailRHSBL": None, "mailWhitelist": None, "mailDisableMessage": None, + "mailDefaultOptions": None, "VoIP": None, + "mailContentInspectionAction": None, }; @@ -128,11 +135,11 @@ def LocDecode(Str,Dir): # Some simple checks if float(Deg) > 180: - raise "Failed","Bad degrees"; + raise UDFormatError, "Bad degrees"; if Min != None and float(Min) > 60: - raise "Failed","Bad minutes"; + raise UDFormatError, "Bad minutes"; if Sec != None and float(Sec) > 60: - raise "Failed","Bad seconds"; + raise UDFormatError, "Bad seconds"; # Pad on an extra leading 0 to disambiguate small numbers if len(Deg) <= 1 or Deg[1] == '.': @@ -170,12 +177,12 @@ def DoArbChange(Str,Attrs): return None; if re.match(ArbChanges[attrName],G[1]) == None: - raise Error, "Item does not match the required format"+ArbChanges[attrName]; + raise UDFormatError, "Item does not match the required format"+ArbChanges[attrName]; value = G[1]; if attrName == 'gender': if G[1] not in GenderTable: - raise Error, "Gender not found in table" + raise UDFormatError, "Gender not found in table" value = GenderTable[G[1]] # if attrName == 'birthDate': @@ -237,7 +244,7 @@ def DoPosition(Str,Attrs): Lat = DecDegree(sLat,1); Long = DecDegree(sLong,1); except: - raise Error, "Positions were found, but they are not correctly formed"; + raise UDFormatError, "Positions were found, but they are not correctly formed"; Attrs.append((ldap.MOD_REPLACE,"latitude",sLat)); Attrs.append((ldap.MOD_REPLACE,"longitude",sLong)); @@ -277,7 +284,7 @@ def DoSSH(Str, Attrs, badkeys, uid): (result, output) = commands.getstatusoutput(cmd) os.remove(path) if (result != 0): - raise Error, "ssh-keygen -l invocation failed!\n%s\n" % (output) + raise UDExecuteError, "ssh-keygen -l invocation failed!\n%s\n" % (output) # Head @@ -300,12 +307,12 @@ def DoSSH(Str, Attrs, badkeys, uid): Child.write(ErrReplyHead) Child.write(ErrReply) if Child.close() != None: - raise Error, "Sendmail gave a non-zero return code" + raise UDExecuteError, "Sendmail gave a non-zero return code" except: sys.exit(EX_TEMPFAIL) # And now break and stop processing input, which sends a reply to the user. - raise Error, "SSH keys must have at least 1024 bits, processing halted, NOTHING MODIFIED AT ALL" + raise UDFormatError, "SSH keys must have at least 1024 bits, processing halted, NOTHING MODIFIED AT ALL" elif g[1] in badkeys: try: # Body @@ -316,12 +323,12 @@ def DoSSH(Str, Attrs, badkeys, uid): Child.write(ErrReplyHead) Child.write(ErrReply) if Child.close() != None: - raise Error, "Sendmail gave a non-zero return code" + raise UDExecuteError, "Sendmail gave a non-zero return code" except: sys.exit(EX_TEMPFAIL) # And now break and stop processing input, which sends a reply to the user. - raise Error, "Submitted SSH Key known to be bad and insecure, processing halted, NOTHING MODIFIED AT ALL" + raise UDFormatError, "Submitted SSH Key known to be bad and insecure, processing halted, NOTHING MODIFIED AT ALL" if (typekey == "dss"): return "DSA keys not accepted anymore" @@ -356,7 +363,7 @@ def DoDNS(Str,Attrs,DnRecord): # Check if the name is already taken G = re.match('^([-\w+]+)\s',Str) if G == None: - raise Error, "Hostname not found although we already passed record syntax checks" + raise UDFormatError, "Hostname not found although we already passed record syntax checks" hostname = G.group(1) # Check for collisions @@ -418,7 +425,7 @@ def DoDNS(Str,Attrs,DnRecord): seenEmptypart = True sanitized = "%s IN AAAA %s" % (hostname, ipv6address) else: - raise Error, "None of the types I recognize was it. I shouldn't be here. confused." + raise UDFormatError, "None of the types I recognize was it. I shouldn't be here. confused." if SeenDNS: Attrs.append((ldap.MOD_ADD,"dnsZoneEntry",sanitized)); @@ -471,7 +478,7 @@ def FinishConfirmSudopassword(l, uid, Attrs): res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+uid, ['sudoPassword']); if len(res) != 1: - raise Error, "Not exactly one hit when searching for user" + raise UDFormatError, "Not exactly one hit when searching for user" if res[0][1].has_key('sudoPassword'): inldap = res[0][1]['sudoPassword'] else: @@ -481,7 +488,7 @@ def FinishConfirmSudopassword(l, uid, Attrs): for entry in inldap: Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry) if Match == None: - raise Error, "Could not parse existing sudopasswd entry" + raise UDFormatError, "Could not parse existing sudopasswd entry" uuid = Match.group(1) status = Match.group(2) hosts = Match.group(3) @@ -491,15 +498,15 @@ def FinishConfirmSudopassword(l, uid, Attrs): confirmedHosts = SudoPasswd[uuid][0] confirmedHmac = SudoPasswd[uuid][1] if status.startswith('confirmed:'): - if status == 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass): + if status == 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', uid, uuid, hosts, cryptedpass): result = result + "Entry %s for sudo password on hosts %s already confirmed.\n"%(uuid, hosts) else: result = result + "Entry %s for sudo password on hosts %s is listed as confirmed, but HMAC does not verify.\n"%(uuid, hosts) elif confirmedHosts != hosts: result = result + "Entry %s hostlist mismatch (%s vs. %s).\n"%(uuid, hosts, confirmedHosts) - elif make_sudopasswd_hmac('confirm-new-password', uuid, hosts, cryptedpass) == confirmedHmac: + elif make_passwd_hmac('confirm-new-password', 'sudo', uid, uuid, hosts, cryptedpass) == confirmedHmac: result = result + "Entry %s for sudo password on hosts %s now confirmed.\n"%(uuid, hosts) - status = 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass) + status = 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', uid, uuid, hosts, cryptedpass) else: result = result + "Entry %s for sudo password on hosts %s HMAC verify failed.\n"%(uuid, hosts) del SudoPasswd[uuid] @@ -565,25 +572,28 @@ def HandleChange(Reply,DnRecord,Key): oldAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid")); if ((GetAttr(oldAttrs[0],"userPassword").find("*LK*") != -1) or GetAttr(oldAttrs[0],"userPassword").startswith("!")): - raise Error, "This account is locked"; - try: - Res = FinishConfirmSudopassword(l, GetAttr(DnRecord,"uid"), Attrs) - Result = Result + Res + "\n"; - except Error, e: - CommitChanges = 0 - Result = Result + "FinishConfirmSudopassword raised an error (%s) - no changes committed\n"%(e); + raise UDNotAllowedError, "This account is locked"; + + if CommitChanges == 1: # only if we are still good to go + try: + Res = FinishConfirmSudopassword(l, GetAttr(DnRecord,"uid"), Attrs) + Result = Result + Res + "\n"; + except Error, e: + CommitChanges = 0 + Result = Result + "FinishConfirmSudopassword raised an error (%s) - no changes committed\n"%(e); + # Modify the record - Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn; if CommitChanges == 1: + Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn; l.modify_s(Dn,Attrs); Attribs = ""; if Show == 1: Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid")); if len(Attrs) == 0: - raise Error, "User not found" + raise UDNotAllowedError, "User not found" Attribs = GPGEncrypt(PrettyShow(Attrs[0])+"\n","0x"+Key[1],Key[4]); - + Subst = {}; Subst["__FROM__"] = ChangeFrom; Subst["__EMAIL__"] = EmailAddress(DnRecord); @@ -617,7 +627,7 @@ def HandleChPass(Reply,DnRecord,Key): Password = None; if Message == None: - raise Error, "Unable to generate the encrypted reply, gpg failed."; + raise UDFormatError, "Unable to generate the encrypted reply, gpg failed."; if (Key[4] == 1): Type = "Your message was encrypted using PGP 2.x\ncompatibility mode."; @@ -644,7 +654,7 @@ def HandleChPass(Reply,DnRecord,Key): Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+GetAttr(DnRecord,"uid")); if (GetAttr(Attrs[0],"userPassword").find("*LK*") != -1) \ or GetAttr(Attrs[0],"userPassword").startswith("!"): - raise Error, "This account is locked"; + raise UDNotAllowedError, "This account is locked"; # Modify the password Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass), @@ -666,8 +676,6 @@ try: # Startup the replay cache ErrType = EX_TEMPFAIL; ErrMsg = "Failed to initialize the replay cache:"; - RC = ReplayCache(ReplayCacheFile); - RC.Clean(); # Get the email ErrType = EX_PERMFAIL; @@ -678,17 +686,17 @@ try: ErrMsg = "Message is not PGP signed:" if Msg[0].find("-----BEGIN PGP SIGNED MESSAGE-----") == -1 and \ Msg[0].find("-----BEGIN PGP MESSAGE-----") == -1: - raise Error, "No PGP signature"; + raise UDFormatError, "No PGP signature"; # Check the signature ErrMsg = "Unable to check the signature or the signature was invalid:"; Res = GPGCheckSig(Msg[0]); if Res[0] != None: - raise Error, Res[0]; + raise UDFormatError, Res[0]; if Res[3] == None: - raise Error, "Null signature text"; + raise UDFormatError, "Null signature text"; # Extract the plain message text in the event of mime encoding global PlainText; @@ -702,12 +710,6 @@ try: else: PlainText = Res[3]; - # Check the signature against the replay cache - ErrMsg = "The replay cache rejected your message. Check your clock!"; - Rply = RC.Check(Res[1]); - if Rply != None: - raise Error, Rply; - # Connect to the ldap server ErrType = EX_TEMPFAIL; ErrMsg = "An error occured while performing the LDAP lookup"; @@ -720,11 +722,21 @@ try: ErrType = EX_PERMFAIL; if len(Attrs) == 0: - raise Error, "Key not found" + raise UDFormatError, "Key not found" if len(Attrs) != 1: - raise Error, "Oddly your key fingerprint is assigned to more than one account.." + raise UDFormatError, "Oddly your key fingerprint is assigned to more than one account.." + + # Check the signature against the replay cache + RC = ReplayCache(ReplayCacheFile); + RC.Clean(); + ErrMsg = "The replay cache rejected your message. Check your clock!"; + Rply = RC.Check(Res[1]); + if Rply != None: + RC.close() + raise UDNotAllowedError, Rply; RC.Add(Res[1]); + RC.close() # Determine the sender address ErrMsg = "A problem occured while trying to formulate the reply"; @@ -732,7 +744,7 @@ try: if Sender == None: Sender = Email.getheader("From"); if Sender == None: - raise Error, "Unable to determine the sender's address"; + raise UDFormatError, "Unable to determine the sender's address"; # Formulate a reply Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time())); @@ -743,13 +755,13 @@ try: Reply = HandlePing(Reply,Attrs[0],Res[2]); elif sys.argv[1] == "chpass": if PlainText.strip().find("Please change my Debian password") != 0: - raise Error,"Please send a signed message where the first line of text is the string 'Please change my Debian password'"; + raise UDFormatError,"Please send a signed message where the first line of text is the string 'Please change my Debian password'"; Reply = HandleChPass(Reply,Attrs[0],Res[2]); elif sys.argv[1] == "change": Reply = HandleChange(Reply,Attrs[0],Res[2]); else: print sys.argv; - raise Error, "Incorrect Invokation"; + raise UDFormatError, "Incorrect Invokation"; # Send the message through sendmail ErrMsg = "A problem occured while trying to send the reply"; @@ -757,7 +769,7 @@ try: # Child = os.popen("cat","w"); Child.write(Reply); if Child.close() != None: - raise Error, "Sendmail gave a non-zero return code"; + raise UDExecuteError, "Sendmail gave a non-zero return code"; except: # Error Reply Header @@ -782,15 +794,18 @@ except: try: ErrReply = TemplateSubst(Subst,open(TemplatesDir+"error-reply","r").read()); - Child = os.popen("/usr/sbin/sendmail -t","w"); + Child = os.popen("/usr/sbin/sendmail -t -oi -f ''","w"); Child.write(ErrReplyHead); Child.write(ErrReply); if Child.close() != None: - raise Error, "Sendmail gave a non-zero return code"; + raise UDExecuteError, "Sendmail gave a non-zero return code"; except: sys.exit(EX_TEMPFAIL); if ErrType != EX_PERMFAIL: sys.exit(ErrType); sys.exit(0); - + +# vim:set et: +# vim:set ts=3: +# vim:set shiftwidth=3: