Merge branch 'dev' of github.com:jumpserver/koko into dev

pkg/httpd/sftpvolume.go

@@ -172,7 +172,7 @@ func (u *UserVolume) UploadChunk(cid int, dirPath, chunkName string, reader io.R
 
 func (u *UserVolume) MergeChunk(cid, total int, dirPath, filename string) (elfinder.FileDir, error) {
 	path := filepath.Join(dirPath, filename)
-	logger.Debug("merge chunk path: ",path)
+	logger.Debug("merge chunk path: ", path)
 	var rest elfinder.FileDir
 	fd, err := u.UserSftp.Create(path)
 	if err != nil {
@@ -249,6 +249,15 @@ func (u *UserVolume) Rename(oldNamePath, newName string) (elfinder.FileDir, erro
 }
 
 func (u *UserVolume) Remove(path string) error {
+	var res os.FileInfo
+	var err error
+	res, err = u.UserSftp.Stat(path)
+	if err != nil {
+		return err
+	}
+	if res.IsDir() {
+		return u.UserSftp.RemoveDirectory(path)
+	}
 	return u.UserSftp.Remove(path)
 }
 

pkg/httpd/websshws.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/jumpserver/koko/pkg/model"
 	"io"
 	"net"
 	"strings"
@@ -13,10 +12,10 @@ import (
 
 	"github.com/gliderlabs/ssh"
 	"github.com/kataras/neffos"
-
 	"github.com/satori/go.uuid"
 
 	"github.com/jumpserver/koko/pkg/logger"
+	"github.com/jumpserver/koko/pkg/model"
 	"github.com/jumpserver/koko/pkg/proxy"
 	"github.com/jumpserver/koko/pkg/service"
 )

pkg/srvconn/sftpconn.go

@@ -172,7 +172,7 @@ func (u *UserSftp) RemoveDirectory(path string) error {
 	if conn == nil {
 		return sftp.ErrSshFxPermissionDenied
 	}
-	err := conn.client.RemoveDirectory(realPath)
+	err := u.removeDirectoryAll(conn.client, realPath)
 	filename := realPath
 	isSucess := false
 	operate := model.OperateRemoveDir
@@ -183,6 +183,31 @@ func (u *UserSftp) RemoveDirectory(path string) error {
 	return err
 }
 
+func (u *UserSftp) removeDirectoryAll(conn *sftp.Client, path string) error {
+	var err error
+	var files []os.FileInfo
+	files, err = conn.ReadDir(path)
+	if err != nil {
+		return err
+	}
+	for _, item := range files {
+		realPath := filepath.Join(path, item.Name())
+
+		if item.IsDir() {
+			err = u.removeDirectoryAll(conn, realPath)
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		err = conn.Remove(realPath)
+		if err != nil {
+			return err
+		}
+	}
+	return conn.RemoveDirectory(path)
+}
+
 func (u *UserSftp) Remove(path string) error {
 	req := u.ParsePath(path)
 	if req.host == "" {
@@ -496,9 +521,17 @@ func (u *UserSftp) LoopPushFTPLog() {
 	dataChan := make(chan *model.FTPLog)
 	go u.SendFTPLog(dataChan)
 	defer close(dataChan)
+	var timeoutSecond time.Duration
 	for {
+		switch len(ftpLogList) {
+		case 0:
+			timeoutSecond = time.Second * 60
+		default:
+			timeoutSecond = time.Second * 1
+		}
+
 		select {
-		case <-time.After(time.Second * 5):
+		case <-time.After(timeoutSecond):
 		case logData, ok := <-u.LogChan:
 			if !ok {
 				return
@@ -613,7 +646,7 @@ func NewFakeFile(name string, isDir bool) *FakeFileInfo {
 	}
 }
 
-func NewFakeSymFile(name string) *FakeFileInfo{
+func NewFakeSymFile(name string) *FakeFileInfo {
 	return &FakeFileInfo{
 		name:    name,
 		modtime: time.Now().UTC(),