X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=0ba6fa9f2eb8401271ea445f962e4bca9d3171fd;hb=ad069b0cc87569e0ad67ed4803f8df419a132afd;hp=afc6b16fff3f945086882526e1708efbe383377a;hpb=3057270afaca07614488cb7d3ca42d8372375b2f;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index afc6b16..0ba6fa9 100755 --- a/ud-generate +++ b/ud-generate @@ -5,13 +5,16 @@ import string, re, time, ldap, getopt, sys, os, pwd, posix, socket; from userdir_ldap import *; +global Allowed; +global CurrentHost; + PasswdAttrs = None; GroupIDMap = {}; Allowed = None; CurrentHost = ""; EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$"); -BSMTPCheck = re.compile(".*mx 0 klecker\.debian\.org\..*",re.DOTALL); +BSMTPCheck = re.compile(".*mx 0 (klecker|gluck)\.debian\.org\..*",re.DOTALL); DNSZone = ".debian.net" def Sanitize(Str): @@ -24,26 +27,25 @@ def DoLink(From,To,File): # See if this user is in the group list def IsInGroup(DnRecord): - global Allowed,CurrentHost; if Allowed == None: return 1; # See if the primary group is in the list - if Allowed.has_key(GetAttr(DnRecord,"gidnumber")) != 0: + if Allowed.has_key(GetAttr(DnRecord,"gidNumber")) != 0: return 1; # Check the host based ACL - if DnRecord[1].has_key("allowedhosts") != 0: - for I in DnRecord[1]["allowedhosts"]: + if DnRecord[1].has_key("allowedHost") != 0: + for I in DnRecord[1]["allowedHost"]: if CurrentHost == I: return 1; # See if there are supplementary groups - if DnRecord[1].has_key("supplementarygid") == 0: + if DnRecord[1].has_key("supplementaryGid") == 0: return 0; # Check the supplementary groups - for I in DnRecord[1]["supplementarygid"]: + for I in DnRecord[1]["supplementaryGid"]: if Allowed.has_key(I): return 1; return 0; @@ -69,10 +71,8 @@ def Done(File,F,Fdb): # Generate the password list def GenPasswd(l,File,HomePrefix): F = None; - Fdb = None; try: - F = open(File + ".tmp","w"); - Fdb = open(File + ".tdb.tmp","w"); + F = open(File + ".tdb.tmp","w"); # Fetch all the users global PasswdAttrs; @@ -81,37 +81,36 @@ def GenPasswd(l,File,HomePrefix): I = 0; for x in PasswdAttrs: - if x[1].has_key("uidnumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: continue; # Do not let people try to buffer overflow some busted passwd parser. - if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginshell")) > 50: + if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50: continue; - Line = "%s:x:%s:%s:%s:%s%s:%s\n" % (GetAttr(x,"uid"),\ - GetAttr(x,"uidnumber"),GetAttr(x,"gidnumber"),\ + Line = "%s:x:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\ + GetAttr(x,"uidNumber"),GetAttr(x,"gidNumber"),\ GetAttr(x,"gecos"),HomePrefix,GetAttr(x,"uid"),\ - GetAttr(x,"loginshell")); - F.write(Line); - Fdb.write("0%u %s" % (I,Line)); - Fdb.write(".%s %s" % (GetAttr(x,"uid"),Line)); - Fdb.write("=%s %s" % (GetAttr(x,"uidnumber"),Line)); + GetAttr(x,"loginShell")); + + Line = Sanitize(Line) + "\n"; + F.write("0%u %s" % (I,Line)); + F.write(".%s %s" % (GetAttr(x,"uid"),Line)); + F.write("=%s %s" % (GetAttr(x,"uidNumber"),Line)); I = I + 1; # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + Die(File,None,F); raise; - Done(File,F,Fdb); + Done(File,None,F); # Generate the shadow list def GenShadow(l,File): F = None; - Fdb = None; try: OldMask = os.umask(0077); - F = open(File + ".tmp","w",0600); - Fdb = open(File + ".tdb.tmp","w",0600); + F = open(File + ".tdb.tmp","w",0600); os.umask(OldMask); # Fetch all the users @@ -121,39 +120,36 @@ def GenShadow(l,File): I = 0; for x in PasswdAttrs: - if x[1].has_key("uidnumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: continue; - Pass = GetAttr(x,"userpassword"); + Pass = GetAttr(x,"userPassword"); if Pass[0:7] != "{crypt}" or len(Pass) > 50: Pass = '*'; else: Pass = Pass[7:]; 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"),\ + Pass,GetAttr(x,"shadowLastChange"),\ + GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\ + GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\ GetAttr(x,"shadowexpire")); Line = Sanitize(Line) + "\n"; - F.write(Line); - Fdb.write("0%u %s" % (I,Line)); - Fdb.write(".%s %s" % (GetAttr(x,"uid"),Line)); + F.write("0%u %s" % (I,Line)); + F.write(".%s %s" % (GetAttr(x,"uid"),Line)); I = I + 1; # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + Die(File,None,F); raise; - Done(File,F,Fdb); + Done(File,None,F); # Generate the shadow list def GenSSHShadow(l,File): F = None; - Fdb = None; try: OldMask = os.umask(0077); F = open(File + ".tmp","w",0600); - Fdb = os.popen("cdbmake %s.cdb %s.cdb.tmp"%(File,File),"w"); os.umask(OldMask); # Fetch all the users @@ -161,33 +157,32 @@ def GenSSHShadow(l,File): if PasswdAttrs == None: raise "No Users"; - I = 0; for x in PasswdAttrs: - if x[1].has_key("uidnumber") == 0 or \ - x[1].has_key("sshrsaauthkey") == 0: + # If the account is locked, do not write it. + # This is a partial stop-gap. The ssh also needs to change this + # to ignore ~/.ssh/authorized* files. + if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): + continue; + + if x[1].has_key("uidNumber") == 0 or \ + x[1].has_key("sshRSAAuthKey") == 0: continue; - for I in x[1]["sshrsaauthkey"]: + for I in x[1]["sshRSAAuthKey"]: User = GetAttr(x,"uid"); Line = "%s: %s" %(User,I); Line = Sanitize(Line) + "\n"; F.write(Line); - Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(I),User,I)); - Fdb.write("\n"); # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + Die(File,F,None); raise; - if Fdb.close() != None: - raise "cdbmake gave an error"; Done(File,F,None); # Generate the group list def GenGroup(l,File): F = None; - Fdb = None; try: - F = open(File + ".tmp","w"); - Fdb = open(File + ".tdb.tmp","w"); + F = open(File + ".tdb.tmp","w"); # Generate the GroupMap GroupMap = {}; @@ -201,19 +196,19 @@ def GenGroup(l,File): # Sort them into a list of groups having a set of users for x in PasswdAttrs: - if x[1].has_key("uidnumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: continue; - if x[1].has_key("supplementarygid") == 0: + if x[1].has_key("supplementaryGid") == 0: continue; - for I in x[1]["supplementarygid"]: + for I in x[1]["supplementaryGid"]: if GroupMap.has_key(I): GroupMap[I].append(GetAttr(x,"uid")); else: print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it"; # Output the group file. - Counter = 0; + J = 0; for x in GroupMap.keys(): if GroupIDMap.has_key(x) == 0: continue; @@ -223,17 +218,16 @@ def GenGroup(l,File): Line = Line + ("%s%s" % (Comma,I)); Comma = ','; Line = Sanitize(Line) + "\n"; - F.write(Line); - Fdb.write("0%u %s" % (Counter,Line)); - Fdb.write(".%s %s" % (x,Line)); - Fdb.write("=%u %s" % (GroupIDMap[x],Line)); - Counter = Counter + 1; + F.write("0%u %s" % (J,Line)); + F.write(".%s %s" % (x,Line)); + F.write("=%u %s" % (GroupIDMap[x],Line)); + J = J + 1; # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + Die(File,None,F); raise; - Done(File,F,Fdb); + Done(File,None,F); # Generate the email forwarding list def GenForward(l,File): @@ -251,17 +245,17 @@ def GenForward(l,File): # Write out the email address for each user for x in PasswdAttrs: - if x[1].has_key("emailforward") == 0 or IsInGroup(x) == 0: + 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: + if len(GetAttr(x,"emailForward")) > 200: continue; # Check the forwarding address - if EmailCheck.match(GetAttr(x,"emailforward")) == None: + if EmailCheck.match(GetAttr(x,"emailForward")) == None: continue; - Line = "%s: %s" % (GetAttr(x,"uid"),GetAttr(x,"emailforward")); + Line = "%s: %s" % (GetAttr(x,"uid"),GetAttr(x,"emailForward")); Line = Sanitize(Line) + "\n"; F.write(Line); @@ -285,11 +279,11 @@ def GenAllForward(l,File): # Write out the email address for each user for x in PasswdAttrs: - if x[1].has_key("emailforward") == 0: + if x[1].has_key("emailForward") == 0: continue; # Do not allow people to try to buffer overflow busted parsers - Forward = GetAttr(x,"emailforward"); + Forward = GetAttr(x,"emailForward"); if len(Forward) > 200: continue; @@ -352,23 +346,23 @@ def GenPrivate(l,File): # Write out the position for each user for x in PasswdAttrs: - if x[1].has_key("privatesub") == 0: + if x[1].has_key("privateSub") == 0: continue; # If the account is locked, do not write it - if (string.find(GetAttr(x,"userpassword"),"*LK*") != -1): + if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): continue; # If the account has no PGP key, do not write it - if x[1].has_key("keyfingerprint") == 0: + if x[1].has_key("keyFingerPrint") == 0: continue; # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x,"gidnumber") != "800": + if GetAttr(x,"gidNumber") != "800": continue; try: - Line = "%s"%(GetAttr(x,"privatesub")); + Line = "%s"%(GetAttr(x,"privateSub")); Line = Sanitize(Line) + "\n"; F.write(Line); except: @@ -381,12 +375,10 @@ def GenPrivate(l,File): Done(File,F,Fdb); # Generate the DNS Zone file -def GenDNS(l,File,BSMTPFile,HomePrefix): +def GenDNS(l,File,HomePrefix): F = None; - FB = None; try: F = open(File + ".tmp","w"); - FB = open(BSMTPFile + ".tmp","w"); # Fetch all the users global PasswdAttrs; @@ -395,11 +387,11 @@ def GenDNS(l,File,BSMTPFile,HomePrefix): # Write out the zone file entry for each user for x in PasswdAttrs: - if x[1].has_key("dnszoneentry") == 0: + if x[1].has_key("dnsZoneEntry") == 0: continue; try: F.write("; %s\n"%(EmailAddress(x))); - for z in x[1]["dnszoneentry"]: + for z in x[1]["dnsZoneEntry"]: Split = string.split(string.lower(z)); if string.lower(Split[1]) == 'in': for y in range(0,len(Split)): @@ -411,13 +403,11 @@ def GenDNS(l,File,BSMTPFile,HomePrefix): Host = Split[0] + DNSZone; if BSMTPCheck.match(Line) != None: F.write("; Has BSMTP\n"); - FB.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host, - GetAttr(x,"uid"),HomePrefix,GetAttr(x,"uid"),Host)); # Write some identification information if string.lower(Split[2]) == "a": Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x)); - for y in x[1]["keyfingerprint"]: + for y in x[1]["keyFingerPrint"]: Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y)); F.write(Line); else: @@ -432,50 +422,80 @@ def GenDNS(l,File,BSMTPFile,HomePrefix): # Oops, something unspeakable happened. except: Die(File,F,None); - Die(BSMTPFile,FB,None); raise; Done(File,F,None); - Done(BSMTPFile,FB,None); + +# Generate the BSMTP file +def GenBSMTP(l,File,HomePrefix): + F = None; + try: + F = open(File + ".tmp","w"); + + # Fetch all the users + global PasswdAttrs; + if PasswdAttrs == None: + raise "No Users"; + + # Write out the zone file entry for each user + for x in PasswdAttrs: + if x[1].has_key("dnsZoneEntry") == 0: + continue; + try: + for z in x[1]["dnsZoneEntry"]: + Split = string.split(string.lower(z)); + if string.lower(Split[1]) == 'in': + for y in range(0,len(Split)): + if Split[y] == "$": + Split[y] = "\n\t"; + Line = string.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)); + + except: + F.write("; Errors\n"); + pass; + + # Oops, something unspeakable happened. + except: + Die(File,F,None); + raise; + Done(File,F,None); # Generate the shadow list def GenSSHKnown(l,File): F = None; - Fdb = None; try: OldMask = os.umask(0022); F = open(File + ".tmp","w",0644); - Fdb = os.popen("cdbmake %s.cdb %s.cdb.tmp"%(File,File),"w"); os.umask(OldMask); # Fetch all the hosts - HostKeys = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshrsahostkey=*",\ - ["hostname","sshrsahostkey"]); + HostKeys = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ + ["hostname","sshRSAHostKey"]); if HostKeys == None: raise "No Hosts"; - I = 0; for x in HostKeys: if x[1].has_key("hostname") == 0 or \ - x[1].has_key("sshrsahostkey") == 0: + x[1].has_key("sshRSAHostKey") == 0: continue; Host = GetAttr(x,"hostname"); SHost = string.find(Host,"."); - for I in x[1]["sshrsahostkey"]: + for I in x[1]["sshRSAHostKey"]: if SHost == None: Line = "%s,%s %s" %(Host,socket.gethostbyname(Host),I); else: Line = "%s,%s,%s %s" %(Host,Host[0:SHost],socket.gethostbyname(Host),I); Line = Sanitize(Line) + "\n"; F.write(Line); - Fdb.write("+%d,%d:%s->%s\n"%(len(Host),len(I),Host,I)); - Fdb.write("\n"); # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + Die(File,F,None); raise; - if Fdb.close() != None: - raise "cdbmake gave an error"; Done(File,F,None); @@ -489,22 +509,22 @@ l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]); # Fetch all the groups GroupIDMap = {}; Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"gid=*",\ - ["gid","gidnumber"]); + ["gid","gidNumber"]); # Generate the GroupMap and GroupIDMap for x in Attrs: - if x[1].has_key("gidnumber") == 0: + if x[1].has_key("gidNumber") == 0: continue; - GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidnumber"][0]); + GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]); # Fetch all the users 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",\ - "allowedhosts","sshrsaauthkey","dnszoneentry","cn","sn",\ - "keyfingerprint","privatesub"]); + ["uid","uidNumber","gidNumber","supplementaryGid",\ + "gecos","loginShell","userPassword","shadowLastChange",\ + "shadowMin","shadowMax","shadowWarning","shadowinactive", + "shadowexpire","emailForward","latitude","longitude",\ + "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\ + "keyFingerPrint","privateSub"]); # Open the control file if len(sys.argv) == 1: @@ -549,7 +569,6 @@ while(1): if GroupIDMap.has_key(I): GroupList[str(GroupIDMap[I])] = None; - global Allowed,CurrentHost; Allowed = GroupList; CurrentHost = Split[0]; @@ -557,11 +576,12 @@ while(1): GenPasswd(l,OutDir+"passwd",Split[1]); sys.stdout.flush(); GenGroup(l,OutDir+"group"); + if CurrentHost == "haydn.debian.org" or CurrentHost == "costa.debian.org": + continue; GenShadow(l,OutDir+"shadow"); # Link in global things DoLink(GlobalDir,OutDir,"ssh-rsa-shadow"); - DoLink(GlobalDir,OutDir,"ssh-rsa-shadow.cdb"); DoLink(GlobalDir,OutDir,"markers"); DoLink(GlobalDir,OutDir,"mail-forward.cdb"); DoLink(GlobalDir,OutDir,"ssh_known_hosts"); @@ -570,7 +590,11 @@ while(1): DoLink(GlobalDir,OutDir,"forward-alias"); if ExtraList.has_key("[DNS]"): - GenDNS(l,OutDir+"dns-zone",OutDir+"bsmtp",Split[1]); + GenDNS(l,OutDir+"dns-zone",Split[1]); + if ExtraList.has_key("[BSMTP]"): + GenBSMTP(l,OutDir+"bsmtp",Split[1]); + if ExtraList.has_key("[PRIVATE]"): DoLink(GlobalDir,OutDir,"debian-private"); +