X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_keyring.py;h=602eb3744fb4334ad962a99007e347e271c517eb;hb=2b4d5bf75e28a6b5fa5afbd58defdf661c893033;hp=f61cc2c9ca3aba1ba45175cc86c4b6cb2507d3ca;hpb=080d94a27b1a06954ce37cff1c8515d8b1a7113b;p=dak.git diff --git a/dak/import_keyring.py b/dak/import_keyring.py index f61cc2c9..602eb374 100755 --- a/dak/import_keyring.py +++ b/dak/import_keyring.py @@ -19,28 +19,25 @@ ################################################################################ -import daklib.database, daklib.logging -import apt_pkg, pg -import sys, os, email.Utils, re +from daklib import database +from daklib import utils +import sys, os, re +import apt_pkg, pg, ldap, email.Utils # Globals Cnf = None Options = None projectB = None -Logger = None ################################################################################ -# These could possibly be daklib.db functions, and reused by -# import-ldap-fingerprints - def get_uid_info(): byname = {} byid = {} q = projectB.query("SELECT id, uid, name FROM uid") for (id, uid, name) in q.getresult(): byname[uid] = (id, name) - byid[id] = (uid, name) + byid[id] = (uid, name) return (byname, byid) def get_fingerprint_info(): @@ -52,74 +49,129 @@ def get_fingerprint_info(): ################################################################################ +def get_ldap_name(entry): + name = [] + for k in ["cn", "mn", "sn"]: + ret = entry.get(k) + if ret and ret[0] != "" and ret[0] != "-": + name.append(ret[0]) + return " ".join(name) + +################################################################################ + class Keyring: - gpg_invocation = "gpg --no-default-keyring --keyring %s" +\ - " --with-colons --fingerprint --fingerprint" - keys = {} - - def de_escape_str(self, str): - esclist = re.split(r'(\\x..)', str) - for x in range(1,len(esclist),2): - esclist[x] = "%c" % (int(esclist[x][2:],16)) - return "".join(esclist) - - def __init__(self, keyring): - k = os.popen(self.gpg_invocation % keyring, "r") - keys = self.keys - key = None - signingkey = False - for line in k.xreadlines(): - field = line.split(":") - if field[0] == "pub": - key = field[4] - (name, addr) = email.Utils.parseaddr(field[9]) - name = re.sub(r"\s*[(].*[)]", "", name) - if name == "" or addr == "" or "@" not in addr: - name = field[9] - addr = "invalid-uid" - name = self.de_escape_str(name) - keys[key] = {"email": addr} - if name != "": keys[key]["name"] = name - keys[key]["aliases"] = [name] - keys[key]["fingerprints"] = [] - signingkey = True - elif key and field[0] == "sub" and len(field) >= 12: - signingkey = ("s" in field[11]) - elif key and field[0] == "uid": - (name, addr) = email.Utils.parseaddr(field[9]) - if name and name not in keys[key]["aliases"]: - keys[key]["aliases"].append(name) - elif signingkey and field[0] == "fpr": - keys[key]["fingerprints"].append(field[9]) - - def desired_users(self, format="%s"): - if not Options["Generate-Users"]: - return ({}, {}) - - byuid = {} - byname = {} - keys = self.keys - any_invalid = False - for x in keys.keys(): - if keys[x]["email"] == "invalid-uid": - any_invalid = True - else: - uid = format % keys[x]["email"] - id = daklib.database.get_or_set_uid_id(uid) - byuid[id] = (uid, keys[x]["name"]) - byname[uid] = (id, keys[x]["name"]) - if any_invalid: - uid = format % "invalid-uid" - id = daklib.database.get_or_set_uid_id(uid) - byuid[id] = (uid, "ungeneratable user id") - byname[uid] = (id, "ungeneratable user id") - return (byname, byuid) + gpg_invocation = "gpg --no-default-keyring --keyring %s" +\ + " --with-colons --fingerprint --fingerprint" + keys = {} + fpr_lookup = {} + + def de_escape_gpg_str(self, str): + esclist = re.split(r'(\\x..)', str) + for x in range(1,len(esclist),2): + esclist[x] = "%c" % (int(esclist[x][2:],16)) + return "".join(esclist) + + def __init__(self, keyring): + k = os.popen(self.gpg_invocation % keyring, "r") + keys = self.keys + key = None + fpr_lookup = self.fpr_lookup + signingkey = False + for line in k.xreadlines(): + field = line.split(":") + if field[0] == "pub": + key = field[4] + (name, addr) = email.Utils.parseaddr(field[9]) + name = re.sub(r"\s*[(].*[)]", "", name) + if name == "" or addr == "" or "@" not in addr: + name = field[9] + addr = "invalid-uid" + name = self.de_escape_gpg_str(name) + keys[key] = {"email": addr} + if name != "": keys[key]["name"] = name + keys[key]["aliases"] = [name] + keys[key]["fingerprints"] = [] + signingkey = True + elif key and field[0] == "sub" and len(field) >= 12: + signingkey = ("s" in field[11]) + elif key and field[0] == "uid": + (name, addr) = email.Utils.parseaddr(field[9]) + if name and name not in keys[key]["aliases"]: + keys[key]["aliases"].append(name) + elif signingkey and field[0] == "fpr": + keys[key]["fingerprints"].append(field[9]) + fpr_lookup[field[9]] = key + + def generate_desired_users(self): + if Options["Generate-Users"]: + format = Options["Generate-Users"] + return self.generate_users_from_keyring(format) + if Options["Import-Ldap-Users"]: + return self.import_users_from_ldap() + return ({}, {}) + + def import_users_from_ldap(self): + LDAPDn = Cnf["Import-LDAP-Fingerprints::LDAPDn"] + LDAPServer = Cnf["Import-LDAP-Fingerprints::LDAPServer"] + l = ldap.open(LDAPServer) + l.simple_bind_s("","") + Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL, + "(&(keyfingerprint=*)(gidnumber=%s))" % (Cnf["Import-Users-From-Passwd::ValidGID"]), + ["uid", "keyfingerprint", "cn", "mn", "sn"]) + + ldap_fin_uid_id = {} + + byuid = {} + byname = {} + keys = self.keys + fpr_lookup = self.fpr_lookup + + for i in Attrs: + entry = i[1] + uid = entry["uid"][0] + name = get_ldap_name(entry) + fingerprints = entry["keyFingerPrint"] + id = None + for f in fingerprints: + key = fpr_lookup.get(f, None) + if key not in keys: continue + keys[key]["uid"] = uid + + if id != None: continue + id = database.get_or_set_uid_id(uid) + byuid[id] = (uid, name) + byname[uid] = (id, name) + + return (byname, byuid) + + def generate_users_from_keyring(self, format): + byuid = {} + byname = {} + keys = self.keys + any_invalid = False + for x in keys.keys(): + if keys[x]["email"] == "invalid-uid": + any_invalid = True + keys[x]["uid"] = format % "invalid-uid" + else: + uid = format % keys[x]["email"] + id = database.get_or_set_uid_id(uid) + byuid[id] = (uid, keys[x]["name"]) + byname[uid] = (id, keys[x]["name"]) + keys[x]["uid"] = uid + if any_invalid: + uid = format % "invalid-uid" + id = database.get_or_set_uid_id(uid) + byuid[id] = (uid, "ungeneratable user id") + byname[uid] = (id, "ungeneratable user id") + return (byname, byuid) ################################################################################ def usage (exit_code=0): print """Usage: dak import-keyring [OPTION]... [KEYRING] -h, --help show this help and exit. + -L, --import-ldap-users generate uid entries for keyring from LDAP -U, --generate-users FMT generate uid entries from keyring as FMT""" sys.exit(exit_code) @@ -129,107 +181,127 @@ def usage (exit_code=0): def main(): global Cnf, projectB, Options - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Import-Keyring::Options::Help"), - ('U',"generate-users","Import-Keyring::Options::Generate-Users", "HasArg"), - ] + ('L',"import-ldap-users","Import-Keyring::Options::Import-Ldap-Users"), + ('U',"generate-users","Import-Keyring::Options::Generate-Users", "HasArg"), + ] - for i in [ "help", "report-changes", "generate-users" ]: + for i in [ "help", "report-changes", "generate-users", "import-ldap-users" ]: if not Cnf.has_key("Import-Keyring::Options::%s" % (i)): Cnf["Import-Keyring::Options::%s" % (i)] = "" keyring_names = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv) + ### Parse options + Options = Cnf.SubTree("Import-Keyring::Options") if Options["Help"]: usage() - uid_format = "%s" - if Options["Generate-Users"]: - uid_format = Options["Generate-Users"] + if len(keyring_names) != 1: + usage(1) + + ### Keep track of changes made changes = [] # (uid, changes strings) + ### Initialise + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + database.init(Cnf, projectB) projectB.query("BEGIN WORK") - if len(keyring_names) != 1: - usage(1) + ### Cache all the existing fingerprint entries + + db_fin_info = get_fingerprint_info() + + ### Parse the keyring - # Parse the keyring keyringname = keyring_names[0] keyring = Keyring(keyringname) - keyring_id = daklib.database.get_or_set_keyring_id( - keyringname.split("/")[-1]) + is_dm = "false" + if Cnf.has_key("Import-Keyring::"+keyringname+"::Debian-Maintainer"): + projectB.query("UPDATE keyrings SET debian_maintainer = '%s' WHERE name = '%s'" % (Cnf["Import-Keyring::"+keyringname+"::Debian-Maintainer"], keyringname.split("/")[-1])) + is_dm = Cnf["Import-Keyring::"+keyringname+"::Debian-Maintainer"] - # If we're generating uids, make sure we have entries in the uid - # table for every uid - (desuid_byname, desuid_byid) = keyring.desired_users(uid_format) + keyring_id = database.get_or_set_keyring_id( + keyringname.split("/")[-1]) - # Cache all the existing fingerprint and uid entries - db_fin_info = get_fingerprint_info() - (db_uid_byname, db_uid_byid) = get_uid_info() + ### Generate new uid entries if they're needed (from LDAP or the keyring) + (desuid_byname, desuid_byid) = keyring.generate_desired_users() - # Update full names of uids + ### Cache all the existing uid entries + (db_uid_byname, db_uid_byid) = get_uid_info() + ### Update full names of applicable users for id in desuid_byid.keys(): uid = (id, desuid_byid[id][0]) name = desuid_byid[id][1] - oname = db_uid_byid[id][1] - if name and oname != name: - changes.append((uid[1], "Full name: %s\n" % (name))) + oname = db_uid_byid[id][1] + if name and oname != name: + changes.append((uid[1], "Full name: %s" % (name))) projectB.query("UPDATE uid SET name = '%s' WHERE id = %s" % - (pg.escape_string(name), id)) + (pg.escape_string(name), id)) + + # The fingerprint table (fpr) points to a uid and a keyring. + # If the uid is being decided here (ldap/generate) we set it to it. + # Otherwise, if the fingerprint table already has a uid (which we've + # cached earlier), we preserve it. + # Otherwise we leave it as None - # Work out what the fingerprint table should look like for the keys - # in this keyring fpr = {} for z in keyring.keys.keys(): - id = db_uid_byname.get(uid_format % keyring.keys[z]["email"], [None])[0] + id = db_uid_byname.get(keyring.keys[z].get("uid", None), [None])[0] if id == None: - id = db_fin_info.get(keyring.keys[z]["fingerprints"][0], [None])[0] - for y in keyring.keys[z]["fingerprints"]: - fpr[y] = (id,keyring_id) + id = db_fin_info.get(keyring.keys[z]["fingerprints"][0], [None])[0] + for y in keyring.keys[z]["fingerprints"]: + fpr[y] = (id,keyring_id) # For any keys that used to be in this keyring, disassociate them. - # We don't change the uid, leaving that to for historical info; if - # the id should change, it'll be set when importing another keyring - # or importing ldap fingerprints. + # We don't change the uid, leaving that for historical info; if + # the id should change, it'll be set when importing another keyring. for f,(u,fid,kr) in db_fin_info.iteritems(): if kr != keyring_id: continue - if f in fpr: continue - changes.append((db_uid_byid.get(u, [None])[0], "Removed key: %s\n" % (f))) - projectB.query("UPDATE fingerprint SET keyring = NULL WHERE id = %d" % (fid)) - + if f in fpr: continue + changes.append((db_uid_byid.get(u, [None])[0], "Removed key: %s" % (f))) + projectB.query("UPDATE fingerprint SET keyring = NULL WHERE id = %d" % (fid)) + # For the keys in this keyring, add/update any fingerprints that've # changed. for f in fpr: newuid = fpr[f][0] - newuiduid = db_uid_byid.get(newuid, [None])[0] - (olduid, oldfid, oldkid) = db_fin_info.get(f, [-1,-1,-1]) - if olduid == None: olduid = -1 - if oldkid == None: oldkid = -1 - if oldfid == -1: - changes.append((newuiduid, "Added key: %s\n" % (f))) + newuiduid = db_uid_byid.get(newuid, [None])[0] + (olduid, oldfid, oldkid) = db_fin_info.get(f, [-1,-1,-1]) + if olduid == None: olduid = -1 + if oldkid == None: oldkid = -1 + if oldfid == -1: + changes.append((newuiduid, "Added key: %s" % (f))) if newuid: - projectB.query("INSERT INTO fingerprint (fingerprint, uid, keyring) VALUES ('%s', %d, %d)" % (f, newuid, keyring_id)) - else: - projectB.query("INSERT INTO fingerprint (fingerprint, keyring) VALUES ('%s', %d)" % (f, keyring_id)) - else: - if newuid and olduid != newuid: - if olduid != -1: - changes.append((newuiduid, "Linked key: %s (formerly belonging to %s)" % (f, db_uid_byid[olduid][0]))) - else: - changes.append((newuiduid, "Linked key: %s (formerly unowned)\n" % (f))) - projectB.query("UPDATE fingerprint SET uid = %d WHERE id = %d" % (newuid, oldfid)) - - if oldkid != keyring_id: - projectB.query("UPDATE fingerprint SET keyring = %d WHERE id = %d" % (keyring_id, oldfid)) + projectB.query("INSERT INTO fingerprint (fingerprint, uid, keyring) VALUES ('%s', %d, %d)" % (f, newuid, keyring_id)) + else: + projectB.query("INSERT INTO fingerprint (fingerprint, keyring) VALUES ('%s', %d)" % (f, keyring_id)) + else: + if newuid and olduid != newuid: + if olduid != -1: + changes.append((newuiduid, "Linked key: %s" % f)) + changes.append((newuiduid, " (formerly belonging to %s)" % (db_uid_byid[olduid][0]))) + else: + changes.append((newuiduid, "Linked key: %s" % f)) + changes.append((newuiduid, " (formerly unowned)")) + projectB.query("UPDATE fingerprint SET uid = %d WHERE id = %d" % (newuid, oldfid)) + + if oldkid != keyring_id: + # Only change the keyring if it won't result in a loss of permissions + q = projectB.query("SELECT debian_maintainer FROM keyrings WHERE id = '%d'" % (keyring_id)) + if is_dm == "false" and q.getresult()[0][0] == 'f': + projectB.query("UPDATE fingerprint SET keyring = %d WHERE id = %d" % (keyring_id, oldfid)) + else: + print "Key %s exists in both DM and DD keyrings. Not demoting." % (f) # All done! @@ -238,12 +310,12 @@ def main(): changesd = {} for (k, v) in changes: if k not in changesd: changesd[k] = "" - changesd[k] += " " + v + changesd[k] += " %s\n" % (v) keys = changesd.keys() keys.sort() for k in keys: - print "%s\n%s" % (k, changesd[k]) + print "%s\n%s\n" % (k, changesd[k]) ################################################################################