Add title when adding public keys

warpgate-admin/src/api/public_key_credentials.rs

@@ -18,18 +18,21 @@ use super::AnySecurityScheme;
 #[derive(Object)]
 struct ExistingPublicKeyCredential {
     id: Uuid,
+    openssh_public_key_title: String,
     openssh_public_key: String,
 }
 
 #[derive(Object)]
 struct NewPublicKeyCredential {
+    openssh_public_key_title: String,
     openssh_public_key: String,
 }
 
 impl From<PublicKeyCredential::Model> for ExistingPublicKeyCredential {
     fn from(credential: PublicKeyCredential::Model) -> Self {
         Self {
             id: credential.id,
+            openssh_public_key_title: credential.openssh_public_key_title,
             openssh_public_key: credential.openssh_public_key,
         }
     }
@@ -112,6 +115,7 @@ impl ListApi {
         let object = PublicKeyCredential::ActiveModel {
             id: Set(Uuid::new_v4()),
             user_id: Set(*user_id),
+            openssh_public_key_title: Set(body.openssh_public_key_title.clone()),
             ..PublicKeyCredential::ActiveModel::from(UserPublicKeyCredential::try_from(&*body)?)
         }
         .insert(&*db)

warpgate-db-entities/src/PublicKeyCredential.rs

@@ -11,6 +11,7 @@ pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
     pub user_id: Uuid,
+    pub openssh_public_key_title: String,
     pub openssh_public_key: String,
 }
 

warpgate-db-migrations/src/lib.rs

@@ -13,6 +13,7 @@ mod m00008_users;
 mod m00009_credential_models;
 mod m00010_parameters;
 mod m00011_rsa_key_algos;
+mod m00012_add_openssh_public_key_title;
 
 pub struct Migrator;
 
@@ -31,6 +32,7 @@ impl MigratorTrait for Migrator {
             Box::new(m00009_credential_models::Migration),
             Box::new(m00010_parameters::Migration),
             Box::new(m00011_rsa_key_algos::Migration),
+            Box::new(m00012_add_openssh_public_key_title::Migration),
         ]
     }
 }

warpgate-db-migrations/src/m00012_add_openssh_public_key_title.rs

@@ -0,0 +1,40 @@
+use sea_orm_migration::prelude::*;
+
+pub struct Migration;
+
+impl MigrationName for Migration {
+    fn name(&self) -> &str {
+        "m00012_add_openssh_public_key_title"
+    }
+}
+
+use crate::m00009_credential_models::public_key_credential;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(public_key_credential::Entity)
+                    .add_column(
+                        ColumnDef::new(Alias::new("openssh_public_key_title"))
+                            .string()
+                            .not_null()
+                    ).to_owned()
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(public_key_credential::Entity)
+                    .drop_column(Alias::new("openssh_public_key_title"))
+                    .to_owned(),
+            )
+            .await
+    }
+
+}

warpgate-protocol-http/src/api/credentials.rs

