X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=31aa9c1ba0d15d5df7d5c2d8b5845f694e4921af;hb=0d0ec9c38991f84768628eee0de17888f29d48ea;hp=4e3b39dff3e3925b4f13b63072deb1109d698004;hpb=b646eaa10995f71469f5fb18c432d13bf3f884ac;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 4e3b39d..31aa9c1 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -1,9 +1,17 @@ #!/usr/bin/env python # -*- mode: python -*- -import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os; -import string, pwd -from userdir_gpg import *; -from userdir_ldap import *; + +# 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; @@ -11,40 +19,87 @@ PingFrom = ConfModule.pingfrom; ChPassFrom = ConfModule.chpassfrom; 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'; -SeenRSA = 0; +SeenKey = 0; SeenDNS = 0; +mailRBL = {} +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": ".*", - "postalcode": ".*", - "loginshell": ".*", - "emailforward": "^([^<>@]+@.+)?$", - "ircnick": ".*", - "icquin": "^[0-9]*$", - "onvacation": ".*", - "labeledurl": ".*"}; + "facsimileTelephoneNumber": ".*", + "telephoneNumber": ".*", + "postalAddress": ".*", + "bATVToken": ".*", + "postalCode": ".*", + "loginShell": ".*", + "emailForward": "^([^<>@]+@.+)?$", + "jabberJID": "^([^<>@]+@.+)?$", + "ircNick": ".*", + "icqUin": "^[0-9]*$", + "onVacation": ".*", + "labeledURI": ".*", + "birthDate": "^([0-9]{4})([01][0-9])([0-3][0-9])$", + "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, "l": None, - "facsimiletelephonenumber": None, - "telephonenumber": None, - "postaladdress": None, - "postalcode": None, - "emailforward": None, - "ircnick": None, - "onvacation": None, - "labeledurl": None, + "facsimileTelephoneNumber": None, + "telephoneNumber": None, + "postalAddress": None, + "bATVToken": None, + "postalCode": None, + "emailForward": None, + "ircNick": None, + "onVacation": None, + "labeledURI": None, "latitude": None, "longitude": None, - "icquin": None, - "sshrsaauthkey": None}; + "icqUin": None, + "jabberJID": None, + "jpegPhoto": None, + "dnsZoneEntry": None, + "sshRSAAuthKey": None, + "birthDate" : None, + "mailGreylisting": None, + "mailCallout": None, + "mailRBL": 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): @@ -80,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] == '.': @@ -112,15 +167,49 @@ 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 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]) { +# $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,value)); + return "Changed entry %s to %s"%(attrName,value); # Handle changing a set of arbitary fields # : value @@ -129,17 +218,22 @@ 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 def DoPosition(Str,Attrs): - Match = re.match("^lat: ([+\-]?[\d:.ns]+(?: ?[ns])?) long: ([+\-]?[\d:.ew]+(?: ?[ew])?)$",string.lower(Str)); + Match = re.match("^lat: ([+\-]?[\d:.ns]+(?: ?[ns])?) long: ([+\-]?[\d:.ew]+(?: ?[ew])?)$", Str.lower()) if Match == None: return None; @@ -150,66 +244,298 @@ 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)); return "Position set to %s/%s (%s/%s decimal degrees)"%(sLat,sLong,Lat,Long); -# Handle a SSH RSA authentication key, the line format is: +# Load bad ssh fingerprints +def LoadBadSSH(): + f = open(SSHFingerprintFile, "r") + bad = [] + FingerprintLine = re.compile('^([0-9a-f\:]{47}).*$') + for line in f.readlines(): + Match = FingerprintLine.match(line) + if Match is not None: + g = Match.groups() + bad.append(g[0]) + return bad + +# Handle an SSH authentication key, the line format is: # [options] 1024 35 13188913666680[..] [comment] -def DoSSH(Str,Attrs): - Match = SSHAuthSplit.match(Str); +def DoSSH(Str, Attrs, badkeys, uid): + Match = SSH2AuthSplit.match(Str); if Match == None: return None; - - global SeenRSA; - if SeenRSA: - Attrs.append((ldap.MOD_ADD,"sshrsaauthkey",Str)); + g = Match.groups() + typekey = g[1] + if Match == None: + Match = SSHRSA1Match.match(Str) + if Match is not None: + return "RSA1 keys not supported anymore" + return None; + + (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp") + f = open(path, "w") + f.write("%s\n" % (Str)) + f.close() + cmd = "/usr/bin/ssh-keygen -l -f %s < /dev/null" % (path) + (result, output) = commands.getstatusoutput(cmd) + os.remove(path) + if (result != 0): + raise UDExecuteError, "ssh-keygen -l invocation failed!\n%s\n" % (output) + + + # Head + Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time())) + ErrReplyHead = "From: %s\nCc: %s\nReply-To: %s\nDate: %s\n" % (os.environ['SENDER'],os.environ['SENDER'],ReplyTo,Date) + Subst = {} + Subst["__ADMIN__"] = ReplyTo + Subst["__USER__"] = uid + + Match = SSHFingerprint.match(output) + g = Match.groups() + + if int(g[0]) < 1024: + try: + # Body + Subst["__ERROR__"] = "SSH keysize %s is below limit 1024" % (g[0]) + ErrReply = TemplateSubst(Subst,open(TemplatesDir+"admin-info","r").read()) + + Child = os.popen("/usr/sbin/sendmail -t","w") + Child.write(ErrReplyHead) + Child.write(ErrReply) + if Child.close() != None: + 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 UDFormatError, "SSH keys must have at least 1024 bits, processing halted, NOTHING MODIFIED AT ALL" + elif g[1] in badkeys: + try: + # Body + Subst["__ERROR__"] = "SSH key with fingerprint %s known as bad key" % (g[1]) + ErrReply = TemplateSubst(Subst,open(TemplatesDir+"admin-info","r").read()) + + Child = os.popen("/usr/sbin/sendmail -t","w") + Child.write(ErrReplyHead) + Child.write(ErrReply) + if Child.close() != None: + 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 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" + + 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 +# host IN A 12.12.12.12 +# host IN AAAA 1234::5678 +# host IN CNAME foo.bar. <- Trailing dot is required +# host IN MX 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: - return None; + cnamerecord = re.match("^[-\w]+\s+IN\s+CNAME\s+([-\w.]+\.)$",Str,re.IGNORECASE) + arecord = re.match('^[-\w]+\s+IN\s+A\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$',Str,re.IGNORECASE) + mxrecord = re.match("^[-\w]+\s+IN\s+MX\s+(\d{1,3})\s+([-\w.]+\.)$",Str,re.IGNORECASE) + #aaaarecord = re.match('^[-\w]+\s+IN\s+AAAA\s+((?:[0-9a-f]{1,4})(?::[0-9a-f]{1,4})*(?::(?:(?::[0-9a-f]{1,4})*|:))?)$',Str,re.IGNORECASE) + aaaarecord = re.match('^[-\w]+\s+IN\s+AAAA\s+([A-F0-9:]{2,39})$',Str,re.IGNORECASE) + + if cnamerecord == None and\ + arecord == None and\ + mxrecord == None and\ + aaaarecord == None: + return None; # Check if the name is already taken - G = re.match('^([\w-+]+)\s',Str).groups(); + G = re.match('^([-\w+]+)\s',Str) + if G == None: + raise UDFormatError, "Hostname not found although we already passed record syntax checks" + hostname = G.group(1) # 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 *))" % (hostname, hostname) + 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") global SeenDNS; + global DNS; + + if cnamerecord: + if DNS.has_key(hostname): + return "CNAME and other RR types not allowed: "+Str + else: + DNS[hostname] = 2 + else: + if DNS.has_key(hostname) and DNS[hostname] == 2: + return "CNAME and other RR types not allowed: "+Str + else: + DNS[hostname] = 1 + + if cnamerecord != None: + sanitized = "%s IN CNAME %s" % (hostname, cnamerecord.group(1)) + elif arecord != None: + ipaddress = arecord.group(1) + for quad in ipaddress.split('.'): + if not (int(quad) >=0 and int(quad) <= 255): + return "Invalid quad %s in IP address %s in line %s" %(quad, ipaddress, Str) + sanitized = "%s IN A %s"% (hostname, ipaddress) + elif mxrecord != None: + priority = mxrecord.group(1) + mx = mxrecord.group(2) + sanitized = "%s IN MX %s %s" % (hostname, priority, mx) + elif aaaarecord != None: + ipv6address = aaaarecord.group(1) + parts = ipv6address.split(':') + if len(parts) > 8: + return "Invalid IPv6 address (%s): too many parts"%(ipv6address) + if len(parts) <= 2: + return "Invalid IPv6 address (%s): too few parts"%(ipv6address) + if parts[0] == "": + parts.pop(0) + if parts[-1] == "": + parts.pop(-1) + seenEmptypart = False + for p in parts: + if len(p) > 4: + return "Invalid IPv6 address (%s): part %s is longer than 4 characters"%(ipv6address, p) + if p == "": + if seenEmptypart: + return "Invalid IPv6 address (%s): more than one :: (nothing in between colons) is not allowed"%(ipv6address) + seenEmptypart = True + sanitized = "%s IN AAAA %s" % (hostname, ipv6address) + else: + raise UDFormatError, "None of the types I recognize was it. I shouldn't be here. confused." + if SeenDNS: - Attrs.append((ldap.MOD_ADD,"dnszoneentry",Str)); - return "DNS Entry added "+Str; - - Attrs.append((ldap.MOD_REPLACE,"dnszoneentry",Str)); + Attrs.append((ldap.MOD_ADD,"dnsZoneEntry",sanitized)); + return "DNS Entry added "+sanitized; + + Attrs.append((ldap.MOD_REPLACE,"dnsZoneEntry",sanitized)); SeenDNS = 1; - return "DNS Entry replaced with "+Str; + return "DNS Entry replaced with "+sanitized; + +# Handle an RBL list (mailRBL, mailRHSBL, mailWhitelist) +def DoRBL(Str,Attrs): + Match = re.compile('^mail(rbl|rhsbl|whitelist) ([-a-z0-9.]+)$').match(Str.lower()) + 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 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; - Lines = string.split(PlainText,"\r\n"); + Lines = re.split("\n *\r?",PlainText); Result = ""; Attrs = []; Show = 0; + CommitChanges = 1 for Line in Lines: - Line = string.strip(Line); + Line = Line.strip() if Line == "": continue; @@ -217,41 +543,57 @@ def HandleChange(Reply,DnRecord,Key): Result = Result + "> "+Line+"\n"; try: if Line == "show": - Show = 1; - Res = "OK"; + Show = 1; + Res = "OK"; else: - Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \ - DoArbChange(Line,Attrs) or DoSSH(Line,Attrs) or \ - DoDel(Line,Attrs); + 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) 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 = string.split(string.strip(F.readline())," "); + AccessPass = F.readline().strip().split(" ") F.close(); - # Modify the record l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]); - Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn; - l.modify_s(Dn,Attrs); + 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 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); @@ -285,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."; @@ -302,19 +644,21 @@ 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 = string.split(string.strip(F.readline())," "); + AccessPass = F.readline().strip().split(" ") F.close(); l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]); # 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): - raise Error, "This account is locked"; + if (GetAttr(Attrs[0],"userPassword").find("*LK*") != -1) \ + or GetAttr(Attrs[0],"userPassword").startswith("!"): + raise UDNotAllowedError, "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); @@ -332,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; @@ -342,63 +684,67 @@ try: Msg = GetClearSig(Email); ErrMsg = "Message is not PGP signed:" - if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1: - raise Error, "No PGP signature"; + if Msg[0].find("-----BEGIN PGP SIGNED MESSAGE-----") == -1 and \ + Msg[0].find("-----BEGIN PGP MESSAGE-----") == -1: + 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; ErrMsg = "Problem stripping MIME headers from the decoded message" if Msg[1] == 1: try: - Index = string.index(Res[3],"\n\n") + 2; + Index = Res[3].index("\n\n") + 2; except ValueError: - Index = string.index(Res[3],"\n\r\n") + 3; + Index = Res[3].index("\n\r\n") + 3; PlainText = Res[3][Index:]; 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; - RC.Add(Res[1]); - # 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 - 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" + 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 - ErrType = EX_PERMFAIL; ErrMsg = "A problem occured while trying to formulate the reply"; Sender = Email.getheader("Reply-To"); if Sender == None: Sender = Email.getheader("From"); 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"; + 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())); @@ -408,14 +754,14 @@ try: if sys.argv[1] == "ping": Reply = HandlePing(Reply,Attrs[0],Res[2]); elif sys.argv[1] == "chpass": - if string.find(string.strip(PlainText),"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'"; + if PlainText.strip().find("Please change my Debian password") != 0: + 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"; @@ -423,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 @@ -448,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: