X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=9046db6985cf15e25f1707a898ce3dc993452fb2;hb=8d364cde8a727736ecdbbb20dbdf2c018a8648d1;hp=afbe4c3b741c8abbba90a40fc2e03a2fb9f6c54f;hpb=da220ff14d1cfc33e6606875a5260b8c73d00558;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index afbe4c3..9046db6 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 *;
@@ -27,6 +27,7 @@ ArbChanges = {"c": "..",
               "loginshell": ".*",
               "emailforward": "^([^<>@]+@.+)?$",
               "ircnick": ".*",
+              "icquin": "^[0-9]*$",
               "onvacation": ".*",
               "labeledurl": ".*"};
 
@@ -42,6 +43,7 @@ DelItems = {"c": None,
             "labeledurl": None,
 	    "latitude": None,
 	    "longitude": None,
+            "icquin": None,
 	    "sshrsaauthkey": None};
 
 # Decode a GPS location from some common forms
@@ -128,7 +130,7 @@ def DoDel(Str,Attrs):
       return None;
    G = Match.groups();
  
-   if ArbChanges.has_key(G[0]) == 0:
+   if DelItems.has_key(G[0]) == 0:
       return "Cannot erase entry %s"%(G[0]);
 
    Attrs.append((ldap.MOD_DELETE,G[0],None));
@@ -176,7 +178,8 @@ def DoSSH(Str,Attrs):
 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
@@ -201,7 +204,7 @@ 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 = [];
@@ -234,7 +237,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();
 
@@ -301,12 +304,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);
@@ -316,7 +324,7 @@ def HandleChPass(Reply,DnRecord,Key):
 # Start of main program
 
 # Drop messages from a mailer daemon.
-if posix.environ.has_key('SENDER') == 0 or len(posix.environ['SENDER']) == 0:
+if os.environ.has_key('SENDER') == 0 or len(os.environ['SENDER']) == 0:
    sys.exit(0);
 
 ErrMsg = "Indeterminate Error";
@@ -390,7 +398,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
@@ -412,8 +420,8 @@ 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";
@@ -421,7 +429,7 @@ try:
 except:
    # 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" % (posix.environ['SENDER'],ReplyTo,Date);
+   ErrReplyHead = "To: %s\nReply-To: %s\nDate: %s\n" % (os.environ['SENDER'],ReplyTo,Date);
 
    # Error Body
    Subst = {};
@@ -441,7 +449,7 @@ except:
    try:
       ErrReply = TemplateSubst(Subst,open(TemplatesDir+"error-reply","r").read());
 
-      Child = posix.popen("/usr/sbin/sendmail -t","w");
+      Child = os.popen("/usr/sbin/sendmail -t","w");
       Child.write(ErrReplyHead);
       Child.write(ErrReply);
       if Child.close() != None: