Allowed = None;
CurrentHost = "";
+UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
DNSZone = ".debian.net"
-Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
- "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
+Keyrings = ConfModule.sync_keyrings.split(":")
def safe_makedirs(dir):
try:
if Fdb != None:
Fdb.close();
os.rename(File + ".tdb.tmp",File+".tdb");
-
+
# Generate the password list
def GenPasswd(l,File,HomePrefix,PwdMarker):
F = None;
for x in PasswdAttrs:
if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
continue;
-
+
Pass = GetAttr(x,"userPassword");
if Pass[0:7] != "{crypt}" or len(Pass) > 50:
Pass = '*';
or GetAttr(x,"userPassword").startswith("!"):
ShadowExpire = '1'
else:
- ShadowExpire = GetAttr(x,"shadowexpire")
+ ShadowExpire = GetAttr(x,"shadowExpire")
Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x,"uid"),\
Pass,GetAttr(x,"shadowLastChange"),\
GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\
- GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\
+ GetAttr(x,"shadowWarning"),GetAttr(x,"shadowInactive"),\
ShadowExpire);
Line = Sanitize(Line) + "\n";
F.write("0%u %s" % (I,Line));
raise;
Done(File,None,F);
+# Generate the sudo passwd file
+def GenShadowSudo(l,File, untrusted):
+ F = None;
+ try:
+ OldMask = os.umask(0077);
+ F = open(File + ".tmp","w",0600);
+ os.umask(OldMask);
+
+ # Fetch all the users
+ global PasswdAttrs;
+ if PasswdAttrs == None:
+ raise "No Users";
+
+ for x in PasswdAttrs:
+ Pass = '*'
+ if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
+ continue;
+
+ if x[1].has_key('sudoPassword'):
+ for entry in x[1]['sudoPassword']:
+ Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
+ if Match == None:
+ continue
+ uuid = Match.group(1)
+ status = Match.group(2)
+ hosts = Match.group(3)
+ cryptedpass = Match.group(4)
+
+ if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass):
+ continue
+ for_all = hosts == "*"
+ for_this_host = CurrentHost in hosts.split(',')
+ if not (for_all or for_this_host):
+ continue
+ # ignore * passwords for untrusted hosts, but copy host specific passwords
+ if for_all and untrusted:
+ continue
+ Pass = cryptedpass
+ if for_this_host: # this makes sure we take a per-host entry over the for-all entry
+ break
+ if len(Pass) > 50:
+ Pass = '*'
+
+ Line = "%s:%s" % (GetAttr(x,"uid"), Pass)
+ Line = Sanitize(Line) + "\n";
+ F.write("%s" % (Line));
+
+ # Oops, something unspeakable happened.
+ except:
+ Die(File,F,None);
+ raise;
+ Done(File,F,None);
+
# Generate the shadow list
def GenSSHShadow(l,masterFileName):
# Fetch all the users
if MultipleSSHFiles:
safe_rmtree(os.path.join(GlobalDir, 'userkeys'))
safe_makedirs(os.path.join(GlobalDir, 'userkeys'))
-
+
for x in PasswdAttrs:
# If the account is locked, do not write it.
# This is a partial stop-gap. The ssh also needs to change this
GroupMap = {};
for x in GroupIDMap.keys():
GroupMap[x] = [];
-
+
# Fetch all the users
global PasswdAttrs;
if PasswdAttrs == None:
continue;
if x[1].has_key("supplementaryGid") == 0:
continue;
-
+
for I in x[1]["supplementaryGid"]:
if GroupMap.has_key(I):
- GroupMap[I].append(GetAttr(x,"uid"));
- else:
+ GroupMap[I].append(GetAttr(x,"uid"));
+ else:
print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it";
-
+
# Output the group file.
J = 0;
for x in GroupMap.keys():
F.write(".%s %s" % (x,Line));
F.write("=%u %s" % (GroupIDMap[x],Line));
J = J + 1;
-
+
# Oops, something unspeakable happened.
except:
Die(File,None,F);
for x in PasswdAttrs:
if x[1].has_key("emailForward") == 0 or IsInGroup(x) == 0:
continue;
-
+
# Do not allow people to try to buffer overflow busted parsers
if len(GetAttr(x,"emailForward")) > 200:
continue;
Line = "%s: %s" % (GetAttr(x,"uid"),GetAttr(x,"emailForward"));
Line = Sanitize(Line) + "\n";
F.write(Line);
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
for x in PasswdAttrs:
if x[1].has_key("emailForward") == 0:
continue;
-
+
# Do not allow people to try to buffer overflow busted parsers
Forward = GetAttr(x,"emailForward");
if len(Forward) > 200:
# Check the forwarding address
if EmailCheck.match(Forward) == None:
continue;
-
+
User = GetAttr(x,"uid");
Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(Forward),User,Forward));
Fdb.write("\n");
if Fdb.close() != None:
raise "cdbmake gave an error";
-# Generate the anon XEarth marker file
+# Generate the anon XEarth marker file
def GenMarkers(l,File):
F = None;
try:
# Write out the position for each user
for x in PasswdAttrs:
if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0:
- continue;
+ continue;
try:
Line = "%8s %8s \"\""%(DecDegree(GetAttr(x,"latitude"),1),DecDegree(GetAttr(x,"longitude"),1));
Line = Sanitize(Line) + "\n";
F.write(Line);
except:
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
# Must be in the Debian group (yuk, hard coded for now)
if GetAttr(x,"gidNumber") != "800":
- continue;
+ continue;
try:
Line = "%s"%(GetAttr(x,"privateSub"));
F.write(Line);
except:
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
for x in PasswdAttrs:
if x[1].has_key("uidNumber") == 0:
continue;
-
+
Pass = GetAttr(x,"userPassword");
Line = ""
# *LK* is the reference value for a locked account
# password starting with ! is also a locked account
if Pass.find("*LK*") != -1 or Pass.startswith("!"):
- # Format is <login>:<reason>
- Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
+ # Format is <login>:<reason>
+ Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
if Line != "":
- F.write(Sanitize(Line) + "\n")
+ F.write(Sanitize(Line) + "\n")
# Oops, something unspeakable happened.
except:
for x in PasswdAttrs:
Reason = None
-
- # If the account is locked, disable incoming mail
- if (GetAttr(x,"userPassword").find("*LK*") != -1):
- if GetAttr(x,"uid") == "luther":
- continue
- else:
- Reason = "user account locked"
+
+ if x[1].has_key("mailDisableMessage"):
+ Reason = GetAttr(x,"mailDisableMessage")
else:
- if x[1].has_key("mailDisableMessage"):
- Reason = GetAttr(x,"mailDisableMessage")
- else:
- continue
+ continue
# Must be in the Debian group (yuk, hard coded for now)
if GetAttr(x,"gidNumber") != "800":
- continue;
+ continue;
try:
Line = "%s: %s"%(GetAttr(x,"uid"),Reason);
F.write(Line);
except:
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
for x in PasswdAttrs:
Reason = None
-
+
if x[1].has_key(Key) == 0:
continue
# Must be in the Debian group (yuk, hard coded for now)
if GetAttr(x,"gidNumber") != "800":
- continue
+ continue
if GetAttr(x,Key) != "TRUE":
continue
F.write(Line);
except:
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
for x in PasswdAttrs:
Reason = None
-
+
if x[1].has_key(Key) == 0:
continue
# Must be in the Debian group (yuk, hard coded for now)
if GetAttr(x,"gidNumber") != "800":
- continue
+ continue
try:
found = 0
Line = None
for z in x[1][Key]:
if Key == "mailWhitelist":
- if re.match('^[-\w.]+(/[\d]+)?$',z) == None:
- continue
- else:
- if re.match('^[-\w.]+$',z) == None:
- continue
+ if re.match('^[-\w.]+(/[\d]+)?$',z) == None:
+ continue
+ else:
+ if re.match('^[-\w.]+$',z) == None:
+ continue
if found == 0:
found = 1
Line = GetAttr(x,"uid")
F.write(Line);
except:
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
F = None;
try:
F = open(File + ".tmp","w");
-
+
# Fetch all the users
global PasswdAttrs;
if PasswdAttrs == None:
F.write("; %s\n"%(EmailAddress(x)));
for z in x[1]["dnsZoneEntry"]:
Split = z.lower().split()
- if Split[1].lower() == 'in':
+ if Split[1].lower() == 'in':
for y in range(0,len(Split)):
if Split[y] == "$":
Split[y] = "\n\t";
Line = " ".join(Split) + "\n";
F.write(Line);
-
- Host = Split[0] + DNSZone;
- if BSMTPCheck.match(Line) != None:
- F.write("; Has BSMTP\n");
-
- # Write some identification information
+
+ Host = Split[0] + DNSZone;
+ if BSMTPCheck.match(Line) != None:
+ F.write("; Has BSMTP\n");
+
+ # Write some identification information
if Split[2].lower() == "a":
- Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
+ Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
for y in x[1]["keyFingerPrint"]:
- Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));
+ Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));
F.write(Line);
- else:
+ else:
Line = "; Err %s"%(str(Split));
F.write(Line);
F.write("\n");
except:
- F.write("; Errors\n");
+ F.write("; Errors\n");
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
F = None
try:
F = open(File + ".tmp","w")
-
+
# Fetch all the hosts
global HostAttrs
if HostAttrs == None:
F = None;
try:
F = open(File + ".tmp","w");
-
+
# Fetch all the users
global PasswdAttrs;
if PasswdAttrs == None:
try:
for z in x[1]["dnsZoneEntry"]:
Split = z.lower().split()
- if Split[1].lower() == 'in':
+ if Split[1].lower() == 'in':
for y in range(0,len(Split)):
if Split[y] == "$":
Split[y] = "\n\t";
Line = " ".join(Split) + "\n";
-
- Host = Split[0] + DNSZone;
- if BSMTPCheck.match(Line) != None:
- F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host,
- GetAttr(x,"uid"),HomePrefix,GetAttr(x,"uid"),Host));
-
+
+ Host = Split[0] + DNSZone;
+ if BSMTPCheck.match(Line) != None:
+ F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host,
+ GetAttr(x,"uid"),HomePrefix,GetAttr(x,"uid"),Host));
+
except:
- F.write("; Errors\n");
+ F.write("; Errors\n");
pass;
-
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
global HostAttrs
if HostAttrs == None:
raise "No Hosts";
-
+
for x in HostAttrs:
if x[1].has_key("hostname") == 0 or \
x[1].has_key("sshRSAHostKey") == 0:
# Fetch all the hosts
HostNames = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"hostname=*",\
["hostname"]);
-
+
if HostNames == None:
raise "No Hosts";
shutil.copy(k, OutDir)
# Connect to the ldap server
-l = ldap.open(LDAPServer);
+l = connectLDAP()
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
Pass = F.readline().strip().split(" ")
F.close();
PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
["uid","uidNumber","gidNumber","supplementaryGid",\
"gecos","loginShell","userPassword","shadowLastChange",\
- "shadowMin","shadowMax","shadowWarning","shadowinactive",
- "shadowexpire","emailForward","latitude","longitude",\
+ "shadowMin","shadowMax","shadowWarning","shadowInactive",
+ "shadowExpire","emailForward","latitude","longitude",\
"allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
- "keyFingerPrint","privateSub","mailDisableMessage",\
+ "keyFingerPrint","privateSub","mailDisableMessage",\
"mailGreylisting","mailCallout","mailRBL","mailRHSBL",\
- "mailWhitelist"]);
+ "mailWhitelist", "sudoPassword"]);
# Fetch all the hosts
HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
["hostname","sshRSAHostKey"]);
userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x");
sys.stdout.flush();
grouprevmap = GenGroup(l,OutDir+"group");
- if ExtraList.has_key("[UNTRUSTED]"):
- continue;
- if not ExtraList.has_key("[NOPASSWD]"):
- GenShadow(l,OutDir+"shadow");
+ GenShadowSudo(l, OutDir+"sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]"))
# Now we know who we're allowing on the machine, export
# the relevant ssh keys
if MultipleSSHFiles:
+ OldMask = os.umask(0077);
tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz')
+ os.umask(OldMask);
for f in userlist.keys():
if f not in SSHFiles:
continue
- # If we're not exporting their primary group, don't export
+ # If we're not exporting their primary group, don't export
# the key and warn
grname = None
if userlist[f] in grouprevmap.keys():
# to give a shit^W^W^Wcare about the UIDoffset stuff.
to.uname = f
to.gname = grname
- to.mode = 0600
+ to.mode = 0400
tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f)))
tf.close()
os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost),
os.path.join(OutDir, 'ssh-keys.tar.gz'))
- # Link in global things
- DoLink(GlobalDir,OutDir,"markers");
+ if ExtraList.has_key("[UNTRUSTED]"):
+ print "[UNTRUSTED] tag is obsolete and may be removed in the future."
+ continue;
+ if not ExtraList.has_key("[NOPASSWD]"):
+ GenShadow(l,OutDir+"shadow");
+
+ # Link in global things
+ if not ExtraList.has_key("[NOMARKERS]"):
+ DoLink(GlobalDir,OutDir,"markers");
DoLink(GlobalDir,OutDir,"mail-forward.cdb");
DoLink(GlobalDir,OutDir,"mail-disable");
DoLink(GlobalDir,OutDir,"mail-greylist");
if ExtraList.has_key("[DNS]"):
GenDNS(l,OutDir+"dns-zone",Split[1]);
GenSSHFP(l,OutDir+"dns-sshfp",Split[1])
-
+
if ExtraList.has_key("[BSMTP]"):
GenBSMTP(l,OutDir+"bsmtp",Split[1])
for k in Keyrings:
try: posix.remove(OutDir+os.path.basename(k));
except: pass;
+
+# vim:set et:
+# vim:set ts=3:
+# vim:set shiftwidth=3:
projects / mirror / userdir-ldap.git / blobdiff