keys: Require comments

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index 83a559a8a7dc177e511fca6969c32adb122a2a5e..62dbe1f343a1fd7a21d8483be65a7d0b0e46ec82 100644 (file)
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -40,11 +40,11 @@ class Keys(base.Object):
                """
                return await asyncio.to_thread(self._create, *args, **kwargs)
 
-       def _create(self, user, comment=None):
+       def _create(self, comment, user=None):
                # Launch a new Pakfire instance
                with self.backend.pakfire() as p:
                        # Generate the new key
-                       key = p.generate_key(DEFAULT_ALGORITHM)
+                       key = p.generate_key(DEFAULT_ALGORITHM, comment)
 
                        # Export the secret key
                        secret_key = key.export(True)

diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index c218314624a863108f86080cd5b21bb253a844bc..bad7aaf9d824aa4932fbc1758d98aa5b90251875 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -73,7 +73,7 @@ class Repositories(base.Object):
                        comment = "%s - %s" % (owner, comment)
 
                # Create a key for this repository
-               key = await self.backend.keys.create(owner, comment=comment)
+               key = await self.backend.keys.create(comment=comment, user=owner)
 
                repo = self._get_repository("""
                        INSERT INTO

diff --git a/src/database.sql b/src/database.sql
index c3f328203840fd939bb0142dfd76d65c11db0508..69935a27864cfd4c5829da8f06df7607de8146fa 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -525,7 +525,8 @@ CREATE TABLE public.keys (
     deleted_by integer,
     public_key text NOT NULL,
     secret_key text NOT NULL,
-    key_id numeric NOT NULL
+    key_id numeric NOT NULL,
+    comment text
 );