X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=fdf9d713967e4c29efb7f91c6505e3af80e376ff;hb=03bfe6ae8eff37dc249b92f4b1323423b9b06d27;hp=94a4a71c5c727ad7e752a77b91fd81717c540a30;hpb=0159c3e12f39119617f4c93319a1500284f8958a;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 94a4a71..fdf9d71 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -6,7 +6,7 @@ # Copyright (c) 2008 Joerg Jaspert import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os, commands -import pwd, tmpfile +import pwd, tempfile from userdir_gpg import * from userdir_ldap import * @@ -30,6 +30,15 @@ SeenList = {} DNS = {} 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": ".*", @@ -49,6 +58,7 @@ ArbChanges = {"c": "..", "mailGreylisting": "^(TRUE|FALSE)$", "mailCallout": "^(TRUE|FALSE)$", "VoIP": ".*", + "gender": "^(1|2|9|male|female|unspecified)$", }; DelItems = {"c": None, @@ -157,6 +167,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; @@ -180,8 +196,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 @@ -236,31 +252,74 @@ def LoadBadSSH(): # Handle an SSH authentication key, the line format is: # [options] 1024 35 13188913666680[..] [comment] -def DoSSH(Str,Attrs, badkeys): +def DoSSH(Str, Attrs, badkeys, uid): Match = SSH2AuthSplit.match(Str); if Match == None: - Match = re.compile('^1024 (\d+) ').match(Str) + return None; + g = Match.groups() + typekey = g[1] + if Match == None: + Match = SSHRSA1Match.match(Str) if Match is not None: - return "SSH1 keys not supported anymore" + return "RSA1 keys not supported anymore" return None; - (fd, path) = tempfile.mkstemp("", "sshkeytry") + (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp") f = open(path, "w") - f.write(Str) - f.close - (result, output) = commands.getstatusoutput("ssh-keygen -f %s -l" % (path)) + 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): - sys.stderr.write("ssh-keygen -l invocation failed!\n%s\n" % (output)) - sys.exit(result) + raise Error, "ssh-keygen -l invocation failed!\n%s\n" % (output) - Match = SSHFingerprint.match(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 (g[0] < 1024): - return "SSH keys must have at least 1024 bits, not added" - elif g[0] in badkeys: - return "Submitted SSH Key known to be bad and insecure, not added" + + 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 Error, "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" + 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 Error, "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" + + if (typekey == "dss"): + return "DSA keys not accepted anymore" global SeenKey; if SeenKey: @@ -395,6 +454,7 @@ def HandleChange(Reply,DnRecord,Key): Result = ""; Attrs = []; Show = 0; + CommitChanges = 1 for Line in Lines: Line = Line.strip() if Line == "": @@ -404,12 +464,12 @@ def HandleChange(Reply,DnRecord,Key): Result = Result + "> "+Line+"\n"; try: if Line == "show": - Show = 1; - Res = "OK"; + Show = 1; + Res = "OK"; else: badkeys = LoadBadSSH() Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \ - DoArbChange(Line,Attrs) or DoSSH(Line,Attrs,badkeys) or \ + DoArbChange(Line,Attrs) or DoSSH(Line,Attrs,badkeys,GetAttr(DnRecord,"uid")) or \ DoDel(Line,Attrs) or DoRBL(Line,Attrs) except: Res = None; @@ -418,12 +478,13 @@ def HandleChange(Reply,DnRecord,Key): # 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(); @@ -435,7 +496,8 @@ def HandleChange(Reply,DnRecord,Key): 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: + l.modify_s(Dn,Attrs); Attribs = ""; if Show == 1: @@ -494,7 +556,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(); @@ -507,7 +569,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); @@ -571,7 +634,7 @@ try: 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