Skip to content

fix: read SSH key from file instead of storing path in backup export #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coderbuzz merged 1 commit into from
Jul 2, 2026
Merged

fix: read SSH key from file instead of storing path in backup export #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions internal/backup/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"encoding/base64"
"fmt"
"io"
"os"
"path/filepath"
"strings"

"github.com/coderbuzz/dockify/internal/app"
Expand Down Expand Up @@ -164,14 +166,19 @@ func (s *Service) Export(passphrase string) (string, error) {
Port: svr.Port,
User: svr.User,
}
if svr.SSHKey != "" {
if svr.SSHKey != "" && svr.SSHKey != "pending" {
raw, err := os.ReadFile(svr.SSHKey)
if err != nil {
return "", fmt.Errorf("read ssh_key file for %q: %w", svr.Name, err)
}
keyContent := string(raw)
if passphrase != "" {
es.SSHKey, err = encrypt(svr.SSHKey, passphrase)
es.SSHKey, err = encrypt(keyContent, passphrase)
if err != nil {
return "", fmt.Errorf("encrypt ssh_key for %q: %w", svr.Name, err)
}
} else {
es.SSHKey = svr.SSHKey
es.SSHKey = keyContent
}
}
data.Servers = append(data.Servers, es)
Expand Down Expand Up @@ -305,23 +312,20 @@ func (s *Service) Import(yamlData, passphrase, mode string) (string, error) {
serverIDs[es.Name] = existing.ID
continue
}
sshKey := es.SSHKey
sshKeyContent := es.SSHKey
if passphrase != "" && es.SSHKey != "" {
sshKey, err = decrypt(es.SSHKey, passphrase)
sshKeyContent, err = decrypt(es.SSHKey, passphrase)
if err != nil {
return strings.Join(logLines, "\n"), fmt.Errorf("server %q: wrong passphrase or corrupted data", es.Name)
}
}
if sshKey == "" {
sshKey = "pending"
}

svr := &server.Server{
Name: es.Name,
Host: es.Host,
Port: es.Port,
User: es.User,
SSHKey: sshKey,
SSHKey: "pending",
Status: "pending",
}
if svr.Port == 0 {
Expand All @@ -333,6 +337,18 @@ func (s *Service) Import(yamlData, passphrase, mode string) (string, error) {
if err := s.serverSvc.Create(svr); err != nil {
return strings.Join(logLines, "\n"), fmt.Errorf("create server %q: %w", es.Name, err)
}

if sshKeyContent != "" && sshKeyContent != "pending" {
path := filepath.Join(s.keyDir, fmt.Sprintf("%d.pem", svr.ID))
if err := os.WriteFile(path, []byte(sshKeyContent), 0600); err != nil {
return strings.Join(logLines, "\n"), fmt.Errorf("save ssh_key file for %q: %w", es.Name, err)
}
svr.SSHKey = path
if err := s.serverSvc.Update(svr); err != nil {
return strings.Join(logLines, "\n"), fmt.Errorf("update ssh_key path for %q: %w", es.Name, err)
}
}

serverIDs[es.Name] = svr.ID
logLines = append(logLines, fmt.Sprintf("Created server %q (%s)", es.Name, es.Host))
}
Expand Down
Loading