X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=6764c88414bca87a22f43d7a4c20131a291bd13e;hb=4845f3f1b3aaaa0a1beb63fe918876a0988bc8e5;hp=91dcf40a8a7e0b4b132d484444d9d44d622e9b97;hpb=8be45fd03d84447c0f75dc77bd94ed4e6580f0f6;p=mirror%2Fuserdir-ldap.git diff --git a/ud-mailgate b/ud-mailgate index 91dcf40..6764c88 100755 --- a/ud-mailgate +++ b/ud-mailgate @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- mode: python -*- -import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, posix; +import userdir_gpg, userdir_ldap, sys, traceback, time, ldap, os; import string, pwd from userdir_gpg import *; from userdir_ldap import *; @@ -16,6 +16,7 @@ EX_TEMPFAIL = 75; EX_PERMFAIL = 65; # EX_DATAERR Error = 'Message Error'; SeenRSA = 0; +SeenDSA = 0; SeenDNS = 0; ArbChanges = {"c": "..", @@ -27,9 +28,26 @@ ArbChanges = {"c": "..", "loginshell": ".*", "emailforward": "^([^<>@]+@.+)?$", "ircnick": ".*", + "icquin": "^[0-9]*$", "onvacation": ".*", "labeledurl": ".*"}; +DelItems = {"c": None, + "l": None, + "facsimiletelephonenumber": None, + "telephonenumber": None, + "postaladdress": None, + "postalcode": None, + "emailforward": None, + "ircnick": None, + "onvacation": None, + "labeledurl": None, + "latitude": None, + "longitude": None, + "icquin": None, + "sshrsaauthkey": None, + "sshdsaauthkey": None}; + # Decode a GPS location from some common forms def LocDecode(Str,Dir): # Check for Decimal degrees, DGM, or DGMS @@ -106,6 +124,20 @@ def DoArbChange(Str,Attrs): Attrs.append((ldap.MOD_REPLACE,G[0],G[1])); return "Changed entry %s to %s"%(G[0],G[1]); +# Handle changing a set of arbitary fields +# : value +def DoDel(Str,Attrs): + Match = re.match("^del (.*)$",Str); + 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]); + # Handle a position change message, the line format is: # Lat: -12412.23 Long: +12341.2342 def DoPosition(Str,Attrs): @@ -142,13 +174,30 @@ def DoSSH(Str,Attrs): SeenRSA = 1; return "SSH Keys replaced with "+FormatSSHAuth(Str); +# Handle a SSH DSA authentication key, the line format is: +# ssh-dss [key] [comment] +def DoSSH2(Str,Attrs): + Match = SSHDSAAuthSplit.match(Str); + if Match == None: + return None; + + global SeenDSA; + if SeenDSA: + Attrs.append((ldap.MOD_ADD,"sshdsaauthkey",Str)); + return "SSH2 Key added "+FormatSSH2Auth(Str); + + Attrs.append((ldap.MOD_REPLACE,"sshdsaauthkey",Str)); + SeenDSA = 1; + return "SSH2 Keys replaced with "+FormatSSH2Auth(Str); + # Handle changing a dns entry # host in a 12.12.12.12 # host in cname 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: + re.match("^[\w-]+\s+in\s+cname\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None and \ + re.match("^[\w-]+\s+in\s+mx\s+\d{1,3}\s+[\w.\-]+\.$",Str,re.IGNORECASE) == None: return None; # Check if the name is already taken @@ -173,10 +222,11 @@ def DoDNS(Str,Attrs,DnRecord): # 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; for Line in Lines: Line = string.strip(Line); if Line == "": @@ -184,14 +234,14 @@ def HandleChange(Reply,DnRecord,Key): # Try to process a command line Result = Result + "> "+Line+"\n"; - Show = 0; try: if Line == "show": Show = 1; Res = "OK"; else: Res = DoPosition(Line,Attrs) or DoDNS(Line,Attrs,DnRecord) or \ - DoArbChange(Line,Attrs) or DoSSH(Line,Attrs); + DoArbChange(Line,Attrs) or DoSSH(Line,Attrs) or \ + DoSSH2(Line,Attrs) or DoDel(Line,Attrs); except: Res = None; Result = Result + "==> %s: %s\n" %(sys.exc_type,sys.exc_value); @@ -205,7 +255,7 @@ def HandleChange(Reply,DnRecord,Key): # Connect to the ldap server l = ldap.open(LDAPServer); - F = open(PassDir+"/pass-"+pwd.getpwuid(posix.getuid())[0],"r"); + F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); AccessPass = string.split(string.strip(F.readline())," "); F.close(); @@ -272,12 +322,17 @@ def HandleChPass(Reply,DnRecord,Key): # Connect to the ldap server l = ldap.open(LDAPServer); - F = open(PassDir+"/pass-"+pwd.getpwuid(posix.getuid())[0],"r"); + F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); AccessPass = string.split(string.strip(F.readline())," "); 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"; # Modify the password - l.simple_bind_s("uid="+AccessPass[0]+","+BaseDn,AccessPass[1]); Rec = [(ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass)]; Dn = "uid=" + GetAttr(DnRecord,"uid") + "," + BaseDn; l.modify_s(Dn,Rec); @@ -285,6 +340,11 @@ def HandleChPass(Reply,DnRecord,Key): return Reply; # Start of main program + +# Drop messages from a mailer daemon. +if os.environ.has_key('SENDER') == 0 or len(os.environ['SENDER']) == 0: + sys.exit(0); + ErrMsg = "Indeterminate Error"; ErrType = EX_TEMPFAIL; try: @@ -300,7 +360,11 @@ try: Email = mimetools.Message(sys.stdin,0); Msg = GetClearSig(Email); - # Check the signature + ErrMsg = "Message is not PGP signed:" + if string.find(Msg[0],"-----BEGIN PGP SIGNED MESSAGE-----") == -1: + raise Error, "No PGP signature"; + + # Check the signature ErrMsg = "Unable to check the signature or the signature was invalid:"; Res = GPGCheckSig(Msg[0]); @@ -352,7 +416,7 @@ try: if Sender == None: raise Error, "Unable to determine the sender's address"; - if (string.find(GetAttr(Attrs[0],"userPassword"),"*LK*") != -1): + if (string.find(GetAttr(Attrs[0],"userpassword"),"*LK*") != -1): raise Error, "This account is locked"; # Formulate a reply @@ -374,19 +438,44 @@ try: # Send the message through sendmail ErrMsg = "A problem occured while trying to send the reply"; - Child = posix.popen("/usr/sbin/sendmail -t","w"); -# Child = posix.popen("cat","w"); + Child = os.popen("/usr/sbin/sendmail -t","w"); +# Child = os.popen("cat","w"); Child.write(Reply); if Child.close() != None: raise Error, "Sendmail gave a non-zero return code"; except: - print ErrMsg; - print "==> %s: %s" %(sys.exc_type,sys.exc_value); + # Error Reply Header + Date = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time())); + ErrReplyHead = "To: %s\nReply-To: %s\nDate: %s\n" % (os.environ['SENDER'],ReplyTo,Date); + + # Error Body + Subst = {}; + Subst["__ERROR__"] = ErrMsg; + Subst["__ADMIN__"] = ReplyTo; + + Trace = "==> %s: %s\n" %(sys.exc_type,sys.exc_value); List = traceback.extract_tb(sys.exc_traceback); if len(List) > 1: - print "Trace: "; + Trace = Trace + "Python Stack Trace:\n"; for x in List: - print " %s %s:%u: %s" %(x[2],x[0],x[1],x[3]); - sys.exit(ErrType); + Trace = Trace + " %s %s:%u: %s\n" %(x[2],x[0],x[1],x[3]); + + Subst["__TRACE__"] = Trace; + + # Try to send the bounce + try: + ErrReply = TemplateSubst(Subst,open(TemplatesDir+"error-reply","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); + + if ErrType != EX_PERMFAIL: + sys.exit(ErrType); + sys.exit(0);