feat: add LoadRSACrt

feat: logger trace-value 的格式

database/db/new_test.go

@@ -5,21 +5,21 @@ import (
 )
 
 func TestNew(t *testing.T) {
-	//mdb, err := New(WithMysql("127.0.0.1", 3306, "root", "MyPassw0rd", "mydb"))
+	mdb, err := New(WithMysql("127.0.0.1", 2881, "yizhi@test", "yizhi", "mie"))
-	//if err != nil {
+	if err != nil {
-	//	t.Fatal(err)
+		t.Fatal(err)
-	//}
+	}
-	//
+
-	//type User struct {
+	type User struct {
-	//	Id       uint64 `gorm:"primaryKey"`
+		Id       uint64 `gorm:"primaryKey"`
-	//	Username string `gorm:"unique"`
+		Username string `gorm:"unique"`
-	//}
+	}
-	//
+
-	//if err = mdb.Session(t.Context()).AutoMigrate(&User{}); err != nil {
+	if err = mdb.Session(t.Context()).AutoMigrate(&User{}); err != nil {
-	//	t.Fatal(err)
+		t.Fatal(err)
-	//}
+	}
-	//
+
-	//if err = mdb.Session(t.Context()).Create(&User{Username: "zyp"}).Error; err != nil {
+	if err = mdb.Session(t.Context()).Create(&User{Username: "zyp"}).Error; err != nil {
-	//	t.Fatal(err)
+		t.Fatal(err)
-	//}
+	}
 }

database/db/option.go

