check for unencrypted key before adding to database

This commit is contained in:
juancwu 2026-01-11 18:36:35 -05:00
commit f5539b6a95
3 changed files with 85 additions and 8 deletions

12
cmd.go
View file

@ -13,7 +13,17 @@ func handleAddKey(dbPath, userPattern, hostPattern, keyPath string) error {
} }
defer db.Close() defer db.Close()
err = addKey(db, userPattern, hostPattern, keyPath) pemData, err := os.ReadFile(keyPath)
if err != nil {
return fmt.Errorf("failed to read key: %w", err)
}
finalPemData, err := checkAndEncryptKey(pemData)
if err != nil {
return fmt.Errorf("failed to check and encrypt key: %w", err)
}
err = addKey(db, finalPemData, userPattern, hostPattern, keyPath)
if err != nil { if err != nil {
return err return err
} }

9
db.go
View file

@ -57,17 +57,12 @@ func findKey(db *sql.DB, user, host string) ([]byte, error) {
return pemData, nil return pemData, nil
} }
func addKey(db *sql.DB, userPattern, hostPattern, keyPath string) error { func addKey(db *sql.DB, pemData []byte, userPattern, hostPattern, keyPath string) error {
pemData, err := os.ReadFile(keyPath)
if err != nil {
return fmt.Errorf("failed to read key file: %w", err)
}
query := ` query := `
INSERT INTO keys (host_pattern, user_pattern, encrypted_pem, comment) INSERT INTO keys (host_pattern, user_pattern, encrypted_pem, comment)
VALUES (?, ?, ? ,?); VALUES (?, ?, ? ,?);
` `
_, err = db.Exec(query, hostPattern, userPattern, pemData, "Imported from "+keyPath) _, err := db.Exec(query, hostPattern, userPattern, pemData, "Imported from "+keyPath)
if err != nil { if err != nil {
return fmt.Errorf("failed to add key: %w", err) return fmt.Errorf("failed to add key: %w", err)
} }

View file

@ -1,7 +1,15 @@
package main package main
import ( import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings" "strings"
"syscall"
"golang.org/x/crypto/ssh"
"golang.org/x/term"
) )
func parseDestination(args []string) (user, host string) { func parseDestination(args []string) (user, host string) {
@ -38,3 +46,67 @@ func parseDestination(args []string) (user, host string) {
} }
return "", "" return "", ""
} }
func checkAndEncryptKey(pemData []byte) ([]byte, error) {
_, err := ssh.ParseRawPrivateKey(pemData)
if err != nil {
// Key is encrypted, so there is no more further action needed
if _, ok := err.(*ssh.PassphraseMissingError); ok {
return pemData, nil
}
return nil, err
}
fmt.Println("Warning: This key is unencrypted.")
fmt.Print("Would you like to encrypt it before storing? (y/N): ")
var response string
fmt.Scanln(&response)
if strings.ToLower(response) != "y" {
return pemData, nil
}
fmt.Print("Enter new passphrase: ")
bytePass, err := term.ReadPassword(int(syscall.Stdin))
fmt.Println()
if err != nil {
return nil, fmt.Errorf("failed to read passphrase: %w", err)
}
passphrase := string(bytePass)
fmt.Print("Confirm passphrase: ")
bytePassConfirm, err := term.ReadPassword(int(syscall.Stdin))
if err != nil {
return nil, fmt.Errorf("fialed to read passphrase: %w", err)
}
fmt.Println()
if passphrase != string(bytePassConfirm) {
return nil, fmt.Errorf("passphrases do not match")
}
tempDir, err := os.MkdirTemp("", "gosh-encrypt")
if err != nil {
return nil, err
}
defer os.RemoveAll(tempDir)
tempKeyPath := filepath.Join(tempDir, "gosh_temp_key")
if err := os.WriteFile(tempKeyPath, pemData, 0600); err != nil {
return nil, err
}
cmd := exec.Command("ssh-keygen", "-p", "-f", tempKeyPath, "-P", "", "-N", passphrase, "-Z", "aes256-ctr")
if output, err := cmd.CombinedOutput(); err != nil {
return nil, fmt.Errorf("ssh-keygen failed: %s: %s", err, string(output))
}
encryptedData, err := os.ReadFile(tempKeyPath)
if err != nil {
return nil, err
}
fmt.Println("Key encrypted successfully (AES-256-CTR).")
return encryptedData, nil
}