feat(secutiry): empty access keys

semaphoreui · Oct 8, 2024 · d83ecee · d83ecee
1 parent 1c52b81
commit d83ecee
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/db/AccessKey.go b/db/AccessKey.go
@@ -48,7 +48,7 @@ type AccessKey struct {
 	// UserID is an ID of user which owns the access key.
 	UserID *int `db:"user_id" json:"-" backup:"-"`
 
-	Empty bool `db:"-" json:"empty"`
+	Empty bool `db:"-" json:"empty,omitempty"`
 }
 
 type LoginPassword struct {
@@ -178,13 +178,33 @@ func (key *AccessKey) SerializeSecret() error {
 
 	switch key.Type {
 	case AccessKeyString:
+		if key.String == "" {
+			key.Secret = nil
+			return nil
+		}
 		plaintext = []byte(key.String)
 	case AccessKeySSH:
+		if key.SshKey.PrivateKey == "" {
+			if key.SshKey.Login != "" || key.SshKey.Passphrase != "" {
+				return fmt.Errorf("invalid ssh key")
+			}
+			key.Secret = nil
+			return nil
+		}
+
 		plaintext, err = json.Marshal(key.SshKey)
 		if err != nil {
 			return err
 		}
 	case AccessKeyLoginPassword:
+		if key.LoginPassword.Password == "" {
+			if key.LoginPassword.Login != "" {
+				return fmt.Errorf("invalid password key")
+			}
+			key.Secret = nil
+			return nil
+		}
+
 		plaintext, err = json.Marshal(key.LoginPassword)
 		if err != nil {
 			return err

diff --git a/db/sql/access_key.go b/db/sql/access_key.go
@@ -28,6 +28,12 @@ func (d *SqlDb) GetAccessKeys(projectID int, params db.RetrieveQueryParams) (key
 
 	_, err = d.selectAll(&keys, query, args...)
 
+	for i := range keys {
+		if keys[i].Secret == nil {
+			keys[i].Empty = true
+		}
+	}
+
 	return
 }
 

diff --git a/web/src/views/project/Keys.vue b/web/src/views/project/Keys.vue
@@ -52,6 +52,16 @@
       class="mt-4"
       :items-per-page="Number.MAX_VALUE"
     >
+      <template v-slot:item.name="{ item }">
+        {{ item.name }}
+        <v-chip
+          color="error"
+          v-if="item.empty && item.type !== 'none'"
+          small
+          style="font-weight: bold;"
+          class="ml-2"
+        >Empty</v-chip>
+      </template>
       <template v-slot:item.type="{ item }">
         <code>{{ item.type }}</code>
       </template>