Update ed25519keys.go

Author: BryceWDesign

internal/crypto/ed25519keys.go

@@ -8,6 +8,12 @@ import (
 	"strings"
 )
 
+type ResolvePublicKeyOptions struct {
+	KeyID         string
+	PublicKeyPath string
+	SearchDirs    []string
+}
+
 func LoadEd25519PrivateKeyFromSeedFile(path string) (ed25519.PrivateKey, error) {
 	b, err := readB64URLFile(path)
 	if err != nil {
@@ -35,20 +41,21 @@ func LoadEd25519PublicKeyFile(path string) (ed25519.PublicKey, error) {
 	return ed25519.PublicKey(b), nil
 }
 
-// ResolvePublicKeyByID searches for:
-// - keys/<keyID>.pub
-// - keys/dev/<keyID>.pub
-func ResolvePublicKeyByID(keyID string) (ed25519.PublicKey, string, error) {
-	keyID = strings.TrimSpace(keyID)
-	if keyID == "" {
-		return nil, "", fmt.Errorf("key_id is empty")
+func ResolveEd25519PublicKey(opts ResolvePublicKeyOptions) (ed25519.PublicKey, string, error) {
+	if path := strings.TrimSpace(opts.PublicKeyPath); path != "" {
+		pub, err := LoadEd25519PublicKeyFile(path)
+		if err != nil {
+			return nil, "", err
+		}
+		return pub, path, nil
 	}
 
-	candidates := []string{
-		filepath.Join("keys", keyID+".pub"),
-		filepath.Join("keys", "dev", keyID+".pub"),
+	keyID := strings.TrimSpace(opts.KeyID)
+	if keyID == "" {
+		return nil, "", fmt.Errorf("key_id is empty")
 	}
 
+	candidates := publicKeyCandidates(keyID, opts.SearchDirs)
 	for _, p := range candidates {
 		if _, err := os.Stat(p); err == nil {
 			pub, err := LoadEd25519PublicKeyFile(p)
@@ -59,7 +66,55 @@ func ResolvePublicKeyByID(keyID string) (ed25519.PublicKey, string, error) {
 		}
 	}
 
-	return nil, "", fmt.Errorf("could not resolve public key for key_id %q (looked in keys/ and keys/dev/)", keyID)
+	return nil, "", fmt.Errorf("could not resolve public key for key_id %q (looked in %s)", keyID, strings.Join(candidates, ", "))
+}
+
+func ResolvePublicKeyByID(keyID string) (ed25519.PublicKey, string, error) {
+	return ResolveEd25519PublicKey(ResolvePublicKeyOptions{KeyID: keyID})
+}
+
+func DefaultPublicKeySearchDirs() []string {
+	return []string{
+		filepath.Join("keys"),
+		filepath.Join("keys", "dev"),
+	}
+}
+
+func publicKeyCandidates(keyID string, searchDirs []string) []string {
+	dirs := normalizeSearchDirs(searchDirs)
+	out := make([]string, 0, len(dirs))
+	for _, dir := range dirs {
+		out = append(out, filepath.Join(dir, keyID+".pub"))
+	}
+	return out
+}
+
+func normalizeSearchDirs(searchDirs []string) []string {
+	if len(searchDirs) == 0 {
+		return DefaultPublicKeySearchDirs()
+	}
+
+	seen := map[string]struct{}{}
+	out := make([]string, 0, len(searchDirs))
+
+	for _, dir := range searchDirs {
+		dir = strings.TrimSpace(dir)
+		if dir == "" {
+			continue
+		}
+		dir = filepath.Clean(dir)
+		if _, ok := seen[dir]; ok {
+			continue
+		}
+		seen[dir] = struct{}{}
+		out = append(out, dir)
+	}
+
+	if len(out) == 0 {
+		return DefaultPublicKeySearchDirs()
+	}
+
+	return out
 }
 
 func readB64URLFile(path string) ([]byte, error) {