提交 v1.3.0 beta

server/utils/guacamole.go

@@ -1,19 +0,0 @@
-package utils
-
-import (
-	"encoding/base64"
-	"strconv"
-
-	"next-terminal/server/guacd"
-
-	"github.com/gorilla/websocket"
-)
-
-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

@@ -1,56 +0,0 @@
-package utils
-
-import (
-	"database/sql/driver"
-	"fmt"
-	"strings"
-	"time"
-)
-
-type JsonTime struct {
-	time.Time
-}
-
-func NewJsonTime(t time.Time) JsonTime {
-	return JsonTime{
-		Time: t,
-	}
-}
-
-func NowJsonTime() JsonTime {
-	return JsonTime{
-		Time: time.Now(),
-	}
-}
-
-func (j JsonTime) MarshalJSON() ([]byte, error) {
-	var stamp = fmt.Sprintf("\"%s\"", j.Format("2006-01-02 15:04:05"))
-	return []byte(stamp), nil
-}
-
-func (j *JsonTime) UnmarshalJSON(b []byte) error {
-	s := strings.ReplaceAll(string(b), "\"", "")
-	t, err := time.Parse("2006-01-02 15:04:05", s)
-	if err != nil {
-		return err
-	}
-	*j = NewJsonTime(t)
-	return nil
-}
-
-func (j JsonTime) Value() (driver.Value, error) {
-	var zeroTime time.Time
-	if j.Time.UnixNano() == zeroTime.UnixNano() {
-		return nil, nil
-	}
-	return j.Time, nil
-}
-
-func (j *JsonTime) Scan(v interface{}) error {
-	value, ok := v.(time.Time)
-	if ok {
-		*j = JsonTime{Time: value}
-		return nil
-	}
-	return fmt.Errorf("can not convert %v to timestamp", v)
-}

server/utils/license.go

@@ -0,0 +1,48 @@
+package utils
+
+import (
+	"crypto"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha512"
+	"crypto/x509"
+	"encoding/pem"
+)
+
+// 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
+}

server/utils/reflect.go

@@ -0,0 +1,7 @@
+package utils
+
+import "reflect"
+
+func GetName(repository interface{}) string {
+	return reflect.TypeOf(repository).Elem().Name()
+}

server/utils/ssh_tunnel.go

@@ -1 +0,0 @@
-package utils

server/utils/util_test.go

@@ -94,3 +94,7 @@ func TestAesEncryptCBC2(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "3Tbnz0MYHQNTsN2L6QDGCJumbNFsQcmErrRz/KglYI/IDh88lsyOhVi7mgaAs/bjevvJa2F1JT7jUMLsz9/cpw==", base64.StdEncoding.EncodeToString(encryptedCBC))
 }
+
+func TestUUID(t *testing.T) {
+	println(utils.UUID())
+}

server/utils/utils.go

@@ -27,18 +27,18 @@ import (
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"golang.org/x/text/transform"
 
-	"github.com/gofrs/uuid"
+	"github.com/google/uuid"
 	errors2 "github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/pbkdf2"
 )
 
 func UUID() string {
-	v4, _ := uuid.NewV4()
-	return v4.String()
+	return uuid.New().String()
 }
 
 func LongUUID() string {
+	uuid.New()
 	longUUID := strings.Join([]string{UUID(), UUID(), UUID(), UUID()}, "")
 	return strings.ReplaceAll(longUUID, "-", "")
 }
@@ -56,7 +56,7 @@ func Tcping(ip string, port int) (bool, error) {
 	} else {
 		address = fmt.Sprintf("[%s]:%s", ip, strPort)
 	}
-	if conn, err = net.DialTimeout("tcp", address, 5*time.Second); err != nil {
+	if conn, err = net.DialTimeout("tcp", address, 15*time.Second); err != nil {
 		return false, err
 	}
 	defer func() {
@@ -346,6 +346,11 @@ func Utf8ToGbk(s []byte) ([]byte, error) {
 	return d, nil
 }
 
+func Decimal(value float64) float64 {
+	value, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", value), 64)
+	return value
+}
+
 // GetAvailablePort 获取可用端口
 func GetAvailablePort() (int, error) {
 	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")