X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=90069c87161179ee082ee4aab8f6b9862beee260;hb=af589fbc5d5694eb2c9b36f77be3735162a5fb41;hp=b158ba885b813fd548f8b09694075cbf7f8ed259;hpb=a9ebb6f2afbf0fbc0e94ab73726dedb6a8ae5d75;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index b158ba8..90069c8 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -7,6 +7,7 @@ import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands import pwd, tempfile + from userdir_gpg import * from userdir_ldap import * @@ -18,6 +19,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,9 +31,18 @@ mailRHSBL = {} mailWhitelist = {} SeenList = {} DNS = {} +SudoPasswd = {} SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$') -SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*') +SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+') + +GenderTable = {"male": 1, + "1": 1, + "female": 2, + "2": 2, + "unspecified": 9, + "9": 9, +}; ArbChanges = {"c": "..", "l": ".*", @@ -50,6 +62,7 @@ ArbChanges = {"c": "..", "mailGreylisting": "^(TRUE|FALSE)$", "mailCallout": "^(TRUE|FALSE)$", "VoIP": ".*", + "gender": "^(1|2|9|male|female|unspecified)$", }; DelItems = {"c": None, @@ -69,7 +82,6 @@ DelItems = {"c": None, "jpegPhoto": None, "dnsZoneEntry": None, "sshRSAAuthKey": None, - "sshDSAAuthKey": None, "birthDate" : None, "mailGreylisting": None, "mailCallout": None, @@ -80,6 +92,7 @@ DelItems = {"c": None, "VoIP": None, }; + # Decode a GPS location from some common forms def LocDecode(Str,Dir): # Check for Decimal degrees, DGM, or DGMS @@ -158,6 +171,12 @@ def DoArbChange(Str,Attrs): if re.match(ArbChanges[attrName],G[1]) == None: raise Error, "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" + value = GenderTable[G[1]] + # 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; @@ -181,8 +200,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 @@ -239,10 +258,12 @@ def LoadBadSSH(): # [options] 1024 35 13188913666680[..] [comment] def DoSSH(Str, Attrs, badkeys, uid): Match = SSH2AuthSplit.match(Str); + if Match == None: + return None; g = Match.groups() typekey = g[1] if Match == None: - Match =SSHRSA1Match.match(Str) + Match = SSHRSA1Match.match(Str) if Match is not None: return "RSA1 keys not supported anymore" return None; @@ -429,6 +450,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 Error, "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 Error, "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; @@ -437,6 +525,7 @@ def HandleChange(Reply,DnRecord,Key): Result = ""; Attrs = []; Show = 0; + CommitChanges = 1 for Line in Lines: Line = Line.strip() if Line == "": @@ -452,32 +541,43 @@ 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); + + 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: @@ -485,7 +585,7 @@ def HandleChange(Reply,DnRecord,Key): if len(Attrs) == 0: raise Error, "User not found" Attribs = GPGEncrypt(PrettyShow(Attrs[0])+"\n","0x"+Key[1],Key[4]); - + Subst = {}; Subst["__FROM__"] = ChangeFrom; Subst["__EMAIL__"] = EmailAddress(DnRecord); @@ -536,7 +636,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(); @@ -549,7 +649,8 @@ def HandleChPass(Reply,DnRecord,Key): raise Error, "This account is locked"; # Modify the password - Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass)]; + Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass), + (ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60)))]; Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn; l.modify_s(Dn,Rec); @@ -567,8 +668,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; @@ -603,17 +702,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 @@ -625,7 +718,17 @@ try: if len(Attrs) != 1: raise Error, "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 Error, Rply; RC.Add(Res[1]); + RC.close() # Determine the sender address ErrMsg = "A problem occured while trying to formulate the reply"; @@ -683,7 +786,7 @@ 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: @@ -694,4 +797,7 @@ except: if ErrType != EX_PERMFAIL: sys.exit(ErrType); sys.exit(0); - + +# vim:set et: +# vim:set ts=3: +# vim:set shiftwidth=3: