Add support for quoted values in SSH config
- Support both double quotes and single quotes in config values - Handle quoted Include directives (e.g., Include "gitpod/config") - Properly resolve relative paths in includes to ~/.ssh/ directory - Maintain compatibility with unquoted values - Add parseConfigLine function for proper quote handling This fixes compatibility with Gitpod and other tools that generate SSH configs with quoted include paths. Co-authored-by: Ona <no-reply@ona.com>
This commit is contained in:
@@ -77,14 +77,11 @@ func (sc *SSHConfig) loadConfigFromFileRecursive(path string, visited map[string
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
parts := strings.Fields(line)
|
key, value, err := parseConfigLine(line)
|
||||||
if len(parts) < 2 {
|
if err != nil {
|
||||||
continue
|
continue // Skip malformed lines
|
||||||
}
|
}
|
||||||
|
|
||||||
key := strings.ToLower(parts[0])
|
|
||||||
value := strings.Join(parts[1:], " ")
|
|
||||||
|
|
||||||
switch key {
|
switch key {
|
||||||
case "include":
|
case "include":
|
||||||
// Handle include directive
|
// Handle include directive
|
||||||
@@ -142,6 +139,13 @@ func (sc *SSHConfig) processInclude(pattern string, visited map[string]bool) err
|
|||||||
return fmt.Errorf("failed to get home directory: %w", err)
|
return fmt.Errorf("failed to get home directory: %w", err)
|
||||||
}
|
}
|
||||||
pattern = filepath.Join(homeDir, pattern[2:])
|
pattern = filepath.Join(homeDir, pattern[2:])
|
||||||
|
} else if !filepath.IsAbs(pattern) {
|
||||||
|
// Relative paths are relative to ~/.ssh/
|
||||||
|
homeDir, err := os.UserHomeDir()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get home directory: %w", err)
|
||||||
|
}
|
||||||
|
pattern = filepath.Join(homeDir, ".ssh", pattern)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle glob patterns
|
// Handle glob patterns
|
||||||
@@ -180,3 +184,28 @@ func (sc *SSHConfig) GetHostByName(name string) (*SSHHost, error) {
|
|||||||
}
|
}
|
||||||
return nil, fmt.Errorf("host '%s' not found", name)
|
return nil, fmt.Errorf("host '%s' not found", name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parseConfigLine parses a SSH config line, handling quoted values
|
||||||
|
func parseConfigLine(line string) (key, value string, err error) {
|
||||||
|
// Find the first whitespace to separate key from value
|
||||||
|
parts := strings.SplitN(strings.TrimSpace(line), " ", 2)
|
||||||
|
if len(parts) < 2 {
|
||||||
|
return "", "", fmt.Errorf("invalid config line")
|
||||||
|
}
|
||||||
|
|
||||||
|
key = strings.ToLower(strings.TrimSpace(parts[0]))
|
||||||
|
valueStr := strings.TrimSpace(parts[1])
|
||||||
|
|
||||||
|
// Handle quoted values
|
||||||
|
if len(valueStr) >= 2 &&
|
||||||
|
((valueStr[0] == '"' && valueStr[len(valueStr)-1] == '"') ||
|
||||||
|
(valueStr[0] == '\'' && valueStr[len(valueStr)-1] == '\'')) {
|
||||||
|
// Remove quotes
|
||||||
|
value = valueStr[1 : len(valueStr)-1]
|
||||||
|
} else {
|
||||||
|
// Handle unquoted values (may contain multiple words)
|
||||||
|
value = valueStr
|
||||||
|
}
|
||||||
|
|
||||||
|
return key, value, nil
|
||||||
|
}
|
Reference in New Issue
Block a user