External/lazyssh
1
0
Fork 0
mirror of https://github.com/Adembc/lazyssh.git synced 2026-07-14 12:13:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

correct parse the identyfile and allow remove tags

Browse Source
This commit is contained in:
Adem Baccara
2025-09-10 21:59:46 +01:00
parent b71ef74aaa
commit bb5b7554e6
8 changed files with 69 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/adapters/data/memory/server_in_memory_repo.go
-132
View File
@@ -1,132 +0,0 @@
// Copyright 2025.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package memory
import (
"strconv"
"strings"
"time"
"go.uber.org/zap"
"github.com/Adembc/lazyssh/internal/core/domain"
)
type serverRepository struct {
logger *zap.SugaredLogger
}
var servers = []domain.Server{
{Alias: "web-01", Host: "192.168.1.10", User: "root", Port: 22, Key: "~/.ssh/id_rsa", Tags: []string{"prod", "web"}, LastSeen: time.Now().Add(-2 * time.Hour)},
{Alias: "web-02", Host: "192.168.1.11", User: "ubuntu", Port: 22, Key: "~/.ssh/id_ed25519", Tags: []string{"prod", "web"}, LastSeen: time.Now().Add(-30 * time.Minute)},
{Alias: "db-01", Host: "192.168.1.20", User: "postgres", Port: 22, Key: "~/.ssh/id_rsa", Tags: []string{"prod", "db"}, LastSeen: time.Now().Add(-26 * time.Hour)},
{Alias: "api-01", Host: "192.168.1.30", User: "deploy", Port: 22, Key: "~/.ssh/id_ed25519", Tags: []string{"prod", "api"}, LastSeen: time.Now().Add(-10 * time.Minute)},
{Alias: "cache-01", Host: "192.168.1.40", User: "redis", Port: 22, Key: "~/.ssh/id_rsa", Tags: []string{"prod", "cache"}, LastSeen: time.Now().Add(-1 * time.Hour)},
{Alias: "dev-web", Host: "10.0.1.10", User: "dev", Port: 22, Key: "~/.ssh/id_ed25519", Tags: []string{"dev", "web"}, LastSeen: time.Now().Add(-5 * time.Minute)},
{Alias: "dev-db", Host: "10.0.1.20", User: "dev", Port: 22, Key: "~/.ssh/id_ed25519", Tags: []string{"dev", "db"}, LastSeen: time.Now().Add(-15 * time.Minute)},
{Alias: "staging", Host: "staging.example.com", User: "ubuntu", Port: 22, Key: "~/.ssh/id_ed25519", Tags: []string{"test"}, LastSeen: time.Now().Add(-45 * time.Minute)},
}
// NewServerRepository creates a new server repository with the given file path.
func NewServerRepository(logger *zap.SugaredLogger) *serverRepository {
return &serverRepository{
logger: logger,
}
}
// ListServers returns a list of servers from the repository.
func (r *serverRepository) ListServers(query string) ([]domain.Server, error) {
if query == "" {
return servers, nil
}
q := strings.ToLower(strings.TrimSpace(query))
var filteredServers []domain.Server
for _, server := range servers {
alias := strings.ToLower(server.Alias)
host := strings.ToLower(server.Host)
user := strings.ToLower(server.User)
port := strconv.Itoa(server.Port)
match := false
if strings.Contains(alias, q) || strings.Contains(host, q) || strings.Contains(user, q) || strings.Contains(port, q) {
match = true
}
if !match {
for _, tag := range server.Tags {
if strings.Contains(strings.ToLower(tag), q) {
match = true
break
}
}
}
if match {
filteredServers = append(filteredServers, server)
}
}
return filteredServers, nil
}
// UpdateServer updates an existing server with new details.
func (r *serverRepository) UpdateServer(server domain.Server, newServer domain.Server) error {
for i, s := range servers {
if s.Alias == server.Alias {
servers[i] = newServer
return nil
}
}
return nil
}
// AddServer adds a new server to the repository.
func (r *serverRepository) AddServer(server domain.Server) error {
servers = append(servers, server)
return nil
}
// DeleteServer removes a server from the repository.
func (r *serverRepository) DeleteServer(server domain.Server) error {
for i, s := range servers {
if s.Alias == server.Alias {
servers = append(servers[:i], servers[i+1:]...)
return nil
}
}
return nil
}
func (r *serverRepository) SetPinned(alias string, pinned bool) error {
for i, s := range servers {
if s.Alias == alias {
if pinned {
servers[i].PinnedAt = time.Now()
} else {
servers[i].PinnedAt = time.Time{}
}
return nil
}
}
return nil
}
func (r *serverRepository) RecordSSH(alias string) error {
for i, s := range servers {
if s.Alias == alias {
servers[i].LastSeen = time.Now()
return nil
}
}
return nil
}
internal/adapters/data/ssh_config_file/metadata_manager.go
+1 -7
View File
@@ -50,7 +50,6 @@ func (m *metadataManager) loadAll() (map[string]ServerMetadata, error) {
data, err := os.ReadFile(m.filePath)
if err != nil {
m.logger.Errorw("failed to read metadata file", "path", m.filePath, "error", err)
return nil, fmt.Errorf("read metadata '%s': %w", m.filePath, err)
}
@@ -59,8 +58,6 @@ func (m *metadataManager) loadAll() (map[string]ServerMetadata, error) {
}
if err := json.Unmarshal(data, &metadata); err != nil {
m.logger.Errorw("failed to parse metadata JSON", "path", m.filePath, "error", err)
return nil, fmt.Errorf("parse metadata JSON '%s': %w", m.filePath, err)
}
@@ -105,9 +102,7 @@ func (m *metadataManager) updateServer(server domain.Server, oldAlias string) er
existing := metadata[server.Alias]
merged := existing
if server.Tags != nil {
merged.Tags = server.Tags
}
merged.Tags = server.Tags
if !server.LastSeen.IsZero() {
merged.LastSeen = server.LastSeen.Format(time.RFC3339)
@@ -172,7 +167,6 @@ func (m *metadataManager) recordSSH(alias string) error {
func (m *metadataManager) ensureDirectory() error {
dir := filepath.Dir(m.filePath)
if err := os.MkdirAll(dir, 0o750); err != nil {
m.logger.Errorw("failed to create metadata directory", "dir", dir, "error", err)
return fmt.Errorf("mkdir '%s': %w", dir, err)
}
return nil
internal/adapters/data/ssh_config_file/parser.go
+32 -9
View File
@@ -256,9 +256,10 @@ func (r *Repository) toDomainServer(cfg *ssh_config.Config) []domain.Server {
continue
}
server := domain.Server{
Alias: aliases[0],
Aliases: aliases,
Port: 22,
Alias: aliases[0],
Aliases: aliases,
Port: 22,
IdentityFiles: []string{},
}
for _, node := range host.Nodes {
@@ -289,7 +290,7 @@ func (r *Repository) mapKVToServer(server *domain.Server, kvNode *ssh_config.KV)
server.Port = port
}
case "identityfile":
server.Key = kvNode.Value
server.IdentityFiles = append(server.IdentityFiles, kvNode.Value)
}
}
@@ -394,7 +395,9 @@ func (r *Repository) createHostFromServer(server domain.Server) *ssh_config.Host
r.addKVNodeIfNotEmpty(host, "HostName", server.Host)
r.addKVNodeIfNotEmpty(host, "User", server.User)
r.addKVNodeIfNotEmpty(host, "Port", fmt.Sprintf("%d", server.Port))
r.addKVNodeIfNotEmpty(host, "IdentityFile", server.Key)
for _, identityFile := range server.IdentityFiles {
r.addKVNodeIfNotEmpty(host, "IdentityFile", identityFile)
}
return host
}
@@ -416,16 +419,36 @@ func (r *Repository) addKVNodeIfNotEmpty(host *ssh_config.Host, key, value strin
// updateHostNodes updates the nodes of an existing host with new server details.
func (r *Repository) updateHostNodes(host *ssh_config.Host, newServer domain.Server) {
updates := map[string]string{
"hostname": newServer.Host,
"user": newServer.User,
"port": fmt.Sprintf("%d", newServer.Port),
"identityfile": newServer.Key,
"hostname": newServer.Host,
"user": newServer.User,
"port": fmt.Sprintf("%d", newServer.Port),
}
for key, value := range updates {
if value != "" {
r.updateOrAddKVNode(host, key, value)
}
}
// Replace IdentityFile entries entirely to reflect the new state.
// This ensures removing/clearing identity files works as expected.
removeKey := func(nodes []ssh_config.Node, key string) []ssh_config.Node {
filtered := make([]ssh_config.Node, 0, len(nodes))
for _, node := range nodes {
if kv, ok := node.(*ssh_config.KV); ok {
if strings.EqualFold(kv.Key, key) {
continue // skip existing IdentityFile
}
}
filtered = append(filtered, node)
}
return filtered
}
host.Nodes = removeKey(host.Nodes, "IdentityFile")
for _, identityFile := range newServer.IdentityFiles {
r.addKVNodeIfNotEmpty(host, "IdentityFile", identityFile)
}
}
// updateOrAddKVNode updates an existing key-value node or adds a new one if it doesn't exist.
internal/adapters/ui/handlers.go
+5 -5
View File
@@ -332,13 +332,13 @@ func (t *tui) showEditTagsForm(server domain.Server) {
form.AddButton("Save", func() {
text := strings.TrimSpace(form.GetFormItem(0).(*tview.InputField).GetText())
var tags []string
if text != "" {
for _, part := range strings.Split(text, ",") {
if s := strings.TrimSpace(part); s != "" {
tags = append(tags, s)
}
for _, part := range strings.Split(text, ",") {
if s := strings.TrimSpace(part); s != "" {
tags = append(tags, s)
}
}
newServer := server
newServer.Tags = tags
_ = t.serverService.UpdateServer(server, newServer)
internal/adapters/ui/server_details.go
+2 -4
View File
@@ -61,10 +61,8 @@ func (sd *ServerDetails) UpdateServer(server domain.Server) {
if server.LastSeen.IsZero() {
lastSeen = "Never"
}
serverKey := server.Key
if serverKey == "" {
serverKey = "(default: ~/.ssh/id_{rsa,ed25519,ecdsa})"
}
serverKey := strings.Join(server.IdentityFiles, ", ")
pinnedStr := "true"
if server.PinnedAt.IsZero() {
pinnedStr = "false"
internal/adapters/ui/server_form.go
+17 -8
View File
@@ -82,7 +82,7 @@ func (sf *ServerForm) addFormFields() {
Host: sf.original.Host,
User: sf.original.User,
Port: fmt.Sprint(sf.original.Port),
Key: sf.original.Key,
Key: strings.Join(sf.original.IdentityFiles, ", "),
Tags: strings.Join(sf.original.Tags, ", "),
}
} else {
@@ -97,7 +97,7 @@ func (sf *ServerForm) addFormFields() {
sf.Form.AddInputField("Host/IP:", defaultValues.Host, 20, nil, nil)
sf.Form.AddInputField("User:", defaultValues.User, 20, nil, nil)
sf.Form.AddInputField("Port:", defaultValues.Port, 20, nil, nil)
sf.Form.AddInputField("Key:", defaultValues.Key, 40, nil, nil)
sf.Form.AddInputField("Key (Comma):", defaultValues.Key, 40, nil, nil)
sf.Form.AddInputField("Tags (comma):", defaultValues.Tags, 30, nil, nil)
}
@@ -163,13 +163,22 @@ func (sf *ServerForm) dataToServer(data ServerFormData) domain.Server {
}
}
keys := []string{}
if data.Key != "" {
parts := strings.Split(data.Key, ",")
for _, p := range parts {
if k := strings.TrimSpace(p); k != "" {
keys = append(keys, k)
}
}
}
return domain.Server{
Alias: data.Alias,
Host: data.Host,
User: data.User,
Port: port,
Key: data.Key,
Tags: tags,
Alias: data.Alias,
Host: data.Host,
User: data.User,
Port: port,
IdentityFiles: keys,
Tags: tags,
}
}
internal/adapters/ui/utils.go
+2 -2
View File
@@ -124,8 +124,8 @@ func BuildSSHCommand(s domain.Server) string {
if s.Port != 0 && s.Port != 22 {
parts = append(parts, "-p", fmt.Sprintf("%d", s.Port))
}
if s.Key != "" {
parts = append(parts, "-i", quoteIfNeeded(s.Key))
if len(s.IdentityFiles) > 0 {
parts = append(parts, "-i", quoteIfNeeded(s.IdentityFiles[0]))
}
return strings.Join(parts, " ")
}
internal/core/domain/server.go
+10 -10
View File
@@ -17,14 +17,14 @@ package domain
import "time"
type Server struct {
Alias string
Aliases []string
Host string
User string
Port int
Key string
Tags []string
LastSeen time.Time
PinnedAt time.Time
SSHCount int
Alias string
Aliases []string
Host string
User string
Port int
IdentityFiles []string
Tags []string
LastSeen time.Time
PinnedAt time.Time
SSHCount int
}