Merge pull request #44 from blacknon/develop

Version 0.1.17

Author: blacknon

connect.go

@@ -6,6 +6,7 @@ package sshlib
 
 import (
 	"context"
+	"errors"
 	"io"
 	"log"
 	"net"
@@ -190,29 +191,29 @@ func (c *Connect) SendKeepAlive(session *ssh.Session) {
 		interval = c.SendKeepAliveInterval
 	}
 
-	for {
-		// timeout channel
-		tc := make(chan bool, 1)
-
-		go func() {
-			// Send keep alive packet
-			_, err := session.SendRequest("keepalive", true, nil)
-			if err == nil {
-				tc <- true
-			}
-		}()
+	t := time.NewTicker(time.Duration(c.ConnectTimeout) * time.Second)
+	defer t.Stop()
 
+	for {
 		select {
-		case <-tc:
-		case <-time.After(time.Duration(c.ConnectTimeout) * time.Second):
-			session.Close()
-			c.Client.Close()
-			log.Println("keepalive timeout")
-			return
+		case <-t.C:
+			if _, err := session.SendRequest("[email protected]", true, nil); err != nil {
+				if !errors.Is(err, io.EOF) {
+					log.Println("Failed to send keepalive packet:", err)
+					session.Close()
+					c.Client.Close()
+					break
+				} else {
+					// sleep
+					time.Sleep(time.Duration(interval) * time.Second)
+					continue
+				}
+			} else {
+				// sleep
+				time.Sleep(time.Duration(interval) * time.Second)
+				continue
+			}
 		}
-
-		// sleep
-		time.Sleep(time.Duration(interval) * time.Second)
 	}
 }
 

go.mod

@@ -38,4 +38,6 @@ require (
 	github.com/willscott/go-nfs-client v0.0.0-20240104095149-b44639837b00 // indirect
 )
 
+// replace github.com/blacknon/go-nfs-sshlib v0.0.3 => ../go-nfs-sshlib
+
 go 1.22.4

nfs_forward.go

@@ -5,7 +5,9 @@
 package sshlib
 
 import (
+	"fmt"
 	"net"
+	"strings"
 
 	nfs "github.com/blacknon/go-nfs-sshlib"
 	nfshelper "github.com/blacknon/go-nfs-sshlib/helpers"
@@ -26,6 +28,14 @@ func (c *Connect) NFSForward(address, port, basepoint string) (err error) {
 		return
 	}
 
+	// create abs path
+	homepoint, err := client.RealPath(".")
+	if err != nil {
+		return
+	}
+	basepoint = getRemoteAbsPath(homepoint, basepoint)
+	fmt.Println(basepoint)
+
 	sftpfsPlusChange := NewChangeSFTPFS(client, basepoint)
 
 	handler := nfshelper.NewNullAuthHandler(sftpfsPlusChange)
@@ -58,3 +68,12 @@ func (c *Connect) NFSReverseForward(address, port, sharepoint string) (err error
 
 	return
 }
+
+func getRemoteAbsPath(wdpath, path string) (result string) {
+	result = strings.Replace(path, "~", wdpath, 1)
+	if !strings.HasPrefix(result, "/") {
+		result = wdpath + "/" + result
+	}
+
+	return result
+}

nfs_sftpfs.go

@@ -5,6 +5,7 @@
 package sshlib
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -47,30 +48,25 @@ type SFTPFS struct {
 
 // Create
 func (fs *SFTPFS) Create(filename string) (billy.File, error) {
-	_, err := fs.Stat(filename)
-	if err == nil {
-		return nil, os.ErrExist
-	}
-
-	dir := filepath.Dir(filename)
-	err = fs.MkdirAll(dir, os.ModeDir)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := fs.Client.Create(filename)
-	if err != nil {
-		return nil, err
-	}
-	return &sftpFile{File: f}, nil
+	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
 }
 
 // OpenFile
 func (fs *SFTPFS) OpenFile(filename string, flag int, perm os.FileMode) (billy.File, error) {
-	// TODO: create dirをする
-	// https://github.com/src-d/go-billy/blob/master/osfs/os.go#L31-L54
+	return fs.openFile(filename, flag, perm, fs.createDir)
+}
+
+func (fs *SFTPFS) openFile(fn string, flag int, perm os.FileMode, createDir func(string) error) (billy.File, error) {
+	if flag&os.O_CREATE != 0 {
+		if createDir == nil {
+			return nil, fmt.Errorf("createDir func cannot be nil if file needs to be opened in create mode")
+		}
+		if err := createDir(fn); err != nil {
+			return nil, err
+		}
+	}
 
-	f, err := fs.Client.OpenFile(filename, flag)
+	f, err := fs.Client.OpenFile(fn, flag)
 	if err != nil {
 		return nil, err
 	}

proxy.go

@@ -191,6 +191,12 @@ func (n *NetPipe) Dial(network, addr string) (con net.Conn, err error) {
 	// Start the command
 	err = n.Cmd.Start()
 
+	// Close the write end of the pipe
+	go func() {
+		n.Cmd.Wait()
+		srv.Close()
+	}()
+
 	return
 }