ud-useradd: A new -g switch for adding guest accounts, with proper
setting hostacls and shadowexpire and picking the right keyring.
* Add ud-sync-accounts-to-afs, a script to sync accounts to an
AFS protection database.
* ud-generate: support host ACLs that expire.
* Add ud-sync-accounts-to-afs, a script to sync accounts to an
AFS protection database.
* ud-generate: support host ACLs that expire.
+ * ud-useradd: A new -g switch for adding guest accounts, with
+ proper setting hostacls and shadowexpire and picking the
+ right keyring.
- -- Peter Palfrader <weasel@debian.org> Sun, 19 Sep 2010 01:40:54 +0200
+ -- Peter Palfrader <weasel@debian.org> Sun, 19 Sep 2010 01:42:10 +0200
userdir-ldap (0.3.78) unstable; urgency=low
userdir-ldap (0.3.78) unstable; urgency=low
import re, time, ldap, getopt, sys, os, pwd;
import email.Header
import re, time, ldap, getopt, sys, os, pwd;
import email.Header
from userdir_ldap import *;
from userdir_gpg import *;
from userdir_ldap import *;
from userdir_gpg import *;
# Process options
ForceMail = 0;
NoAutomaticIDs = 0;
# Process options
ForceMail = 0;
NoAutomaticIDs = 0;
OldGPGKeyRings = GPGKeyRings;
userdir_gpg.GPGKeyRings = [];
OldGPGKeyRings = GPGKeyRings;
userdir_gpg.GPGKeyRings = [];
-(options, arguments) = getopt.getopt(sys.argv[1:], "hu:man")
+(options, arguments) = getopt.getopt(sys.argv[1:], "hgu:man")
for (switch, val) in options:
if (switch == '-h'):
print "Usage: ud-useradd <options>"
for (switch, val) in options:
if (switch == '-h'):
print "Usage: ud-useradd <options>"
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 " -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;
sys.exit(0)
elif (switch == '-u'):
AdminUser = val;
userdir_gpg.GPGKeyRings = OldGPGKeyRings;
elif (switch == '-n'):
NoAutomaticIDs = 1;
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
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 == "":
while (1):
Foo = raw_input("Who are you going to add (for a GPG search)? ");
if Foo == "":
emailaddr = Res;
# Debian-Private subscription
emailaddr = Res;
# Debian-Private subscription
+if HavePrivateList and not GuestAccount:
Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
if Res != "":
privsub = Res;
else:
privsub = " "
Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
if Res != "":
privsub = Res;
else:
privsub = " "
-(uidNumber, generatedGID) = GetFreeID(l)
- 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:
if NoAutomaticIDs:
# UID
if not Update:
if gidNumber == generatedGID:
UserGroup = 1
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)? ");
# Generate a random password
if Update == 0 or ForceMail == 1:
Password = raw_input("User's Password (Enter for random)? ");
print " GECOS Field: \"%s,,,,\"" % (FullName);
print " Login Shell: /bin/bash";
print " Key Fingerprint:",Keys[0][1];
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);
Res = raw_input("Continue [No/yes]? ");
if Res != "yes":
sys.exit(1);
Details.append(("mn",mn));
if privsub != " ":
Details.append(("privateSub",privsub))
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:
l.add_s(Dn,Details);
#Add user group if needed, then the actual user:
# Keyrings synced to other machines, if they need them
sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
# Keyrings used to search in when new developers get added
# Keyrings synced to other machines, if they need them
sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
# Keyrings used to search in when new developers get added
-add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
+add_keyrings_guest = "/org/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
# For the WEB interface
webloginhtml = "login.html";
# For the WEB interface
webloginhtml = "login.html";