修复 「1.2.2 用户管理-用户列表勾选单一用户会全选 」 close #216

server/utils/guacamole.go

@@ -0,0 +1,17 @@
+package utils
+
+import (
+	"encoding/base64"
+	"github.com/gorilla/websocket"
+	"next-terminal/server/guacd"
+	"strconv"
+)
+
+func Disconnect(ws *websocket.Conn, code int, reason string) {
+	// guacd 无法处理中文字符，所以进行了base64编码。
+	encodeReason := base64.StdEncoding.EncodeToString([]byte(reason))
+	err := guacd.NewInstruction("error", encodeReason, strconv.Itoa(code))
+	_ = ws.WriteMessage(websocket.TextMessage, []byte(err.String()))
+	disconnect := guacd.NewInstruction("disconnect")
+	_ = ws.WriteMessage(websocket.TextMessage, []byte(disconnect.String()))
+}

server/utils/jsontime.go

@@ -23,7 +23,7 @@ func NowJsonTime() JsonTime {
 	}
 }
 
-func (j *JsonTime) MarshalJSON() ([]byte, error) {
+func (j JsonTime) MarshalJSON() ([]byte, error) {
 	var stamp = fmt.Sprintf("\"%s\"", j.Format("2006-01-02 15:04:05"))
 	return []byte(stamp), nil
 }

server/utils/util_test.go

@@ -86,3 +86,11 @@ func TestGetAvailablePort(t *testing.T) {
 	}
 	println(port)
 }
+
+func TestAesEncryptCBC2(t *testing.T) {
+	origData := []byte("{\"id\":\"xxxx\",\"opcode\":0,\"code\":0,\"message\":\"\",\"data\":\"\"}") // 待加密的数据
+	key, _ := base64.StdEncoding.DecodeString("aLSlrPelViToZvNF1T45PQ==")
+	encryptedCBC, err := utils.AesEncryptCBC(origData, key)
+	assert.NoError(t, err)
+	assert.Equal(t, "3Tbnz0MYHQNTsN2L6QDGCJumbNFsQcmErrRz/KglYI/IDh88lsyOhVi7mgaAs/bjevvJa2F1JT7jUMLsz9/cpw==", base64.StdEncoding.EncodeToString(encryptedCBC))
+}

server/utils/utils.go

@@ -2,17 +2,12 @@ package utils
 
 import (
 	"bytes"
-	"crypto"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/md5"
 	"crypto/rand"
-	"crypto/rsa"
 	"crypto/sha256"
-	"crypto/sha512"
-	"crypto/x509"
 	"encoding/base64"
-	"encoding/pem"
 	"errors"
 	"fmt"
 	"image"
@@ -43,6 +38,11 @@ func UUID() string {
 	return v4.String()
 }
 
+func LongUUID() string {
+	longUUID := strings.Join([]string{UUID(), UUID(), UUID(), UUID()}, "")
+	return strings.ReplaceAll(longUUID, "-", "")
+}
+
 func Tcping(ip string, port int) (bool, error) {
 	var (
 		conn    net.Conn
@@ -123,7 +123,7 @@ func Distinct(a []string) []string {
 	return result
 }
 
-// 排序+拼接+摘要
+// Sign 排序+拼接+摘要
 func Sign(a []string) string {
 	sort.Strings(a)
 	data := []byte(strings.Join(a, ""))
@@ -131,6 +131,11 @@ func Sign(a []string) string {
 	return fmt.Sprintf("%x", has)
 }
 
+func Md5(s string) string {
+	has := md5.Sum([]byte(s))
+	return fmt.Sprintf("%x", has)
+}
+
 func Contains(s []string, str string) bool {
 	for _, v := range s {
 		if v == str {
@@ -341,44 +346,6 @@ func Utf8ToGbk(s []byte) ([]byte, error) {
 	return d, nil
 }
 
-// SignatureRSA rsa私钥签名
-func SignatureRSA(plainText []byte, rsaPrivateKey string) (signed []byte, err error) {
-	// 使用pem对读取的内容解码得到block
-	block, _ := pem.Decode([]byte(rsaPrivateKey))
-	//x509将数据解析得到私钥结构体
-	privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
-	if err != nil {
-		return nil, err
-	}
-	// 创建一个hash对象
-	h := sha512.New()
-	_, _ = h.Write(plainText)
-	// 计算hash值
-	hashText := h.Sum(nil)
-	// 使用rsa函数对散列值签名
-	signed, err = rsa.SignPKCS1v15(rand.Reader, privateKey, crypto.SHA512, hashText)
-	if err != nil {
-		return
-	}
-	return signed, nil
-}
-
-// VerifyRSA rsa签名认证
-func VerifyRSA(plainText, signText []byte, rsaPublicKey string) bool {
-	// pem解码得到block
-	block, _ := pem.Decode([]byte(rsaPublicKey))
-	// x509解析得到接口
-	publicKey, err := x509.ParsePKCS1PublicKey(block.Bytes)
-	if err != nil {
-		return false
-	}
-	// 对原始明文进行hash运算得到散列值
-	hashText := sha512.Sum512(plainText)
-	// 签名认证
-	err = rsa.VerifyPKCS1v15(publicKey, crypto.SHA512, hashText[:], signText)
-	return err == nil
-}
-
 // GetAvailablePort 获取可用端口
 func GetAvailablePort() (int, error) {
 	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")