perf: 校验资产平台的 sftp 是否开启 (#1064)

* perf: 校验资产平台的 sftp 是否开启

* fix: golangci-lint error

---------

Co-authored-by: Eric <[email protected]>

.gitignore

@@ -47,3 +47,7 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+demo
+assets/
+ui/dist/favicon.ico
+ui/dist/index.html

pkg/common/client.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	neturl "net/url"
@@ -281,7 +280,7 @@ func (c *Client) UploadFile(reqUrl string, gFile string, res interface{}, params
 		return err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if resp.StatusCode >= 400 {
 		msg := fmt.Sprintf("%s %s failed, get code: %d, %s", req.Method, req.URL, resp.StatusCode, string(body))
 		err = errors.New(msg)

pkg/common/sshutil.go

@@ -5,7 +5,7 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/pem"
-	"io/ioutil"
+	"os"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -42,15 +42,15 @@ func EncodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
 }
 
 func WriteKeyToFile(keyBytes []byte, saveFileTo string) error {
-	err := ioutil.WriteFile(saveFileTo, keyBytes, 0600)
+	err := os.WriteFile(saveFileTo, keyBytes, 0600)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func GetPubKeyFromFile(keypath string) (ssh.Signer, error) {
-	buf, err := ioutil.ReadFile(keypath)
+	buf, err := os.ReadFile(keypath)
 	if err != nil {
 		return nil, err
 	}

pkg/handler/dispatch.go

@@ -139,6 +139,6 @@ func (h *InteractiveHandler) displayNodeTree(nodes model.NodeList) {
 	_, _ = io.WriteString(h.term, tree.String())
 	_, err := io.WriteString(h.term, lang.T("Tips: Enter g+NodeID to display the host under the node, such as g1")+"\n\r")
 	if err != nil {
-		logger.Errorf("displayAssetNodes err:", err)
+		logger.Errorf("displayAssetNodes err: %s", err)
 	}
 }

pkg/httpd/userwebsocket.go

@@ -219,9 +219,8 @@ func (userCon *UserWebsocket) CurrentUser() *model.User {
 }
 
 func (userCon *UserWebsocket) SendErrMessage(errMsg string) {
-	data, _ := json.Marshal(
-		&Message{Id: userCon.Uuid, Type: ERROR, Err: errMsg},
-	)
+	msg := Message{Id: userCon.Uuid, Type: ERROR, Err: errMsg}
+	data, _ := json.Marshal(msg)
 	if err := userCon.conn.WriteText(data, maxWriteTimeOut); err != nil {
 		logger.Errorf("Ws[%s] send error message err: %s", userCon.Uuid, err)
 	}
@@ -231,4 +230,5 @@ var (
 	ErrAssetIdInvalid   = errors.New("asset id invalid")
 	ErrDisableShare     = errors.New("disable share")
 	ErrPermissionDenied = errors.New("permission denied")
+	ErrSftpDisabled     = errors.New("sftp disabled")
 )

pkg/httpd/webfolder.go

@@ -46,6 +46,11 @@ func (h *webFolder) CheckValidation() error {
 	}
 	if h.ws.ConnectToken != nil {
 		connectToken := h.ws.ConnectToken
+		protocol := connectToken.Platform.GetProtocol(connectToken.Protocol)
+		if !protocol.Setting.SftpEnabled {
+			logger.Errorf("Web sftp asset %s sftp disabled", connectToken.Asset.String())
+			return ErrSftpDisabled
+		}
 		volOpts = append(volOpts, WithConnectToken(connectToken))
 	}
 	h.volume = NewUserVolume(apiClient, volOpts...)