dak/admin.py: add new subcommand to add buildd keyring

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index c77e93f32845b464922fbeca55ffd4a1fa22934a..3fa7eefb032b209414f3907dba15af5287a8b07e 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -65,6 +65,8 @@ Perform administrative work on the dak database.
      k list-all             list all keyrings
      k list-binary          list all keyrings with a NULL source acl
      k list-source          list all keyrings with a non NULL source acl
      k list-all             list all keyrings
      k list-binary          list all keyrings with a NULL source acl
      k list-source          list all keyrings with a non NULL source acl

+     k add-buildd NAME ARCH...   add buildd keyring with upload permission
+                                 for the given architectures

 
   architecture / a:
      a list                 show a list of architectures
 
   architecture / a:
      a list                 show a list of architectures


@@ -103,6 +105,7 @@ Perform administrative work on the dak database.
                             primary mirror MIRROR.
      archive rm NAME        remove archive NAME (will only work if there are
                             no files and no suites in the archive)
                             primary mirror MIRROR.
      archive rm NAME        remove archive NAME (will only work if there are
                             no files and no suites in the archive)

+     archive rename OLD NEW rename archive OLD to NEW

 
   version-check / v-c:
      v-c list                        show version checks for all suites
 
   version-check / v-c:
      v-c list                        show version checks for all suites


@@ -429,10 +432,23 @@ def archive_rm(name):
     else:
         session.commit()
 
     else:
         session.commit()
 

+def archive_rename(oldname, newname):
+    session = DBConn().session()
+    archive = get_archive(oldname, session)
+    archive.archive_name = newname
+    session.flush()
+
+    if dryrun:
+        session.rollback()
+    else:
+        session.commit()
+

 def archive(command):
     mode = command[1]
     if mode == 'list':
         archive_list()
 def archive(command):
     mode = command[1]
     if mode == 'list':
         archive_list()

+    elif mode == 'rename':
+        archive_rename(command[2], command[3])

     elif mode == 'add':
         archive_add(command[2:])
     elif mode == 'rm':
     elif mode == 'add':
         archive_add(command[2:])
     elif mode == 'rm':


@@ -556,6 +572,8 @@ def show_config(command):
             print "PGPORT=%s" % cnf["DB::Port"]
             e.append('PGPORT')
         print "export " + " ".join(e)
             print "PGPORT=%s" % cnf["DB::Port"]
             e.append('PGPORT')
         print "export " + " ".join(e)

+    elif mode == 'get':
+        print cnf.get(args[2])

     else:
         session = DBConn().session()
         try:
     else:
         session = DBConn().session()
         try:


@@ -584,17 +602,49 @@ def show_keyring(command):
     if mode == 'list-all':
         pass
     elif mode == 'list-binary':
     if mode == 'list-all':
         pass
     elif mode == 'list-binary':

-        q = q.filter(Keyring.default_source_acl_id == None)
+        q = q.join(Keyring.acl).filter(ACL.allow_source == False)

     elif mode == 'list-source':
     elif mode == 'list-source':

-        q = q.filter(Keyring.default_source_acl_id != None)
+        q = q.join(Keyring.acl).filter(ACL.allow_source == True)

     else:
         die("E: keyring command unknown")
 
     for k in q.all():
         print k.keyring_name
 
     else:
         die("E: keyring command unknown")
 
     for k in q.all():
         print k.keyring_name
 

-dispatch['keyring'] = show_keyring
-dispatch['k'] = show_keyring
+def keyring_add_buildd(command):
+    name = command[2]
+    arch_names = command[3:]
+
+    session = DBConn().session()
+    arches = session.query(Architecture).filter(Architecture.arch_string.in_(arch_names))
+
+    acl = ACL()
+    acl.name = 'buildd-{0}'.format('+'.join(arch_names))
+    acl.architectures.update(arches)
+    acl.allow_new = True
+    acl.allow_binary = True
+    acl.allow_binary_only = True
+    acl.allow_hijack = True
+    session.add(acl)
+
+    k = Keyring()
+    k.keyring_name = name
+    k.acl = acl
+    k.priority = 10
+    session.add(k)
+
+    session.commit()
+
+def keyring(command):
+    if command[1].startswith('list-'):
+        show_keyring(command)
+    elif command[1] == 'add-buildd':
+        keyring_add_buildd(command)
+    else:
+        die("E: keyring command unknown")
+
+dispatch['keyring'] = keyring
+dispatch['k'] = keyring

 
 ################################################################################
 
 
 ################################################################################