# Copyright (c) 1999-2000 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004 Joey Schulze <joey@debian.org>
+# Copyright (c) 2008, 2009, 2010 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2010 Martin Zobel-Helas <zobel@debian.org>
#
# 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
Split = re.split("[:\n]",Line);
UnknownMap[Split[0]] = Split[1].strip()
+
+def load_keys_from_gpg(keyrings):
+ keys = {}
+
+ # Popen GPG with the correct magic special options
+ ClearKeyrings()
+ SetKeyrings(keyrings)
+
+ Args = [GPGPath] + GPGBasicOptions + GPGKeyRings + GPGSearchOptions + [" 2> /dev/null"]
+ Keys = os.popen(" ".join(Args),"r");
+
+ # Loop over the GPG key file
+ Outstanding = 0;
+ while(1):
+ Line = Keys.readline();
+ if Line == "":
+ break;
+
+ Split = Line.split(":")
+ if len(Split) < 8 or Split[0] != "pub":
+ continue;
+
+ while (1):
+ Line2 = Keys.readline();
+ if Line2 == "":
+ break;
+ Split2 = Line2.split(":");
+ if len(Split2) < 11 or Split2[0] != "fpr":
+ continue;
+ break;
+ if Line2 == "":
+ break;
+
+ pgp_uid = Split[9]
+ fingerprint = Split2[9]
+
+ if fingerprint in keys:
+ print "Duplicate key in keyrings: %s, belonging to %s"%(fingerprint, pgp_uid)
+ continue
+ keys[fingerprint] = pgp_uid
+
+ if Keys.close() != None:
+ raise "Error","GPG failed"
+
+ return keys
+
+
+
+
+
+
# Process options
AdminUser = pwd.getpwuid(os.getuid())[0];
-(options, arguments) = getopt.getopt(sys.argv[1:], "au:m:n")
+(options, arguments) = getopt.getopt(sys.argv[1:], "ahu:m:")
for (switch, val) in options:
if (switch == '-u'):
AdminUser = val
elif (switch == '-m'):
LoadOverride(val);
+ elif (switch == '-h'):
+ print "Usage: ud-gpgimport <options>"
+ print "Available options:"
+ print " -h Show this help"
+ print " -u=<user> Admin user (defaults to current username)"
+ print " -m=<file> Override file to use"
+ print " -a actually do changes, not dry-run"
+ sys.exit(0)
elif (switch == '-a'):
NoAct = 0;
-if len(arguments) == 0:
- print "Give some keyrings to probe";
- sys.exit(0);
+
# Main program starts here
# Connect to the ldap server
if NoAct == 0:
- l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
+ l = passwdAccessLDAP(BaseDn, AdminUser)
else:
- l = ldap.open(LDAPServer);
+ l = connectLDAP()
l.simple_bind_s("","");
# Download the existing key list and put it into a map
Attrs = None;
print;
-# Popen GPG with the correct magic special options
-Args = [GPGPath] + GPGBasicOptions;
-for x in arguments:
- Args.append("--keyring");
- if x.find("/") == -1:
- Args.append("./"+x);
- else:
- Args.append(x);
-Args = Args + GPGSearchOptions + [" 2> /dev/null"]
-Keys = os.popen(" ".join(Args),"r");
-
-# Loop over the GPG key file
-Outstanding = 0;
-Ignored = 0;
-SeenKeys = {};
-while(1):
- Line = Keys.readline();
- if Line == "":
- break;
-
- Split = Line.split(":")
- if len(Split) < 8 or Split[0] != "pub":
- continue;
- while (1):
- Line2 = Keys.readline();
- if Line2 == "":
- break;
- Split2 = Line2.split(":");
- if len(Split2) < 11 or Split2[0] != "fpr":
- continue;
- break;
- if Line2 == "":
- break;
-
- if SeenKeys.has_key(Split2[9]):
- print "Dup key 0x",Split2[9],"belonging to",KeyMap[Split2[9]][0];
- continue;
- SeenKeys[Split2[9]] = None;
+pgpkeys = load_keys_from_gpg( ConfModule.add_keyrings.split(":") )
+pgpkeys_extra = load_keys_from_gpg( ConfModule.add_keyrings_guest.split(":") )
- if KeyMap.has_key(Split2[9]):
+Ignored = 0;
+for fpr in pgpkeys:
+ pgp_uid = pgpkeys[fpr]
+ if fpr in KeyMap:
Ignored = Ignored + 1;
- # print "Ignoring keyID",Split2[9],"belonging to",KeyMap[Split2[9]][0];
- KeyMap[Split2[9]][1] = 1;
+ # print "Ignoring keyID",fpr,"belonging to",KeyMap[fpr][0];
+ KeyMap[fpr][1] = 1;
continue;
-
- UID = GetUID(l,SplitEmail(Split[9]),UnknownMap);
+
+ UID = GetUID(l,SplitEmail(pgp_uid),UnknownMap);
if UID[0] == None:
- print "None for",SplitEmail(Split[9]),"'%s'"%(Split[9]);
- if UID[1] != None:
+ print "Unassigned key in keyrings: %s, belonging to %s"%(fpr, pgp_uid)
+ if UID[1] != None:
for x in UID[1]: print x;
- print "MISSING 0x" + Split2[9];
+ print "MISSING " + fpr;
continue;
UID = UID[0]
- Rec = [(ldap.MOD_ADD,"keyFingerPrint",Split2[9])];
+ Rec = [(ldap.MOD_ADD,"keyFingerPrint",fpr)];
Dn = "uid=" + UID + "," + BaseDn;
- print "Adding key 0x"+Split2[9],"to",UID;
+ print "Adding key "+fpr,"to",UID;
if KeyCount.has_key(UID):
KeyCount[UID] = KeyCount[UID] + 1;
else:
KeyCount[UID] = 1;
-
+
if NoAct == 1:
continue;
if NoAct == 0:
FlushOutstanding(l,Outstanding);
-if Keys.close() != None:
- raise "Error","GPG failed"
-
print Ignored,"keys already in the directory (ignored)";
# Look for unmatched keys
for x in KeyMap.keys():
- if KeyMap[x][1] == 0:
- print "key 0x%s belonging to %s removed"%(x,KeyMap[x][0]);
+ if KeyMap[x][1] == 0 and not x in pgpkeys_extra:
+ print "key %s belonging to %s removed"%(x,KeyMap[x][0]);
if KeyCount.has_key(KeyMap[x][0]) :
KeyCount[KeyMap[x][0]] = KeyCount[KeyMap[x][0]] - 1
if KeyCount[KeyMap[x][0]] <= 0:
if NoAct == 0:
l.modify_s("uid="+KeyMap[x][0]+","+BaseDn,\
[(ldap.MOD_DELETE,"keyFingerPrint",x)]);
-
+
+# vim:set et:
+# vim:set ts=3:
+# vim:set shiftwidth=3:
projects / mirror / userdir-ldap.git / blobdiff