@@ -3,6 +3,8 @@ package db
 import (
 	"context"
 	"fmt"
+
+	"gitea.loveuer.com/yizhisec/packages/logger"
 )
 
 type config struct {
@@ -25,6 +27,7 @@ func WithCtx(ctx context.Context) OptionFn {
 func WithMysql(host string, port int, user string, password string, database string) OptionFn {
 	return func(c *config) {
 		dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", user, password, host, port, database)
+		logger.Debug("db init with mysql, dsn: %s", dsn)
 		c.mysql = &dsn
 	}
 }
@@ -32,6 +35,7 @@ func WithMysql(host string, port int, user string, password string, database str
 func WithPg(host string, port int, user string, password string, database string) OptionFn {
 	return func(c *config) {
 		dsn := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable TimeZone=Asia/Shanghai", host, user, password, database, port)
+		logger.Debug("db init with pg, dsn: %s", dsn)
 		c.pg = &dsn
 	}
 }
@@ -39,6 +43,7 @@ func WithPg(host string, port int, user string, password string, database string
 func WithSqlite(path string) OptionFn {
 	return func(c *config) {
 		if path != "" {
+			logger.Debug("db init with sqlite, path: %s", path)
 			c.sqlite = &path
 		}
 	}

logger/ctx.go

@@ -2,17 +2,20 @@ package logger
 
 import (
 	"context"
-	"gitea.loveuer.com/yizhisec/packages/opt"
 	uuid2 "github.com/google/uuid"
 )
 
+type _traceId struct{}
+
+var TraceId = _traceId{}
+
 func traceId(ctx context.Context) string {
 	if ctx == nil {
 		uuid, _ := uuid2.NewV7()
 		return uuid.String()
 	}
 
-	if id, _ := ctx.Value(opt.TraceKey).(string); id != "" {
+	if id, _ := ctx.Value(TraceId).(string); id != "" {
 		return id
 	}
 
@@ -21,30 +24,30 @@ func traceId(ctx context.Context) string {
 }
 
 func DebugCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Debug(msg, data...)
 }
 func InfoCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Info(msg, data...)
 }
 
 func WarnCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Warn(msg, data...)
 }
 
 func ErrorCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Error(msg, data...)
 }
 
 func PanicCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Panic(msg, data...)
 }
 
 func FatalCtx(ctx context.Context, msg string, data ...any) {
-	msg = "[" + traceId(ctx) + "] " + msg
+	msg = traceId(ctx) + " | " + msg
 	DefaultLogger.Fatal(msg, data...)
 }

logger/ctx_test.go

@@ -2,7 +2,6 @@ package logger
 
 import (
 	"context"
-	"gitea.loveuer.com/yizhisec/packages/opt"
 	"testing"
 )
 
@@ -11,7 +10,7 @@ func TestCtxLog(t *testing.T) {
 	InfoCtx(nil, "hello %s", "world")
 	WarnCtx(context.Background(), "hello %s", "world")
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, opt.TraceKey, "value")
+	ctx = context.WithValue(ctx, TraceId, "value")
 	SetLogLevel(LogLevelDebug)
 	DebugCtx(ctx, "hello %s", "world")
 	ErrorCtx(ctx, "hello %s", "world")

middlewares/logger/logger.go

@@ -2,17 +2,21 @@ package logger
 
 import (
 	"fmt"
-	"gitea.loveuer.com/yizhisec/packages/logger"
-	"gitea.loveuer.com/yizhisec/packages/opt"
-	"gitea.loveuer.com/yizhisec/packages/tool"
-	"github.com/gin-gonic/gin"
 	"strings"
 	"sync"
 	"time"
+
+	"gitea.loveuer.com/yizhisec/packages/opt"
+	"gitea.loveuer.com/yizhisec/packages/tool"
+	"github.com/fatih/color"
+	"github.com/gin-gonic/gin"
+)
+
+const (
+	defaultTrace = "                   middleware-logger"
 )
 
 var (
-	defaultTrace      = "middleware-logger"
 	stringBuilderPool = sync.Pool{
 		New: func() interface{} {
 			return &strings.Builder{}
@@ -36,39 +40,42 @@ func New() gin.HandlerFunc {
 
 		c.Next()
 
-		status := c.Writer.Status()
+		var (
+			status string
+		)
+
+		_status := c.Writer.Status()
 		duration := time.Since(start)
 
-		var logFn func(msg string, data ...any)
 		switch {
-		case status >= 500:
+		case _status >= 500:
-			logFn = logger.Error
+			status = color.RedString("%3d", _status)
-		case status >= 400:
+		case _status >= 400:
-			logFn = logger.Warn
+			status = color.YellowString("%3d", _status)
 		default:
-			logFn = logger.Info
+			status = color.GreenString("%3d", _status)
 		}
 
-		if logFn != nil {
+		b := stringBuilderPool.Get().(*strings.Builder)
-			b := stringBuilderPool.Get().(*strings.Builder)
+		b.Reset()
-			b.Reset()
 
-			b.WriteString("[")
+		b.WriteString("GIN   | ")
-			b.WriteString(fmt.Sprintf("%36s", trace))
+		b.WriteString(start.Format("2006-01-02T15:04:05"))
-			b.WriteString("] | ")
+		b.WriteString(" | ")
-			b.WriteString(fmt.Sprintf("%3d", status))
+		b.WriteString(trace)
-			b.WriteString(" | ")
+		b.WriteString(" | ")
-			b.WriteString(fmt.Sprintf("%15s", ip))
+		b.WriteString(status)
-			b.WriteString(" | ")
+		b.WriteString(" | ")
-			b.WriteString(tool.HumanDuration(duration.Nanoseconds()))
+		b.WriteString(fmt.Sprintf("%15s", ip))
-			b.WriteString(" | ")
+		b.WriteString(" | ")
-			b.WriteString(c.Request.Method)
+		b.WriteString(tool.HumanDuration(duration.Nanoseconds()))
-			b.WriteString(" | ")
+		b.WriteString(" | ")
-			b.WriteString(c.Request.RequestURI)
+		b.WriteString(c.Request.Method)
+		b.WriteString(" | ")
+		b.WriteString(c.Request.RequestURI)
 
-			logFn(b.String())
+		fmt.Println(b.String())
 
-			stringBuilderPool.Put(b)
+		stringBuilderPool.Put(b)
-		}
 	}
 }

middlewares/logger/logger_test.go

@@ -2,10 +2,12 @@ package logger
 
 import (
 	"errors"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"testing"
 	"time"
+
+	"gitea.loveuer.com/yizhisec/packages/logger"
+	"github.com/gin-gonic/gin"
 )
 
 func TestLogger(t *testing.T) {
@@ -20,6 +22,7 @@ func TestLogger(t *testing.T) {
 		c.JSON(400, gin.H{"hello": "world"})
 	})
 	app.GET("/500", func(c *gin.Context) {
+		logger.ErrorCtx(c.Request.Context(), "oops")
 		c.JSON(500, gin.H{"hello": "world"})
 	})
 

resp/resp.go

@@ -30,6 +30,18 @@ func R200(c *gin.Context, data any, msgs ...string) {
 	c.AbortWithStatusJSON(200, r)
 }
 
+func RC(c *gin.Context, status int, args ...any) {
+	code := 1
+	if status != 200 {
+		code = -1
+	}
+
+	_r(c, &res{
+		Status: status,
+		Code:   code,
+	}, args...)
+}
+
 func RE(c *gin.Context, err error) {
 	var re *Error
 
@@ -68,11 +80,7 @@ H4:
 		r.Code = code
 	}
 H3:
-	if es, ok := args[2].(error); ok {
+	r.Err = args[2]
-		r.Err = es.Error()
-	} else {
-		r.Err = args[2]
-	}
 H2:
 	r.Data = args[1]
 H1:
@@ -86,6 +94,10 @@ END:
 		r.Msg = Msg(r.Status)
 	}
 
+	if ce, ok := r.Err.(error); ok {
+		r.Err = ce.Error()
+	}
+
 	c.AbortWithStatusJSON(r.Status, r)
 }
 

tool/rsa.go

@@ -184,3 +184,72 @@ func RSADecrypt(encryptedBase64 string, cfg *tls.Config) ([]byte, error) {
 
 	return decrypted, nil
 }
+
+func LoadRSACertificate(pubKeyBytes, priKeyBytes []byte) (*rsa.PublicKey, *rsa.PrivateKey, error) {
+	var (
+		err    error
+		pubKey *rsa.PublicKey
+		priKey *rsa.PrivateKey
+	)
+
+	if len(pubKeyBytes) == 0 && len(priKeyBytes) == 0 {
+		return nil, nil, errors.New("both public and private key bytes are empty")
+	}
+
+	if len(pubKeyBytes) > 0 {
+		pubKey, err = parsePublicKey(pubKeyBytes)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	if len(priKeyBytes) > 0 {
+		priKey, err = parsePrivateKey(priKeyBytes)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
+	return pubKey, priKey, nil
+}
+
+func parsePublicKey(pubKeyBytes []byte) (*rsa.PublicKey, error) {
+	block, _ := pem.Decode(pubKeyBytes)
+	if block == nil {
+		return nil, errors.New("failed to decode public key")
+	}
+
+	pubKey, err := x509.ParsePKIXPublicKey(block.Bytes)
+	if err != nil {
+		return nil, err
+	}
+
+	rsaPubKey, ok := pubKey.(*rsa.PublicKey)
+	if !ok {
+		return nil, errors.New("not an RSA public key")
+	}
+
+	return rsaPubKey, nil
+}
+
+func parsePrivateKey(priKeyBytes []byte) (*rsa.PrivateKey, error) {
+	block, _ := pem.Decode(priKeyBytes)
+	if block == nil {
+		return nil, errors.New("failed to decode private key")
+	}
+
+	priKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+	if err != nil {
+		priKey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	rsaPriKey, ok := priKey.(*rsa.PrivateKey)
+	if !ok {
+		return nil, errors.New("not an RSA private key")
+	}
+
+	return rsaPriKey, nil
+}

tool/rsa_test.go

@@ -41,3 +41,22 @@ func TestRSA(t *testing.T) {
 		t.Fatalf("Original and decrypted data don't match, org1 = %s, org2 = %s", org, org2)
 	}
 }
+
+func TestLoadRSACertificate(t *testing.T) {
+	const (
+		pubKey = `-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwJZyF1WhhsmtDpTfmvGnGIcLHIK/QLYV7Xy3O7Cwb28fxcbHw7z+1WHdbE65QxIAUvh9niR8EzAZyLOD2ZOrXdKyz4cZ48YjisNeGxf2x61uX0Ao6JZsbNjyp3NJCcyLmenDO8BCzPaj1UJ6nkDO53/W494UJ8nKVB726JCWdBCKSijOWutBvxYqC1bZHs/etQ8KwWPiBiEthV/6hHnlzm9oGfKfHapB6eNTtzKjrl39cuKwZwlbDo3R2Xe8bK8ATwkCbGq2EGdWuNKt94dPVH8f+RhqkEdnR4mJrTFVNifWLcPi2dTNCaP8Q87KlI4dnzyq0uo3gS9U7bvIVSH6HhhmwLN33WzZsUnQ+laVTZqOmwuNZosc8BQ4k2Bu+w4ZobjkY7dTJDG+JHuMKH9W9zzu5eF/1oVA9zd6Gi1nYo/G+y/UaaBLXdqaQijZFQHmRWGI+rvKN0tl6Ruw1pFjvrEd/kBYpfIl5BIPX2D0ElSTfXACjb4TcEoMGMGjbr6awjzb0X6Z6hVzuWN1oJcaMFat0VInNdjiG7o6EvgW3DKiSWiRaRAxaF+d1pp7wIRipLKQbp9VCp8OPAVXLRuma4R/VDqpVt53i0tJGBbR+ICixdKUp6hszOgup0DClSLSwQv30SXEWcJSPf+x1Y1kdS9XytqkJwuyO7IirFAZXZ0CAwEAAQ==
+-----END PUBLIC KEY-----`
+		priKey = `-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----`
+	)
+
+	pub, pri, err := LoadRSACertificate(StringToBytes(pubKey), StringToBytes(priKey))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Logf("Public Key: %#v", pub)
+	t.Logf("Private Key: %#v", pri)
+}