add MaskKey check

Author: dobrac

packages/api/internal/auth/key.go

@@ -3,6 +3,7 @@ package auth
 import (
 	"crypto/rand"
 	"encoding/hex"
+	"fmt"
 	"strings"
 )
 
@@ -20,23 +21,36 @@ type Key struct {
 	MaskedValue      string
 }
 
-func MaskKey(prefix string, value string) string {
-	lastFour := value[len(value)-keySuffixLength:]
-	stars := strings.Repeat("*", len(value)-keySuffixLength)
-	return prefix + stars + lastFour
+func MaskKey(prefix string, value string) (string, error) {
+	suffixOffset := len(value) - keySuffixLength
+
+	if suffixOffset < 0 {
+		return "", fmt.Errorf("mask value length is less than key suffix length (%d)", keySuffixLength)
+	}
+
+	lastFour := value[suffixOffset:]
+	stars := strings.Repeat("*", suffixOffset)
+	return prefix + stars + lastFour, nil
 }
 
 func GenerateKey(prefix string) (Key, error) {
 	keyBytes := make([]byte, keyLength)
+
 	_, err := rand.Read(keyBytes)
 	if err != nil {
 		return Key{}, err
 	}
+
 	generatedToken := hex.EncodeToString(keyBytes)
 
+	mask, err := MaskKey(prefix, generatedToken)
+	if err != nil {
+		return Key{}, err
+	}
+
 	return Key{
 		PrefixedRawValue: prefix + generatedToken,
 		HashedValue:      hasher.Hash(keyBytes),
-		MaskedValue:      MaskKey(prefix, generatedToken),
+		MaskedValue:      mask,
 	}, nil
 }

packages/api/internal/handlers/apikey.go

@@ -80,11 +80,17 @@ func (a *APIStore) GetApikeys(c *gin.Context) {
 
 		keyValue := strings.Split(apiKey.APIKey, auth.ApiKeyPrefix)[1]
 
+		// TODO: remove this once we migrate to hashed API keys
+		KeyMask, err := auth.MaskKey(auth.ApiKeyPrefix, keyValue)
+		if err != nil {
+			fmt.Printf("masking API key failed %d: %v", apiKey.ID, err)
+			continue
+		}
+
 		teamAPIKeys[i] = api.TeamAPIKey{
-			Id:   apiKey.ID,
-			Name: apiKey.Name,
-			// TODO: remove this once we migrate to hashed API keys
-			KeyMask:   auth.MaskKey(auth.ApiKeyPrefix, keyValue),
+			Id:        apiKey.ID,
+			Name:      apiKey.Name,
+			KeyMask:   KeyMask,
 			CreatedAt: apiKey.CreatedAt,
 			CreatedBy: createdBy,
 			LastUsed:  apiKey.LastUsed,