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: dak acl set-fingerprints <acl-name>
+ print """Usage:
+ dak acl set-fingerprints <acl-name>
+ dak acl export-per-source <acl-name>
-Reads list of fingerprints from stdin and sets the ACL <acl-name> to these.
+ set-fingerprints:
+ Reads list of fingerprints from stdin and sets the ACL <acl-name> to these.
+ Accepted input formats are "uid:<uid>", "name:<name>" and
+ "fpr:<fingerprint>".
+
+ export-per-source:
+ Export per source upload rights for ACL <acl-name>.
"""
def get_fingerprint(entry, session):
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)
session = DBConn().session()
acl = session.query(ACL).filter_by(name=acl_name).one()
- query = """
+ query = r"""
SELECT
f.fingerprint,
(SELECT COALESCE(u.name, '') || ' <' || u.uid || '>'
FROM uid u
JOIN fingerprint f2 ON u.id = f2.uid
WHERE f2.id = f.id) AS name,
- STRING_AGG(a.source, ' ' ORDER BY a.source)
+ STRING_AGG(
+ a.source
+ || COALESCE(' (' || (SELECT fingerprint FROM fingerprint WHERE id = a.created_by_id) || ')', ''),
+ E',\n ' ORDER BY a.source)
FROM acl_per_source a
JOIN fingerprint f ON a.fingerprint_id = f.id
LEFT JOIN uid u ON f.uid = u.id