mirror of
https://github.com/Gu1llaum-3/sshm.git
synced 2026-01-27 03:04:21 +01:00
fix: SSH identity file paths with spaces and edit form navigation
- Quote IdentityFile paths containing spaces to prevent SSH config errors - Fix edit form ESC/Ctrl+C to return to main view instead of quitting - Improve edit form navigation consistency with add form - Fix focus management when adding host fields with Ctrl+A
This commit is contained in:
@@ -1442,3 +1442,109 @@ func contains(slice []string, item string) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Helper function to create temporary config files for testing
|
||||
func createTempConfigFile(content string) (string, error) {
|
||||
tempFile, err := os.CreateTemp("", "ssh_config_test_*.conf")
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer tempFile.Close()
|
||||
|
||||
_, err = tempFile.WriteString(content)
|
||||
if err != nil {
|
||||
os.Remove(tempFile.Name())
|
||||
return "", err
|
||||
}
|
||||
|
||||
return tempFile.Name(), nil
|
||||
}
|
||||
|
||||
func TestFormatSSHConfigValue(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "simple path without spaces",
|
||||
input: "/home/user/.ssh/id_rsa",
|
||||
expected: "/home/user/.ssh/id_rsa",
|
||||
},
|
||||
{
|
||||
name: "path with spaces",
|
||||
input: "/home/user/My Documents/ssh key",
|
||||
expected: "\"/home/user/My Documents/ssh key\"",
|
||||
},
|
||||
{
|
||||
name: "Windows path with spaces",
|
||||
input: `G:\My Drive\7 - Tech\9 - SSH Keys\Server_WF.opk`,
|
||||
expected: `"G:\My Drive\7 - Tech\9 - SSH Keys\Server_WF.opk"`,
|
||||
},
|
||||
{
|
||||
name: "path with quotes but no spaces",
|
||||
input: `/home/user/key"with"quotes`,
|
||||
expected: `/home/user/key"with"quotes`,
|
||||
},
|
||||
{
|
||||
name: "path with spaces and quotes",
|
||||
input: `/home/user/key "with" quotes`,
|
||||
expected: `"/home/user/key "with" quotes"`,
|
||||
},
|
||||
{
|
||||
name: "empty path",
|
||||
input: "",
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
name: "path with single space at end",
|
||||
input: "/home/user/key ",
|
||||
expected: "\"/home/user/key \"",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := formatSSHConfigValue(tt.input)
|
||||
if result != tt.expected {
|
||||
t.Errorf("formatSSHConfigValue(%q) = %q, want %q", tt.input, result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddSSHHostWithSpacesInPath(t *testing.T) {
|
||||
// Create temporary config file
|
||||
configFile, err := createTempConfigFile(`Host existing
|
||||
HostName existing.com
|
||||
`)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create config file: %v", err)
|
||||
}
|
||||
defer os.Remove(configFile)
|
||||
|
||||
// Test adding host with path containing spaces
|
||||
host := SSHHost{
|
||||
Name: "test-spaces",
|
||||
Hostname: "test.com",
|
||||
User: "testuser",
|
||||
Identity: "/path/with spaces/key file",
|
||||
}
|
||||
|
||||
err = AddSSHHostToFile(host, configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("AddSSHHostToFile failed: %v", err)
|
||||
}
|
||||
|
||||
// Read the file and verify quotes are added
|
||||
content, err := os.ReadFile(configFile)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to read config file: %v", err)
|
||||
}
|
||||
|
||||
contentStr := string(content)
|
||||
expectedIdentityLine := ` IdentityFile "/path/with spaces/key file"`
|
||||
if !strings.Contains(contentStr, expectedIdentityLine) {
|
||||
t.Errorf("Expected identity file line with quotes not found.\nContent:\n%s\nExpected line: %s", contentStr, expectedIdentityLine)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user