allow ssh config extension

Author: noboruma

README.md

@@ -24,12 +24,12 @@ Or download the binaries directly (choose your os/arch):
 
 ```
 # download the binaries from the release
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Darwin_arm64.tar.gz
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Darwin_x86_64.tar.gz
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Linux_arm64.tar.gz
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Linux_x86_64.tar.gz
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Windows_arm64.zip
-wget https://github.com/noboruma/s1h/releases/download/v0.3.3/s1h_Windows_x86_64.zip
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Darwin_arm64.tar.gz
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Darwin_x86_64.tar.gz
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Linux_arm64.tar.gz
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Linux_x86_64.tar.gz
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Windows_arm64.zip
+wget https://github.com/noboruma/s1h/releases/download/v0.4.0/s1h_Windows_x86_64.zip
 
 tar xvf chosen.tar.gz
 ```
@@ -122,6 +122,11 @@ Enter password for <host>: <terminal input>
 This updates the stored credentials for the specified ssh host.
 `s1h` comes with other password operations: `reveal` and `delete`.
 
+It is also possible to extend SSH config and add completely new entries or override existing hosts by passing a hostname, such as:
+```sh
+s1h upsert -host=<host> [-password=<password>] -hostname=toto.io [-user=root] [-port=22]
+```
+
 #### Example:
 
 ```

cmd/s1h/main.go

@@ -39,10 +39,13 @@ func main() {
 		key, credsFile := loadOrStoreLocalEncryptedFile()
 		switch os.Args[1] {
 		case "upsert":
-			var host, password string
+			var host, password, hostname, user, port string
 			updateCmd := flag.NewFlagSet("upsert", flag.ExitOnError)
 			updateCmd.StringVar(&host, "host", "", "The host to update")
 			updateCmd.StringVar(&password, "password", "", "The password to set for the host (optional)")
+			updateCmd.StringVar(&hostname, "hostname", "", "The hostname/endpoint to set for the host (optional)")
+			updateCmd.StringVar(&user, "user", "root", "The user to use for the host (optional)")
+			updateCmd.StringVar(&port, "port", "22", "The port to use for the host (optional)")
 			err := updateCmd.Parse(os.Args[2:])
 			if err != nil {
 				fmt.Println("Error upading credentials:", err.Error())
@@ -62,7 +65,7 @@ func main() {
 				password = string(bytePassword)
 			}
 
-			err = credentials.UpsertCredential(credsFile, host, password, key)
+			err = credentials.UpsertCredential(credsFile, host, hostname, user, port, password, key)
 			if err != nil {
 				fmt.Println("Error updating credentials:", err)
 				os.Exit(1)
@@ -103,7 +106,7 @@ func main() {
 				fmt.Println("Please provide the hostname to reveal.")
 				os.Exit(1)
 			}
-			pass, err := credentials.RevealCredential(credsFile, host, key)
+			pass, err := credentials.RevealCredentialPassword(credsFile, host, key)
 			if err != nil {
 				fmt.Println("Error retrieving credential:", err.Error())
 				os.Exit(1)
@@ -179,7 +182,7 @@ func loadConfigs() []ssh.SSHConfig {
 		if err != nil {
 			log.Fatalf("Error loading creds: %v\n", err)
 		}
-		config.PopulateCredentialsToConfig(creds, configs)
+		configs = config.PopulateCredentialsToConfig(creds, configs)
 	}
 	return configs
 }

internal/config/ssh.go

@@ -5,9 +5,35 @@ import (
 	"github.com/noboruma/s1h/internal/ssh"
 )
 
-func PopulateCredentialsToConfig(creds credentials.Credentials, configs []ssh.SSHConfig) {
+func PopulateCredentialsToConfig(creds credentials.Credentials, configs []ssh.SSHConfig) []ssh.SSHConfig {
+	processed := map[string]struct{}{}
 	for i, cfg := range configs {
-		cfg.Password = creds.Entries[cfg.Host]
+		cred := creds.Entries[cfg.Host]
+		cfg.Password = cred.Password
+		if cred.Hostname != "" { // Replace outdated data
+			cfg.HostName = cred.Hostname
+			cfg.User = cred.User
+			cfg.Port = cred.Port
+		}
 		configs[i] = cfg
+		processed[cfg.Host] = struct{}{}
 	}
+	// Add non existing entries
+	for k, added := range creds.Entries {
+		if added.Hostname == "" {
+			continue
+		}
+		if _, has := processed[k]; has {
+			continue
+		}
+		configs = append(configs, ssh.SSHConfig{
+			Host:         k,
+			User:         added.User,
+			Port:         added.Port,
+			HostName:     added.Hostname,
+			IdentityFile: "",
+			Password:     added.Password,
+		})
+	}
+	return configs
 }

internal/credentials/encrypt.go

@@ -11,8 +11,15 @@ import (
 	"os"
 )
 
+type Entry struct {
+	Password string `json:"password"`
+	Hostname string `json:"hostname"`
+	User     string `json:"user"`
+	Port     string `json:"port"`
+}
+
 type Credentials struct {
-	Entries map[string]string `json:"credentials"`
+	Entries map[string]Entry `json:"credentials"`
 }
 
 func GenerateMasterKey() ([]byte, error) {
@@ -128,17 +135,25 @@ func saveCredentials(filename string, creds Credentials, key []byte) error {
 	return nil
 }
 
-func UpsertCredential(filename string, host string, password string, key []byte) error {
+func UpsertCredential(filename string, host, hostname, user, port string, password string, key []byte) error {
 	creds, err := LoadCredentials(filename, key)
 	if err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
 	if creds.Entries == nil {
-		creds.Entries = make(map[string]string)
+		creds.Entries = make(map[string]Entry)
 	}
 
-	creds.Entries[host] = password
+	entry := Entry{
+		Password: password,
+	}
+	if hostname != "" {
+		entry.Hostname = hostname
+		entry.User = user
+		entry.Port = port
+	}
+	creds.Entries[host] = entry
 
 	return saveCredentials(filename, creds, key)
 }
@@ -154,7 +169,7 @@ func RemoveCredential(filename string, host string, key []byte) error {
 	return saveCredentials(filename, creds, key)
 }
 
-func RevealCredential(filename string, host string, key []byte) (string, error) {
+func RevealCredentialPassword(filename string, host string, key []byte) (string, error) {
 	creds, err := LoadCredentials(filename, key)
 	if err != nil {
 		return "", err
@@ -165,5 +180,5 @@ func RevealCredential(filename string, host string, key []byte) (string, error)
 		return "", fmt.Errorf("no entry for %s", host)
 	}
 
-	return cred, nil
+	return cred.Password, nil
 }