ssh_config: allow IdentityFile file with tilde

The ssh_config can contain a path with ~/ to refer to the home dir like done on shells. Handle that special case and resolve the path correctly so it can be used. Signed-off-by: Paul Holzinger <[email protected]>
containers · Nov 14, 2024 · cbb2820 · cbb2820
1 parent a7120b5
commit cbb2820
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
@@ -11,6 +11,7 @@ import (
 	"net/url"
 	"os"
 	"os/user"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -205,10 +206,15 @@ func sshClient(_url *url.URL, uri string, identity string, machine bool) (Connec
 
 	if identity == "" {
 		if val := cfg.Get(alias, "IdentityFile"); val != "" {
-			if val != ssh_config.Default("IdentityFile") {
-				identity = strings.Trim(val, "\"")
-				found = true
+			identity = strings.Trim(val, "\"")
+			if strings.HasPrefix(identity, "~/") {
+				homedir, err := os.UserHomeDir()
+				if err != nil {
+					return connection, fmt.Errorf("failed to find home dir: %w", err)
+				}
+				identity = filepath.Join(homedir, identity[2:])
 			}
+			found = true
 		}
 	}