import sys
from daklib.config import Config
-from daklib.dbconn import DBConn, Fingerprint, Uid, ACL
+from daklib.dbconn import DBConn, Fingerprint, Keyring, Uid, ACL
def usage():
print """Usage:
uid:<uid>
name:<name>
fpr:<fingerprint>
+ keyring:<keyring-name>
@type entry: string
@param entry: ACL entry
@return: fingerprint for the entry
"""
field, value = entry.split(":", 1)
- q = session.query(Fingerprint)
+ q = session.query(Fingerprint).join(Fingerprint.keyring).filter(Keyring.active == True)
if field == 'uid':
q = q.join(Fingerprint.uid).filter(Uid.uid == value)
q = q.join(Fingerprint.uid).filter(Uid.name == value)
elif field == 'fpr':
q = q.filter(Fingerprint.fingerprint == value)
+ elif field == 'keyring':
+ q = q.filter(Keyring.keyring_name == value)
+ else:
+ raise Exception('Unknown selector "{0}".'.format(field))
return q.all()
acl.fingerprints.clear()
for entry in entries:
entry = entry.strip()
+ if entry.startswith('#') or len(entry) == 0:
+ continue
+
fps = get_fingerprint(entry, session)
if len(fps) == 0:
print "Unknown key for '{0}'".format(entry)