Rename old label to abbreviated

also fix db migration also fix #1176
warp-tech · Dec 18, 2024 · 7ec5681 · 7ec5681
1 parent b3aa0a2
commit 7ec5681
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/warpgate-db-migrations/src/m00012_add_openssh_public_key_label.rs b/warpgate-db-migrations/src/m00012_add_openssh_public_key_label.rs
@@ -21,7 +21,9 @@ impl MigrationTrait for Migration {
                         ColumnDef::new(Alias::new("label"))
                             .string()
                             .not_null()
-                    ).to_owned()
+                            .default("Public Key")
+                    )
+                    .to_owned()
             )
             .await
     }

diff --git a/warpgate-protocol-http/src/api/credentials.rs b/warpgate-protocol-http/src/api/credentials.rs
@@ -80,22 +80,28 @@ struct NewPublicKeyCredential {
 struct ExistingPublicKeyCredential {
     id: Uuid,
     label: String,
+    abbreviated: String,
 }
 
 fn abbreviate_public_key(k: &str) -> String {
     let l = 10;
+    if k.len() <= l {
+        return k.to_string(); // Return the full key if it's shorter than or equal to `l`.
+    }
+
     format!(
         "{}...{}",
-        &k[..l.min(k.len())],
-        &k[(k.len() - l).max(l).min(k.len() - 1)..]
+        &k[..l.min(k.len())],                // Take the first `l` characters.
+        &k[k.len().saturating_sub(l)..]      // Take the last `l` characters safely.
     )
 }
 
 impl From<entities::PublicKeyCredential::Model> for ExistingPublicKeyCredential {
     fn from(credential: entities::PublicKeyCredential::Model) -> Self {
         Self {
             id: credential.id,
-            label: abbreviate_public_key(&credential.openssh_public_key),
+            label: credential.label,
+            abbreviated: abbreviate_public_key(&credential.openssh_public_key),
         }
     }
 }

diff --git a/warpgate-web/src/gateway/CredentialManager.svelte b/warpgate-web/src/gateway/CredentialManager.svelte
@@ -31,9 +31,10 @@
         creds!.password = state
     }
 
-    async function createPublicKey (opensshPublicKey: string) {
+    async function createPublicKey (label: string, opensshPublicKey: string) {
         const credential = await api.addMyPublicKey({
             newPublicKeyCredential: {
+                label,
                 opensshPublicKey,
             },
         })
@@ -156,6 +157,7 @@
         <div class="list-group-item credential">
             <Fa fw icon={faKey} />
             <span class="label">{credential.label}</span>
+            <span class="text-muted ms-2">{credential.abbreviated}</span>
             <span class="ms-auto"></span>
             <a
                 class="hover-reveal ms-2"

diff --git a/warpgate-web/src/gateway/lib/openapi-schema.json b/warpgate-web/src/gateway/lib/openapi-schema.json
@@ -688,7 +688,8 @@
         "type": "object",
         "required": [
           "id",
-          "label"
+          "label",
+          "abbreviated"
         ],
         "properties": {
           "id": {
@@ -697,6 +698,9 @@
           },
           "label": {
             "type": "string"
+          },
+          "abbreviated": {
+            "type": "string"
           }
         }
       },