feat(config): add automatic backup before modifying config file (#7)

This commit is contained in:
Adem Baccara
2025-08-31 10:01:37 +01:00
committed by GitHub
parent 6a963974df
commit b41eeecbf7
7 changed files with 105 additions and 50 deletions
@@ -16,6 +16,7 @@ package file
import (
"fmt"
"io"
"os"
"path/filepath"
@@ -56,16 +57,41 @@ func (m *sshConfigManager) writeServers(servers []domain.Server) error {
return err
}
file, err := os.Create(m.filePath)
if err := m.backupCurrentConfig(); err != nil {
return err
}
dir := filepath.Dir(m.filePath)
tmp, err := os.CreateTemp(dir, ".lazyssh-tmp-*")
if err != nil {
return err
}
defer func() {
_ = file.Close()
}()
defer func() { _ = os.Remove(tmp.Name()) }()
if err := os.Chmod(tmp.Name(), 0o600); err != nil {
_ = tmp.Close()
return err
}
writer := &SSHConfigWriter{}
return writer.Write(file, servers)
if err := writer.Write(tmp, servers); err != nil {
_ = tmp.Close()
return err
}
if err := tmp.Sync(); err != nil {
_ = tmp.Close()
return err
}
if err := tmp.Close(); err != nil { // close after sync to ensure contents are persisted
return err
}
if err := os.Rename(tmp.Name(), m.filePath); err != nil {
return err
}
return nil
}
func (m *sshConfigManager) addServer(server domain.Server) error {
@@ -135,3 +161,49 @@ func (m *sshConfigManager) ensureDirectory() error {
dir := filepath.Dir(m.filePath)
return os.MkdirAll(dir, 0o700)
}
// backupCurrentConfig creates ~/.lazyssh/backups/config.backup with 0600 perms,
// overwriting it each time, but only if the source config exists.
func (m *sshConfigManager) backupCurrentConfig() error {
// If source config does not exist, skip backup
if _, err := os.Stat(m.filePath); err != nil {
if os.IsNotExist(err) {
return nil
}
return err
}
home, err := os.UserHomeDir()
if err != nil {
return err
}
backupDir := filepath.Join(home, ".lazyssh", "backups")
// Ensure directory with 0700
if err := os.MkdirAll(backupDir, 0o700); err != nil {
return err
}
backupPath := filepath.Join(backupDir, "config.backup")
// Copy file contents
src, err := os.Open(m.filePath)
if err != nil {
return err
}
defer func() { _ = src.Close() }()
// #nosec G304 -- backupPath is generated internally and trusted
dst, err := os.OpenFile(backupPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o600)
if err != nil {
return err
}
defer func() { _ = dst.Close() }()
if _, err := io.Copy(dst, src); err != nil {
return err
}
if err := dst.Sync(); err != nil {
return err
}
return nil
}
+1 -29
View File
@@ -25,17 +25,15 @@ import (
type AppHeader struct {
*tview.Flex
version string
buildTime string
gitCommit string
repoURL string
}
func NewAppHeader(version, gitCommit, buildTime, repoURL string) *AppHeader {
func NewAppHeader(version, gitCommit, repoURL string) *AppHeader {
header := &AppHeader{
Flex: tview.NewFlex(),
version: version,
repoURL: repoURL,
buildTime: buildTime,
gitCommit: gitCommit,
}
header.build()
@@ -85,13 +83,11 @@ func (h *AppHeader) buildCenterSection(bg tcell.Color) *tview.TextView {
if commit != "" {
commitTag = makeTag(commit, "#A78BFA") // violet
}
timeTag := makeTag(formatBuildTime(h.buildTime), "#3B82F6") // blue
text := versionTag
if commitTag != "" {
text += " " + commitTag
}
text += " " + timeTag
center.SetText(text)
return center
@@ -126,30 +122,6 @@ func shortCommit(c string) string {
return c
}
// formatBuildTime tries to parse common time formats and returns a concise human-readable string.
func formatBuildTime(s string) string {
s = strings.TrimSpace(s)
if s == "" {
return "unknown"
}
layouts := []string{
"2006-01-02 15:04:05",
time.RFC3339,
time.RFC1123,
time.RFC1123Z,
}
var t time.Time
var err error
for _, l := range layouts {
t, err = time.Parse(l, s)
if err == nil {
return t.Format("Mon, 02 Jan 2006 15:04")
}
}
return s
}
// makeTag returns a rectangular-looking colored chip for the given text.
func makeTag(text, bg string) string {
text = strings.TrimSpace(text)
+5 -7
View File
@@ -27,9 +27,8 @@ import (
type tui struct {
logger *zap.SugaredLogger
version string
commit string
buildDate string
version string
commit string
app *tview.Application
serverService ports.ServerService
@@ -49,14 +48,13 @@ type tui struct {
searchVisible bool
}
func NewTUI(logger *zap.SugaredLogger, ss ports.ServerService, version, commit, buildDate string) *tui {
func NewTUI(logger *zap.SugaredLogger, ss ports.ServerService, version, commit string) *tui {
return &tui{
logger: logger,
app: tview.NewApplication(),
serverService: ss,
version: version,
commit: commit,
buildDate: buildDate,
}
}
@@ -68,7 +66,7 @@ func (t *tui) Run() error {
}()
t.app.EnableMouse(true)
t.initializeTheme().buildComponents().buildLayout().bindEvents().loadInitialData().loadSplashScreen()
t.logger.Infow("starting TUI application", "version", t.version, "commit", t.commit, "buildDate", t.buildDate)
t.logger.Infow("starting TUI application", "version", t.version, "commit", t.commit)
if err := t.app.Run(); err != nil {
t.logger.Errorw("application run error", "error", err)
return err
@@ -89,7 +87,7 @@ func (t *tui) initializeTheme() *tui {
}
func (t *tui) buildComponents() *tui {
t.header = NewAppHeader(t.version, t.commit, t.buildDate, RepoURL)
t.header = NewAppHeader(t.version, t.commit, RepoURL)
t.searchBar = NewSearchBar().
OnSearch(t.handleSearchInput).
OnEscape(t.hideSearchBar)