@@ -72,6 +72,7 @@ enum CredentialsStateResponse {
 
 #[derive(Object)]
 struct NewPublicKeyCredential {
+    openssh_public_key_title: String,
     openssh_public_key: String,
 }
 
@@ -288,6 +289,7 @@ impl Api {
         let object = PublicKeyCredential::ActiveModel {
             id: Set(Uuid::new_v4()),
             user_id: Set(user_model.id),
+            openssh_public_key_title: Set(body.openssh_public_key_title.clone()),
             openssh_public_key: Set(body.openssh_public_key.clone()),
         }
         .insert(&*db)

warpgate-web/src/admin/CredentialEditor.svelte

@@ -184,7 +184,9 @@
         editingSsoCredentialInstance = null
     }
 
-    async function savePublicKeyCredential (opensshPublicKey: string) {
+    async function savePublicKeyCredential (opensshPublicKeyTitle: string, opensshPublicKey: string) {
+        // TODO: If it is an existing key, update it
+        //      Otherwise, create a new one
         if (editingPublicKeyCredentialInstance) {
             editingPublicKeyCredentialInstance.opensshPublicKey = opensshPublicKey
             await api.updatePublicKeyCredential({
@@ -196,6 +198,7 @@
             const credential = await api.createPublicKeyCredential({
                 userId,
                 newPublicKeyCredential: {
+                    opensshPublicKeyTitle,
                     opensshPublicKey,
                 },
             })
@@ -250,7 +253,7 @@
         {/if}
         {#if credential.kind === 'PublicKey'}
             <Fa fw icon={faKey} />
-            <span class="type">Public key</span>
+            <span class="type">{credential.opensshPublicKeyTitle}</span>
             <span class="text-muted ms-2">{abbreviatePublicKey(credential.opensshPublicKey)}</span>
         {/if}
         {#if credential.kind === 'Totp'}

warpgate-web/src/admin/PublicKeyCredentialModal.svelte

@@ -4,6 +4,7 @@
         Form,
         FormGroup,
         Input,
+        Label,
         Modal,
         ModalBody,
         ModalFooter,
@@ -15,7 +16,7 @@
     interface Props {
         isOpen: boolean
         instance?: ExistingPublicKeyCredential
-        save: (opensshPublicKey: string) => void
+        save: (opensshPublicKeyTitle: string, opensshPublicKey: string) => void
     }
 
     let {
@@ -25,19 +26,20 @@
     }: Props = $props()
 
     let field: HTMLInputElement|undefined = $state()
+    let opensshPublicKeyTitle: string = $state('')
     let opensshPublicKey: string = $state('')
     let validated = $state(false)
 
     function _save () {
-        if (!opensshPublicKey) {
+        if (!opensshPublicKey || !opensshPublicKeyTitle) {
             return
         }
         if (opensshPublicKey.includes(' ')) {
             const parts = opensshPublicKey.split(' ').filter(x => x)
             opensshPublicKey = `${parts[0]} ${parts[1]}`
         }
         isOpen = false
-        save(opensshPublicKey)
+        save(opensshPublicKeyTitle, opensshPublicKey)
     }
 
     function _cancel () {
@@ -56,9 +58,16 @@
         e.preventDefault()
     }}>
         <ModalHeader toggle={_cancel}>
-            Public key
+            Add new SSH Public Key
         </ModalHeader>
         <ModalBody>
+            <FormGroup floating label="Title">
+                <Input
+                    bind:inner={field}
+                    type="text"
+                    required
+                    bind:value={opensshPublicKeyTitle} />
+            </FormGroup>
             <FormGroup floating label="Public key in OpenSSH format">
                 <Input
                     style="font-family: monospace; height: 15rem"

warpgate-web/src/admin/lib/openapi-schema.json

@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "Warpgate Web Admin",
-    "version": "0.11.0"
+    "version": "0.12.0"
   },
   "servers": [
     {
@@ -2154,13 +2154,17 @@
         "type": "object",
         "required": [
           "id",
+          "openssh_public_key_title",
           "openssh_public_key"
         ],
         "properties": {
           "id": {
             "type": "string",
             "format": "uuid"
           },
+          "openssh_public_key_title": {
+            "type": "string"
+          },
           "openssh_public_key": {
             "type": "string"
           }
@@ -2272,9 +2276,13 @@
       "NewPublicKeyCredential": {
         "type": "object",
         "required": [
+          "openssh_public_key_title",
           "openssh_public_key"
         ],
         "properties": {
+          "openssh_public_key_title": {
+            "type": "string"
+          },
           "openssh_public_key": {
             "type": "string"
           }

warpgate-web/src/gateway/lib/openapi-schema.json

@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "Warpgate HTTP proxy",
-    "version": "0.11.0"
+    "version": "0.12.0"
   },
   "servers": [
     {
@@ -799,9 +799,13 @@
       "NewPublicKeyCredential": {
         "type": "object",
         "required": [
+          "openssh_public_key_title",
           "openssh_public_key"
         ],
         "properties": {
+          "openssh_public_key_title": {
+            "type": "string"
+          },
           "openssh_public_key": {
             "type": "string"
           }