Compare commits

...

2 Commits

Author SHA1 Message Date
f113ae6cba User info DirectAccess™ 2025-03-29 15:21:30 +08:00
1ea5aea6b3 Prevent from creating multiple redis client 2025-03-29 15:11:07 +08:00
4 changed files with 61 additions and 3 deletions

View File

@ -6,8 +6,10 @@ import (
"strconv" "strconv"
"time" "time"
"git.solsynth.dev/hypernet/nexus/pkg/internal/cache"
"git.solsynth.dev/hypernet/nexus/pkg/internal/directory" "git.solsynth.dev/hypernet/nexus/pkg/internal/directory"
"git.solsynth.dev/hypernet/nexus/pkg/nex" "git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit"
"git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
"git.solsynth.dev/hypernet/nexus/pkg/proto" "git.solsynth.dev/hypernet/nexus/pkg/proto"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
@ -20,6 +22,19 @@ func userinfoFetch(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusUnauthorized, "user principal data was not found") return fiber.NewError(fiber.StatusUnauthorized, "user principal data was not found")
} }
if val, err := cachekit.Get[sec.UserInfo](
cache.Kcc,
cachekit.FKey(cachekit.DAUserInfoPrefix, claims.Session),
); err == nil {
c.Locals("nex_user", &val)
tk, err := IWriter.WriteUserInfoJwt(val)
if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("unable to sign userinfo: %v", err))
}
c.Locals("nex_token", tk)
return nil
}
service := directory.GetServiceInstanceByType(nex.ServiceTypeAuth) service := directory.GetServiceInstanceByType(nex.ServiceTypeAuth)
if service != nil { if service != nil {
conn, err := service.GetGrpcConn() conn, err := service.GetGrpcConn()

View File

@ -1,8 +1,16 @@
package cache package cache
import "github.com/redis/go-redis/v9" import (
"time"
var Rdb *redis.Client "git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit"
"github.com/redis/go-redis/v9"
)
var (
Rdb *redis.Client
Kcc *cachekit.Conn
)
func ConnectRedis(addr, password string, db int) error { func ConnectRedis(addr, password string, db int) error {
Rdb = redis.NewClient(&redis.Options{ Rdb = redis.NewClient(&redis.Options{
@ -10,5 +18,9 @@ func ConnectRedis(addr, password string, db int) error {
Password: password, Password: password,
DB: db, DB: db,
}) })
Kcc = &cachekit.Conn{
Rd: Rdb,
Timeout: 3 * time.Second,
}
return nil return nil
} }

View File

@ -0,0 +1,13 @@
package cachekit
import "fmt"
// Those constants are used to directly get the cached data from redis
// Formatted like {prefix}#{key}
const (
DAUserInfoPrefix = "userinfo"
)
func FKey(prefix string, key any) string {
return fmt.Sprintf("%s#%v", prefix, key)
}

View File

@ -3,24 +3,41 @@ package cachekit
import ( import (
"context" "context"
"fmt" "fmt"
"sync"
"time" "time"
"git.solsynth.dev/hypernet/nexus/pkg/nex" "git.solsynth.dev/hypernet/nexus/pkg/nex"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
) )
// The global variable below is used to keep there will only be one redis client exist in a single instance
// Prevent if other DirectAccess™ SDK creating too many redis clients
// And able to recreate the conn with different options
var (
rdc *redis.Client
rdl *sync.Mutex
)
type Conn struct { type Conn struct {
n *nex.Conn n *nex.Conn
Rd *redis.Client Rd *redis.Client
Timeout time.Duration Timeout time.Duration
} }
func NewCaConn(conn *nex.Conn, timeout time.Duration) (*Conn, error) { func NewConn(conn *nex.Conn, timeout time.Duration) (*Conn, error) {
rdl.Lock()
defer rdl.Unlock()
c := &Conn{ c := &Conn{
n: conn, n: conn,
Timeout: timeout, Timeout: timeout,
} }
if rdc != nil {
c.Rd = rdc
return c, nil
}
rdb := conn.AllocResource(nex.AllocatableResourceCache) rdb := conn.AllocResource(nex.AllocatableResourceCache)
if rdb == nil { if rdb == nil {
return nil, fmt.Errorf("unable to allocate resource: cache") return nil, fmt.Errorf("unable to allocate resource: cache")
@ -28,6 +45,7 @@ func NewCaConn(conn *nex.Conn, timeout time.Duration) (*Conn, error) {
return nil, fmt.Errorf("allocated cache resource is not a redis client") return nil, fmt.Errorf("allocated cache resource is not a redis client")
} else { } else {
c.Rd = client c.Rd = client
rdc = client
} }
return c, nil return c, nil