X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=62e4f4d61ef1c5622c2697cdb6aef50d08331732;hb=ecc535d579851f8463aa231bb428d1041c9cf730;hp=98cf8cb7fd34f4983671b88f8da3e9eed196f466;hpb=9f96588735e6d2c3ff733a4de3920399585a3b2e;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 98cf8cb..62e4f4d 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -19,7 +19,11 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import string, re, time, ldap, getopt, sys, os, pwd;
+import re, time, ldap, getopt, sys, os, pwd;
+import email
+import email.base64mime
+import email.quoprimime
+
 from userdir_ldap import *;
 from userdir_gpg import *;
 
@@ -67,10 +71,10 @@ for (switch, val) in options:
    elif (switch == '-n'):
       NoAutomaticIDs = 1;
 
-l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+l = passwdAccessLDAP(BaseDn, AdminUser)
 
 # Locate the key of the user we are adding
-SetKeyrings(["/org/keyring.debian.org/keyrings/debian-keyring.gpg"])
+SetKeyrings(ConfModule.add_keyrings.split(":"))
 while (1):
    Foo = raw_input("Who are you going to add (for a GPG search)? ");
    if Foo == "":
@@ -97,10 +101,10 @@ while (1):
 # first/middle/last name
 Addr = SplitEmail(Keys[0][2]);
 (cn,mn,sn) = NameSplit(re.sub('["]','',Addr[0]))
-email = Addr[1] + '@' + Addr[2];
+emailaddr = Addr[1] + '@' + Addr[2];
 account = Addr[1];
 
-privsub = email;
+privsub = emailaddr
 gidNumber = 0;
 uidNumber = 0;
 
@@ -138,7 +142,7 @@ while 1:
       privsub = GetAttr(Attrs[0],"privateSub");
       gidNumber = GetAttr(Attrs[0],"gidNumber");
       uidNumber = GetAttr(Attrs[0],"uidNumber");
-      email = GetAttr(Attrs[0],"emailForward");
+      emailaddr = GetAttr(Attrs[0],"emailForward");
       cn = GetAttr(Attrs[0],"cn");
       sn = GetAttr(Attrs[0],"sn");
       mn = GetAttr(Attrs[0],"mn");
@@ -158,16 +162,16 @@ if Res != "":
 Res = raw_input("Last name [" + sn + "]? ");
 if Res != "":
    sn = Res;
-Res = raw_input("Email forwarding address [" + email + "]? ");
+Res = raw_input("Email forwarding address [" + emailaddr + "]? ");
 if Res != "":
-   email = Res;
+   emailaddr = Res;
 
 # Debian-Private subscription
 Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
 if Res != "":
    privsub = Res;
 
-(uidNumber, generatedGID) = GetFreeID(l, RoleAccount)
+(uidNumber, generatedGID) = GetFreeID(l)
 if not gidNumber:
    gidNumber = DefaultGID
 UserGroup = 0
@@ -221,7 +225,7 @@ print "------------";
 print "Final information collected:"
 print " %s <%s@%s>:" % (FullName,account,EmailAppend);
 print "   Assigned UID:",uidNumber," GID:", gidNumber;
-print "   Email forwarded to:",email;
+print "   Email forwarded to:",emailaddr
 print "   Private Subscription:",privsub;
 print "   GECOS Field: \"%s,,,,\"" % (FullName);
 print "   Login Shell: /bin/bash";
@@ -232,12 +236,35 @@ if Res != "yes":
 
 # Initialize the substitution Map
 Subst = {}
+
+emailstring = FullName + " " + emailaddr
+encto = ''
+try:
+  encto = emailstring.encode('us-ascii')
+except UnicodeDecodeError:
+  if email.base64mime.base64_len(emailstring) < email.quoprimime.header_quopri_len(emailstring):
+    encto = email.base64mime.header_encode(emailstring, 'us-ascii')
+  else:
+    encto = email.quoprimime.header_encode(emailstring, 'us-ascii')
+
+subjstring = "New Debian Maintainer " + FullName
+encsubj = ''
+try:
+  encsubj = subjstring.encode('us-ascii')
+except UnicodeDecodeError:
+  if email.base64mime.base64_len(subjstring) < email.quoprimime.header_quopri_len(subjstring):
+    encsubj = email.base64mime.header_encode(subjstring, 'us-ascii')
+  else:
+    encsubj = email.quoprimime.header_encode(subjstring, 'us-ascii')
+
+Subst["__HEADER_SUBJ__"] = encsubj
+Subst["__HEADER_EMAIL"] = encto
 Subst["__REALNAME__"] = FullName;
 Subst["__WHOAMI__"] = pwd.getpwuid(os.getuid())[0];
 Subst["__DATE__"] = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
 Subst["__LOGIN__"] = account;
 Subst["__PRIVATE__"] = privsub;
-Subst["__EMAIL__"] = email;
+Subst["__EMAIL__"] = emailaddr
 Subst["__PASSWORD__"] = CryptedPass;
 
 # Submit the modification request
@@ -248,8 +275,7 @@ sys.stdout.flush();
 if Update == 0:
    # New account
    Details = [("uid",account),
-              ("objectClass",
-               ("top","inetOrgPerson","debianAccount","shadowAccount","debianDeveloper")),
+              ("objectClass", UserObjectClasses),
               ("uidNumber",str(uidNumber)),
               ("gidNumber",str(gidNumber)),
               ("gecos",FullName+",,,,"),
@@ -257,7 +283,7 @@ if Update == 0:
               ("keyFingerPrint",Keys[0][1]),
               ("cn",cn),
               ("sn",sn),
-              ("emailForward",email),
+              ("emailForward",emailaddr),
               ("shadowLastChange",str(int(time.time()/24/60/60))),
               ("shadowMin","0"),
               ("shadowMax","99999"),
@@ -271,7 +297,7 @@ if Update == 0:
    #Add user group if needed, then the actual user:
    if UserGroup == 1:
       Dn = "gid=" + account + "," + BaseDn;
-      l.add_s(Dn,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass",("top", "debianGroup"))]);
+      l.add_s(Dn,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass", GroupObjectClasses)])
 
    l.add_s(Dn,Details);
 else:
@@ -284,7 +310,7 @@ else:
           (ldap.MOD_REPLACE,"cn",cn),
           (ldap.MOD_REPLACE,"mn",mn),
           (ldap.MOD_REPLACE,"sn",sn),
-          (ldap.MOD_REPLACE,"emailForward",email),
+          (ldap.MOD_REPLACE,"emailForward",emailaddr),
           (ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60))),
           (ldap.MOD_REPLACE,"shadowMin","0"),
           (ldap.MOD_REPLACE,"shadowMax","99999"),
@@ -307,7 +333,7 @@ if Update == 1 and ForceMail == 0:
 
 # Send the Welcome message
 print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gidNumber,"r").read());
+Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % gidNumber, "r").read())
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);