X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=003f28ca041ab5e6de81af9f859923d25c2e5b45;hb=5ccf0b31849a9d7a2be2377c05cbe0b015606716;hp=243443fb52da5c2eaa9bb4fade1f81cb360973b0;hpb=5e4961c91009a15736f426c918c8d9dc8013cde2;p=mirror%2Fuserdir-ldap.git diff --git a/ud-useradd b/ud-useradd index 243443f..003f28c 100755 --- a/ud-useradd +++ b/ud-useradd @@ -4,6 +4,7 @@ # Copyright (c) 1999-2000 Jason Gunthorpe # Copyright (c) 2001-2003 James Troup # Copyright (c) 2004 Joey Schulze +# Copyright (c) 2008,2009,2010 Peter Palfrader # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ import re, time, ldap, getopt, sys, os, pwd; import email.Header +import datetime from userdir_ldap import *; from userdir_gpg import *; @@ -58,11 +60,22 @@ AdminUser = pwd.getpwuid(os.getuid())[0]; # Process options ForceMail = 0; NoAutomaticIDs = 0; +GuestAccount = False OldGPGKeyRings = GPGKeyRings; userdir_gpg.GPGKeyRings = []; -(options, arguments) = getopt.getopt(sys.argv[1:], "u:man") +(options, arguments) = getopt.getopt(sys.argv[1:], "hgu:man") for (switch, val) in options: - if (switch == '-u'): + if (switch == '-h'): + print "Usage: ud-useradd " + print "Available options:" + print " -h Show this help" + print " -u= Admin user (defaults to current username)" + print " -m Force mail (for updates)" + print " -a Use old keyrings instead (??)" + print " -n Do not automatically assign UID/GIDs (useful for usergroups or non-default group membership" + print " -g Add a guest account" + sys.exit(0) + elif (switch == '-u'): AdminUser = val; elif (switch == '-m'): ForceMail = 1; @@ -70,11 +83,17 @@ for (switch, val) in options: userdir_gpg.GPGKeyRings = OldGPGKeyRings; elif (switch == '-n'): NoAutomaticIDs = 1; + elif (switch == '-g'): + GuestAccount = True l = passwdAccessLDAP(BaseDn, AdminUser) # Locate the key of the user we are adding -SetKeyrings(ConfModule.add_keyrings.split(":")) +if GuestAccount: + SetKeyrings(ConfModule.add_keyrings_guest.split(":")) +else: + SetKeyrings(ConfModule.add_keyrings.split(":")) + while (1): Foo = raw_input("Who are you going to add (for a GPG search)? "); if Foo == "": @@ -169,18 +188,21 @@ if Res != "": emailaddr = Res; # Debian-Private subscription -if HavePrivateList: +if HavePrivateList and not GuestAccount: Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? "); if Res != "": privsub = Res; else: privsub = " " -(uidNumber, generatedGID) = GetFreeID(l) if not gidNumber: - gidNumber = DefaultGID -UserGroup = 0 + if not GuestAccount: + gidNumber = DefaultGID + else: + gidNumber = DebianGroups['guest'] +(uidNumber, generatedGID) = GetFreeID(l) +UserGroup = 0 if NoAutomaticIDs: # UID if not Update: @@ -199,6 +221,21 @@ if NoAutomaticIDs: if gidNumber == generatedGID: UserGroup = 1 +shadowExpire = None +hostacl = [] +if GuestAccount: + res = raw_input("Expires in xx days [60] (0 to disable)") + if res == "": res = '60' + exp = int(res) + if exp > 0: + shadowExpire = int(time.time() / 3600 / 24) + exp + res = raw_input("Hosts to grant access to: ") + for h in res.split(): + if not '.' in h: h = h + '.' + HostDomain + if exp > 0: h = h + " " + datetime.datetime.fromtimestamp( time.time() + exp * 24*3600 ).strftime("%Y%m%d") + hostacl.append(h) + + # Generate a random password if Update == 0 or ForceMail == 1: Password = raw_input("User's Password (Enter for random)? "); @@ -236,6 +273,11 @@ if HavePrivateList: print " GECOS Field: \"%s,,,,\"" % (FullName); print " Login Shell: /bin/bash"; print " Key Fingerprint:",Keys[0][1]; +if shadowExpire: + print " ShadowExpire: %d (%s)"%(shadowExpire, datetime.datetime.fromtimestamp( shadowExpire * 24*3600 ).strftime("%Y%m%d") ) +for h in hostacl: + print " allowedHost: ", h + Res = raw_input("Continue [No/yes]? "); if Res != "yes": sys.exit(1); @@ -243,21 +285,13 @@ if Res != "yes": # Initialize the substitution Map Subst = {} -encto = '' -try: - encto = FullName.decode('us-ascii') -except UnicodeError: - encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr - -subjstring = "New Debian Maintainer " + FullName -encsubj = '' +encrealname = '' try: - encsubj = subjstring.decode('us-ascii') + encrealname = FullName.decode('us-ascii') except UnicodeError: - encsubj = str(email.Header.Header(subjstring, 'utf-8', 200)) + encrealname = str(email.Header.Header(FullName, 'utf-8', 200)) -Subst["__HEADER_SUBJ__"] = encsubj -Subst["__HEADER_EMAIL"] = encto +Subst["__ENCODED_REALNAME__"] = encrealname 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())); @@ -292,6 +326,11 @@ if Update == 0: Details.append(("mn",mn)); if privsub != " ": Details.append(("privateSub",privsub)) + if shadowExpire: + Details.append(("shadowExpire",str(shadowExpire))) + if len(hostacl) > 0: + Details.append(("allowedHost",hostacl)) + l.add_s(Dn,Details); #Add user group if needed, then the actual user: @@ -340,3 +379,7 @@ Child = os.popen("/usr/sbin/sendmail -t","w"); Child.write(Reply); if Child.close() != None: raise Error, "Sendmail gave a non-zero return code"; + +# vim:set et: +# vim:set ts=3: +# vim:set shiftwidth=3: