X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=31aa9c1ba0d15d5df7d5c2d8b5845f694e4921af;hb=0d0ec9c38991f84768628eee0de17888f29d48ea;hp=4fa2edf0f1f3ee6f043d5be7bde8fb8b0a787946;hpb=3104028493422257dbb8583d6f3e61f87c2bdb08;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 4fa2edf..31aa9c1 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -2,13 +2,16 @@ # -*- 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 import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands 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; @@ -18,6 +21,8 @@ ChangeFrom = ConfModule.changefrom; ReplayCacheFile = ConfModule.replaycachefile; SSHFingerprintFile = ConfModule.fingerprintfile +UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' + EX_TEMPFAIL = 75; EX_PERMFAIL = 65; # EX_DATAERR Error = 'Message Error'; @@ -28,15 +33,25 @@ mailRHSBL = {} mailWhitelist = {} SeenList = {} DNS = {} +SudoPasswd = {} SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$') SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+') +GenderTable = {"male": 1, + "1": 1, + "female": 2, + "2": 2, + "unspecified": 9, + "9": 9, +}; + ArbChanges = {"c": "..", "l": ".*", "facsimileTelephoneNumber": ".*", "telephoneNumber": ".*", "postalAddress": ".*", + "bATVToken": ".*", "postalCode": ".*", "loginShell": ".*", "emailForward": "^([^<>@]+@.+)?$", @@ -49,7 +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, @@ -57,6 +75,7 @@ DelItems = {"c": None, "facsimileTelephoneNumber": None, "telephoneNumber": None, "postalAddress": None, + "bATVToken": None, "postalCode": None, "emailForward": None, "ircNick": None, @@ -69,7 +88,6 @@ DelItems = {"c": None, "jpegPhoto": None, "dnsZoneEntry": None, "sshRSAAuthKey": None, - "sshDSAAuthKey": None, "birthDate" : None, "mailGreylisting": None, "mailCallout": None, @@ -77,9 +95,12 @@ DelItems = {"c": None, "mailRHSBL": None, "mailWhitelist": None, "mailDisableMessage": None, + "mailDefaultOptions": None, "VoIP": None, + "mailContentInspectionAction": None, }; + # Decode a GPS location from some common forms def LocDecode(Str,Dir): # Check for Decimal degrees, DGM, or DGMS @@ -114,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] == '.': @@ -156,7 +177,13 @@ 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 UDFormatError, "Gender not found in table" + value = GenderTable[G[1]] # if attrName == 'birthDate': # (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) { @@ -181,8 +208,8 @@ def DoArbChange(Str,Attrs): # } 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]); + Attrs.append((ldap.MOD_REPLACE,attrName,value)); + return "Changed entry %s to %s"%(attrName,value); # Handle changing a set of arbitary fields # : value @@ -217,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)); @@ -257,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 @@ -280,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 @@ -296,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" @@ -336,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 @@ -398,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)); @@ -431,6 +458,73 @@ def DoRBL(Str,Attrs): SeenList[Key] = 1; return "%s replaced with %s" % (Key,Host) +# Handle a ConfirmSudoPassword request +def DoConfirmSudopassword(Str): + Match = re.compile('^confirm sudopassword ('+UUID_FORMAT+') ([a-z0-9.,*]+) ([0-9a-f]{40})$').match(Str) + if Match == None: + return None + + uuid = Match.group(1) + hosts = Match.group(2) + hmac = Match.group(3) + + global SudoPasswd + SudoPasswd[uuid] = (hosts, hmac) + return "got confirm for sudo password %s on host(s) %s, auth code %s" % (uuid,hosts, hmac) + +def FinishConfirmSudopassword(l, uid, Attrs): + global SudoPasswd + result = "\n" + + res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid="+uid, ['sudoPassword']); + if len(res) != 1: + raise UDFormatError, "Not exactly one hit when searching for user" + if res[0][1].has_key('sudoPassword'): + inldap = res[0][1]['sudoPassword'] + else: + inldap = [] + + newldap = [] + for entry in inldap: + Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry) + if Match == None: + raise UDFormatError, "Could not parse existing sudopasswd entry" + uuid = Match.group(1) + status = Match.group(2) + hosts = Match.group(3) + cryptedpass = Match.group(4) + + if SudoPasswd.has_key(uuid): + confirmedHosts = SudoPasswd[uuid][0] + confirmedHmac = SudoPasswd[uuid][1] + if status.startswith('confirmed:'): + 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_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_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] + + newentry = " ".join([uuid, status, hosts, cryptedpass]) + if len(newldap) == 0: + newldap.append((ldap.MOD_REPLACE,"sudoPassword",newentry)) + else: + newldap.append((ldap.MOD_ADD,"sudoPassword",newentry)) + + for entry in SudoPasswd: + result = result + "Entry %s that you confirm is not listed in ldap."%(entry) + + for entry in newldap: + Attrs.append(entry) + + return result + # Handle an [almost] arbitary change def HandleChange(Reply,DnRecord,Key): global PlainText; @@ -439,6 +533,7 @@ def HandleChange(Reply,DnRecord,Key): Result = ""; Attrs = []; Show = 0; + CommitChanges = 1 for Line in Lines: Line = Line.strip() if Line == "": @@ -454,40 +549,51 @@ def HandleChange(Reply,DnRecord,Key): badkeys = LoadBadSSH() Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \ DoArbChange(Line,Attrs) or DoSSH(Line,Attrs,badkeys,GetAttr(DnRecord,"uid")) or \ - DoDel(Line,Attrs) or DoRBL(Line,Attrs) + DoDel(Line,Attrs) or DoRBL(Line,Attrs) or DoConfirmSudopassword(Line) except: Res = None; Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value); - + # Fail, if someone tries to send someone elses signed email to the # daemon then we want to abort ASAP. if Res == None: - Result = Result + "Command is not understood. Halted\n"; + CommitChanges = 0 + Result = Result + "Command is not understood. Halted - no changes committed\n"; break; Result = Result + Res + "\n"; # Connect to the ldap server - l = ldap.open(LDAPServer); + l = connectLDAP() F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); AccessPass = F.readline().strip().split(" ") F.close(); - # 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 ((GetAttr(oldAttrs[0],"userPassword").find("*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); + 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 + 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); @@ -521,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."; @@ -538,7 +644,7 @@ def HandleChPass(Reply,DnRecord,Key): Reply = Reply + TemplateSubst(Subst,open(TemplatesDir+"passwd-changed","r").read()); # Connect to the ldap server - l = ldap.open(LDAPServer); + l = connectLDAP() F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); AccessPass = F.readline().strip().split(" ") F.close(); @@ -548,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), @@ -570,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; @@ -582,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; @@ -606,17 +710,11 @@ 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"; global l; - l = ldap.open(LDAPServer); + l = connectLDAP() l.simple_bind_s("",""); # Search for the matching key fingerprint @@ -624,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"; @@ -636,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())); @@ -647,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"; @@ -661,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 @@ -686,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: