resolve tilde path correctly for identityfile and fix pubfile (#58)

Author: alajmo

Makefile

@@ -2,7 +2,7 @@ NAME    := sake
 PACKAGE := github.com/alajmo/$(NAME)
 DATE    := $(shell date +%FT%T%Z)
 GIT     := $(shell [ -d .git ] && git rev-parse --short HEAD)
-VERSION := v0.15.0
+VERSION := v0.15.1
 
 default: build
 

cmd/ssh.go

@@ -52,6 +52,6 @@ func ssh(args []string, config *dao.Config, runFlags *core.RunFlags) {
 	}
 	core.CheckIfError(err)
 
-	err = run.SSHToServer(*server, config.DisableVerifyHost, config.KnownHostsFile)
+	err = run.SSHToServer(servers[0], config.DisableVerifyHost, config.KnownHostsFile)
 	core.CheckIfError(err)
 }

core/run/client.go

@@ -31,5 +31,5 @@ type ErrConnect struct {
 }
 
 func (e *ErrConnect) Error() string {
-	return ""
+	return e.Reason
 }

core/run/exec.go

@@ -612,7 +612,48 @@ func ParseServers(
 
 		// IdentityFile
 		if len(serv.IdentityFiles) > 0 {
-			(*servers)[i].IdentityFile = &serv.IdentityFiles[0]
+			iFile, err := core.ExpandPath(serv.IdentityFiles[0])
+			if err != nil {
+				errConnect := &ErrConnect{
+					Name:   (*servers)[i].Name,
+					User:   (*servers)[i].User,
+					Host:   (*servers)[i].Host,
+					Port:   (*servers)[i].Port,
+					Reason: err.Error(),
+				}
+				errConnects = append(errConnects, *errConnect)
+				continue
+			}
+
+			(*servers)[i].IdentityFile = &iFile
+
+			// TODO: Update PubFile as well
+			if _, err := os.Stat(*(*servers)[i].IdentityFile); errors.Is(err, os.ErrNotExist) {
+				errConnect := &ErrConnect{
+					Name:   (*servers)[i].Name,
+					User:   (*servers)[i].User,
+					Host:   (*servers)[i].Host,
+					Port:   (*servers)[i].Port,
+					Reason: err.Error(),
+				}
+				errConnects = append(errConnects, *errConnect)
+				continue
+			}
+
+			pubFile := *(*servers)[i].IdentityFile + ".pub"
+			if _, err := os.Stat(pubFile); errors.Is(err, os.ErrNotExist) {
+				errConnect := &ErrConnect{
+					Name:   (*servers)[i].Name,
+					User:   (*servers)[i].User,
+					Host:   (*servers)[i].Host,
+					Port:   (*servers)[i].Port,
+					Reason: err.Error(),
+				}
+				errConnects = append(errConnects, *errConnect)
+				continue
+			} else {
+				*(*servers)[i].PubFile = pubFile
+			}
 		}
 
 		// HostName

core/sake.1

@@ -1,4 +1,4 @@
-.TH "SAKE" "1" "2023-06-10T21:39:07CEST" "v0.14.0" "Sake Manual" "sake"
+.TH "SAKE" "1" "2023-09-25T11:47:19CEST" "v0.15.1" "Sake Manual" "sake"
 .SH NAME
 sake - sake is a task runner for local and remote hosts
 

core/ssh_config.go

@@ -14,7 +14,7 @@ import (
 	"github.com/kevinburke/ssh_config"
 )
 
-// PraseFile reads and parses the file in the given path.
+// Parse reads and parses the file in the given path.
 func ParseSSHConfig(path string) (map[string](Endpoint), error) {
 	f, err := os.Open(path)
 	if err != nil {
@@ -243,7 +243,7 @@ func parseInternal(r io.Reader, cfg string) (*hostinfoMap, error) {
 						continue
 					}
 
-					path, err := expandPath(value)
+					path, err := ExpandPath(value)
 					if err != nil {
 						return nil, err
 					}
@@ -340,7 +340,7 @@ func parseFileInternal(path string) (*hostinfoMap, error) {
 	return parseInternal(f, path)
 }
 
-func expandPath(p string) (string, error) {
+func ExpandPath(p string) (string, error) {
 	if !strings.HasPrefix(p, "~/") {
 		return p, nil
 	}

docs/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.15.1
+
+### Fixes
+
+- Fix resolving identity file in ssh config correctly when ~ is used.
+- Fix public file not found when using ssh config
+
 ## 0.15.0
 
 ### Features