Merge melbahja#9 from melbahja/fix/windows-homedir

Fix Windows Homedir

go.mod

@@ -5,6 +5,6 @@ go 1.13
 require (
  github.com/pkg/errors v0.9.1
  github.com/pkg/sftp v1.12.0
- golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
- golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65 // indirect
+ golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
+ golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637 // indirect
 )

go.sum

@@ -15,12 +15,19 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
+golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65 h1:Qo9oJ566/Sq7N4hrGftVXs8GI2CXBCuOd4S2wHE/e0M=
 golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637 h1:O5hKNaGxIT4A8OTMnuh6UpmBdI3SAPxlZ3g0olDrJVM=
+golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

hosts.go

@@ -5,19 +5,23 @@ package goph
 
 import (
  "errors"
+ "fmt"
  "net"
  "os"
 
  "golang.org/x/crypto/ssh"
  "golang.org/x/crypto/ssh/knownhosts"
 )
 
-// Default known hosts path.
-var defaultPath = os.ExpandEnv("$HOME/.ssh/known_hosts")
-
 // DefaultKnownHosts returns host key callback from default known hosts path, and error if any.
 func DefaultKnownHosts() (ssh.HostKeyCallback, error) {
- return KnownHosts(defaultPath)
+
+ path, err := DefaultKnownHostsPath()
+ if err != nil {
+ return nil, err
+ }
+
+ return KnownHosts(path)
 }
 
 // KnownHosts returns host key callback from a custom known hosts path.
@@ -34,7 +38,12 @@ func CheckKnownHost(host string, remote net.Addr, key ssh.PublicKey, knownFile s
 
  // Fallback to default known_hosts file
  if knownFile == "" {
- knownFile = defaultPath
+ path, err := DefaultKnownHostsPath()
+ if err != nil {
+ return false, err
+ }
+
+ knownFile = path
  }
 
  // Get host key callback
@@ -72,11 +81,15 @@ func AddKnownHost(host string, remote net.Addr, key ssh.PublicKey, knownFile str
 
  // Fallback to default known_hosts file
  if knownFile == "" {
- knownFile = defaultPath
+ path, err := DefaultKnownHostsPath()
+ if err != nil {
+ return err
+ }
+
+ knownFile = path
  }
 
  f, err := os.OpenFile(knownFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
-
  if err != nil {
  return err
  }
@@ -89,3 +102,14 @@ func AddKnownHost(host string, remote net.Addr, key ssh.PublicKey, knownFile str
 
  return err
 }
+
+// DefaultKnownHostsPath returns default user knows hosts file.
+func DefaultKnownHostsPath() (string, error) {
+
+ home, err := os.UserHomeDir()
+ if err != nil {
+ return "", err
+ }
+
+ return fmt.Sprintf("%s/.ssh/known_hosts", home), err
+}