X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=f3ffc4c678be75d617d00b5d1d7013953b6e07bc;hb=653566b328a70f1f4b765967d72660ebae44473e;hp=feec2b1036b6033aefe5bf2c41d2e5079686a1b4;hpb=3a6b6e1ce0ce91574e205b08e9b18d56d0e33683;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index feec2b1..f3ffc4c 100755 --- a/ud-generate +++ b/ud-generate @@ -6,6 +6,7 @@ # Copyright (c) 2003-2004 James Troup # Copyright (c) 2004-2005,7 Joey Schulze # Copyright (c) 2001-2007 Ryan Murray +# Copyright (c) 2008 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,7 +22,7 @@ # 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, posix, socket, base64, sha +import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil from userdir_ldap import *; global Allowed; @@ -35,6 +36,8 @@ CurrentHost = ""; 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" ] def Sanitize(Str): return Str.translate(string.maketrans("\n\r\t","$$$")) @@ -88,7 +91,7 @@ def Done(File,F,Fdb): os.rename(File + ".tdb.tmp",File+".tdb"); # Generate the password list -def GenPasswd(l,File,HomePrefix,PwdMarker,UidShift): +def GenPasswd(l,File,HomePrefix,PwdMarker): F = None; try: F = open(File + ".tdb.tmp","w"); @@ -116,7 +119,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker,UidShift): Line = Sanitize(Line) + "\n"; F.write("0%u %s" % (I,Line)); F.write(".%s %s" % (GetAttr(x,"uid"),Line)); - F.write("=%s %s" % ((int(GetAttr(x,"uidNumber"))+UidShift),Line)); + F.write("=%s %s" % (GetAttr(x,"uidNumber"),Line)); I = I + 1; # Oops, something unspeakable happened. @@ -209,7 +212,7 @@ def GenSSHShadow(l,File): Done(File,F,None); # Generate the group list -def GenGroup(l,File,UidShift): +def GenGroup(l,File): F = None; try: F = open(File + ".tdb.tmp","w"); @@ -242,10 +245,7 @@ def GenGroup(l,File,UidShift): for x in GroupMap.keys(): if GroupIDMap.has_key(x) == 0: continue; - NewGid = int(GroupIDMap[x]); - if NewGid >= 500: - NewGid = NewGid + UidShift - Line = "%s:x:%u:" % (x,NewGid) + Line = "%s:x:%u:" % (x,GroupIDMap[x]); Comma = ''; for I in GroupMap[x]: Line = Line + ("%s%s" % (Comma,I)); @@ -253,7 +253,7 @@ def GenGroup(l,File,UidShift): Line = Sanitize(Line) + "\n"; F.write("0%u %s" % (J,Line)); F.write(".%s %s" % (x,Line)); - F.write("=%u %s" % (NewGid,Line)); + F.write("=%u %s" % (GroupIDMap[x],Line)); J = J + 1; # Oops, something unspeakable happened. @@ -718,12 +718,23 @@ def GenSSHKnown(l,File): x[1].has_key("sshRSAHostKey") == 0: continue; Host = GetAttr(x,"hostname"); + HostNames = [ Host ] SHost = Host.find(".") + if SHost != None: HostNames += [Host[0:SHost]] + + IPAdressesT = None + IPAdresses = [] + # get IP adresses back as "proto adress" to distinguish between v4 and v6 + try: + IPAdressesT = set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)]) + except: + if code[0] != -2: raise + for addr in IPAdressesT: + if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]] + else: IPAdresses += [addr[1]] + 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 = "%s %s" %(",".join(HostNames + IPAdresses), I); Line = Sanitize(Line) + "\n"; F.write(Line); # Oops, something unspeakable happened. @@ -762,6 +773,10 @@ def GenHosts(l,File): raise; Done(File,F,None); +def GenKeyrings(l,OutDir): + for k in Keyrings: + shutil.copy(k, OutDir) + # Connect to the ldap server l = ldap.open(LDAPServer); F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); @@ -815,10 +830,11 @@ GenMailBool(l,GlobalDir+"mail-callout","mailCallout"); GenMailList(l,GlobalDir+"mail-rbl","mailRBL"); GenMailList(l,GlobalDir+"mail-rhsbl","mailRHSBL"); GenMailList(l,GlobalDir+"mail-whitelist","mailWhitelist"); +GenKeyrings(l,GlobalDir); # Compatibility. GenForward(l,GlobalDir+"forward-alias"); - + while(1): Line = F.readline(); if Line == "": @@ -856,14 +872,12 @@ while(1): DoLink(GlobalDir,OutDir,"disabled-accounts") sys.stdout.flush(); - UidShift = 0 - if ExtraList.has_key("[UIDSHIFT]"): UidShift=1000 if ExtraList.has_key("[NOPASSWD]"): - GenPasswd(l,OutDir+"passwd",Split[1], "*", UidShift); + GenPasswd(l,OutDir+"passwd",Split[1], "*"); else: - GenPasswd(l,OutDir+"passwd",Split[1], "x", UidShift); + GenPasswd(l,OutDir+"passwd",Split[1], "x"); sys.stdout.flush(); - GenGroup(l,OutDir+"group", UidShift); + GenGroup(l,OutDir+"group"); if ExtraList.has_key("[UNTRUSTED]"): continue; if not ExtraList.has_key("[NOPASSWD]"): @@ -891,3 +905,11 @@ while(1): if ExtraList.has_key("[PRIVATE]"): DoLink(GlobalDir,OutDir,"debian-private") + + if ExtraList.has_key("[KEYRING]"): + for k in Keyrings: + DoLink(GlobalDir,OutDir,os.path.basename(k)) + else: + for k in Keyrings: + try: posix.remove(OutDir+os.path.basename(k)); + except: pass;