ct int64로 변경

This reverts commit 4aae3704e7.

go.mod

@@ -1,6 +1,8 @@
 module repositories.action2quare.com/ayo/gocommon
 
-go 1.20
+go 1.22
+
+toolchain go1.22.4
 
 require (
 	github.com/awa/go-iap v1.32.0
@@ -34,6 +36,7 @@ require (
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/opensearch-project/opensearch-go/v4 v4.5.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
 	github.com/prometheus/common v0.44.0 // indirect

go.sum

@@ -90,6 +90,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/opensearch-project/opensearch-go/v4 v4.5.0 h1:26XckmmF6MhlXt91Bu1yY6R51jy1Ns/C3XgIfvyeTRo=
+github.com/opensearch-project/opensearch-go/v4 v4.5.0/go.mod h1:VmFc7dqOEM3ZtLhrpleOzeq+cqUgNabqQG5gX0xId64=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

metric/common.go

@@ -2,13 +2,12 @@ package metric
 
 import (
 	"crypto/md5"
-	"encoding/binary"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"math"
 	"os"
 	"path"
+	"runtime"
 	"sort"
 	"strings"
 	"sync/atomic"
@@ -16,8 +15,6 @@ import (
 	"repositories.action2quare.com/ayo/gocommon/logger"
 )
 
-const metric_value_line_size = 19
-
 type MetricDescription struct {
 	Key         string
 	Type        MetricType
@@ -29,7 +26,35 @@ type MetricDescription struct {
 type Exporter interface {
 	RegisterMetric(*MetricDescription)
 	UpdateMetric(string, float64)
-	Shutdown()
+}
+
+type MetricPipe struct {
+	pipe *os.File
+}
+
+func (mp MetricPipe) Close() {
+	if mp.pipe != nil {
+		mp.pipe.Close()
+		mp.pipe = nil
+	}
+}
+
+func (mp MetricPipe) writeLine(line string) {
+	mp.pipe.WriteString(line + "\n")
+}
+
+func NewMetricPipe(pipeName string) MetricPipe {
+	switch runtime.GOOS {
+	case "linux":
+		pipeName = "/tmp/" + pipeName
+	case "windows":
+		pipeName = `\\.\pipe\` + pipeName
+	}
+
+	f, _ := os.Open(pipeName)
+	return MetricPipe{
+		pipe: f,
+	}
 }
 
 type MetricWriter interface {
@@ -45,13 +70,14 @@ func (mw *metric_empty) Add(int64) {}
 var MetricWriterNil = MetricWriter(&metric_empty{})
 
 type metric_int64 struct {
+	key    string
 	valptr *int64
-	buff   [metric_value_line_size]byte
+	pipe   MetricPipe
 }
 
 func (mw *metric_int64) printOut() {
-	binary.LittleEndian.PutUint64(mw.buff[9:], math.Float64bits(float64(atomic.LoadInt64(mw.valptr))))
+	loaded := atomic.LoadInt64(mw.valptr)
-	os.Stdout.Write(mw.buff[:])
+	mw.pipe.writeLine(fmt.Sprintf("%s:%d", mw.key, loaded))
 }
 
 func (mw *metric_int64) Set(newval int64) {
@@ -64,11 +90,16 @@ func (mw *metric_int64) Add(inc int64) {
 	mw.printOut()
 }
 
-func NewMetric(mt MetricType, name string, help string, constLabels map[string]string) (writer MetricWriter) {
+func NewMetric(pipe MetricPipe, mt MetricType, name string, help string, constLabels map[string]string) (writer MetricWriter) {
 	if !metricEnabled {
 		return MetricWriterNil
 	}
 
+	if constLabels == nil {
+		constLabels = map[string]string{}
+	}
+
+	constLabels["pid"] = fmt.Sprintf("%d", os.Getpid())
 	var disorder []struct {
 		k string
 		v string
@@ -101,35 +132,17 @@ func NewMetric(mt MetricType, name string, help string, constLabels map[string]s
 	})
 
 	impl := &metric_int64{
+		key:    key,
 		valptr: new(int64),
+		pipe:   pipe,
 	}
 
-	impl.buff[0] = METRIC_HEAD_INLINE
+	pipe.writeLine(string(temp))
-	impl.buff[17] = METRIC_TAIL_INLINE
-	impl.buff[18] = '\n'
-	copy(impl.buff[1:], []byte(key))
-
-	output := append([]byte{METRIC_HEAD_INLINE}, temp...)
-	output = append(output, METRIC_TAIL_INLINE, '\n')
-	os.Stdout.Write(output)
-
 	// writer
 
 	return impl
 }
 
-func ReadMetricValue(line []byte) (string, float64) {
-	if len(line) < 16 {
-		return "", 0
-	}
-
-	key := string(line[0:8])
-	valbits := binary.LittleEndian.Uint64(line[8:])
-	val := math.Float64frombits(valbits)
-
-	return key, val
-}
-
 var metricEnabled = false
 
 func init() {

metric/prometheus.go

@@ -1,7 +1,7 @@
 package metric
 
 import (
-	"context"
+	"maps"
 	"math"
 	"sync/atomic"
 
@@ -34,11 +34,6 @@ func convertValueType(in MetricType) prometheus.ValueType {
 	return prometheus.UntypedValue
 }
 
-type writeRequest struct {
-	key string
-	val float64
-}
-
 type prometheusMetricDesc struct {
 	*prometheus.Desc
 	valueType prometheus.ValueType
@@ -46,116 +41,68 @@ type prometheusMetricDesc struct {
 	key       string
 }
 
-type prometheusExporter struct {
+type PrometheusCollector struct {
-	writerChan   chan *writeRequest
-	registerChan chan *prometheusMetricDesc
 	namespace string
-	cancel       context.CancelFunc
-}
-
-func (pe *prometheusExporter) RegisterMetric(nm *MetricDescription) {
-	pe.registerChan <- &prometheusMetricDesc{
-		Desc:      prometheus.NewDesc(prometheus.BuildFQName(pe.namespace, "", nm.Name), nm.Help, nil, nm.ConstLabels),
-		valueType: convertValueType(nm.Type),
-		valptr:    new(uint64),
-		key:       nm.Key,
-	}
-}
-
-func (pe *prometheusExporter) UpdateMetric(key string, val float64) {
-	pe.writerChan <- &writeRequest{key: key, val: val}
-}
-
-func (pe *prometheusExporter) Shutdown() {
-	if pe.cancel != nil {
-		pe.cancel()
-	}
-}
-
-type prometheusCollector struct {
 	metrics   map[string]*prometheusMetricDesc
+	registry  *prometheus.Registry
 }
 
-func (pc *prometheusCollector) Describe(ch chan<- *prometheus.Desc) {
+func (pc *PrometheusCollector) Describe(ch chan<- *prometheus.Desc) {
 	for _, v := range pc.metrics {
+		logger.Println("collector describe :", v.Desc.String())
 		ch <- v.Desc
 	}
 }
 
-func (pc *prometheusCollector) Collect(ch chan<- prometheus.Metric) {
+func (pc *PrometheusCollector) Collect(ch chan<- prometheus.Metric) {
 	for _, v := range pc.metrics {
-		cm, err := prometheus.NewConstMetric(v.Desc, v.valueType, math.Float64frombits(atomic.LoadUint64(v.valptr)))
+		value := atomic.LoadUint64(v.valptr)
+		cm, err := prometheus.NewConstMetric(v.Desc, v.valueType, math.Float64frombits(value))
 		if err == nil {
 			ch <- cm
 		}
 	}
 }
 
-func (pe *prometheusExporter) loop(ctx context.Context) {
+func (pc *PrometheusCollector) RegisterMetric(md *MetricDescription) *PrometheusCollector {
-	defer func() {
+	nm := &prometheusMetricDesc{
-		r := recover()
+		Desc:      prometheus.NewDesc(prometheus.BuildFQName("ou", "", md.Name), md.Help, nil, md.ConstLabels),
-		if r != nil {
+		valueType: convertValueType(md.Type),
-			logger.Error(r)
+		valptr:    new(uint64),
-		}
+		key:       md.Key,
-	}()
-
-	var collector *prometheusCollector
-	defer func() {
-		if collector != nil {
-			prometheus.Unregister(collector)
-		}
-	}()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return
-
-		case req := <-pe.writerChan:
-			if collector != nil {
-				if m := collector.metrics[req.key]; m != nil {
-					atomic.StoreUint64(m.valptr, math.Float64bits(req.val))
-				}
 	}
 
-		case nm := <-pe.registerChan:
+	next := NewPrometheusCollector(pc.namespace, pc.registry)
-			var nextmetrics map[string]*prometheusMetricDesc
+	maps.Copy(next.metrics, pc.metrics)
-			if collector != nil {
+	next.metrics[nm.key] = nm
-				nextmetrics = collector.metrics
-				prometheus.Unregister(collector)
-				nextmetrics[nm.key] = nm
-			} else {
-				nextmetrics = map[string]*prometheusMetricDesc{
-					nm.key: nm,
-				}
-			}
 
-			nextcollector := &prometheusCollector{
+	pc.registry.Unregister(pc)
-				metrics: nextmetrics,
+	pc.registry.Register(next)
-			}
 
-			if err := prometheus.Register(nextcollector); err != nil {
+	return next
-				if _, ok := err.(prometheus.AlreadyRegisteredError); ok {
+}
-					// 이미 등록된 metric. child process를 여럿 실행하면 발생됨
+
-				} else {
+func (pc *PrometheusCollector) UpdateMetric(key string, val float64) {
-					logger.Error("prometheus register err :", *nm, err)
+	if m := pc.metrics[key]; m != nil {
-				}
+		atomic.StoreUint64(m.valptr, math.Float64bits(val))
-			} else {
-				collector = nextcollector
-			}
-		}
 	}
 }
 
-func NewPrometheusExport(namespace string) Exporter {
+func (pc *PrometheusCollector) UnregisterMetric(key string) *PrometheusCollector {
-	ctx, cancel := context.WithCancel(context.Background())
+	next := NewPrometheusCollector(pc.namespace, pc.registry)
-	exp := &prometheusExporter{
+	maps.Copy(next.metrics, pc.metrics)
-		registerChan: make(chan *prometheusMetricDesc, 10),
+	delete(next.metrics, key)
-		writerChan:   make(chan *writeRequest, 100),
+
+	pc.registry.Unregister(pc)
+	pc.registry.Register(next)
+
+	return next
+}
+
+func NewPrometheusCollector(namespace string, registry *prometheus.Registry) *PrometheusCollector {
+	return &PrometheusCollector{
 		namespace: namespace,
-		cancel:       cancel,
+		metrics:   make(map[string]*prometheusMetricDesc),
+		registry:  registry,
 	}
-
-	go exp.loop(ctx)
-	return exp
 }

opensearch/client.go

@@ -0,0 +1,243 @@
+package opensearch
+
+import (
+	"bytes"
+	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"slices"
+	"strings"
+	"sync/atomic"
+	"time"
+
+	osg "github.com/opensearch-project/opensearch-go/v4"
+	osapi "github.com/opensearch-project/opensearch-go/v4/opensearchapi"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+)
+
+type Config struct {
+	osg.Config  `json:",inline"`
+	IndexPrefix string `json:"IndexPrefix"`
+	SigningKey  string `json:"SigningKey"`
+}
+
+type Client struct {
+	*osg.Client
+	cfg                  Config
+	signingKey           []byte
+	indexTemplatePattern string
+	bulkHeader           http.Header
+	singleHeader         http.Header
+	sendingCount         int32
+}
+
+type LogDocument struct {
+	Type      string `json:"type"`
+	Body      any    `json:"body"`
+	Timestamp string `json:"@timestamp"`
+
+	Country string `json:"country"`
+	Ip      string `json:"ip"`
+	Uid     string `json:"uid"`
+	Auth    struct {
+		Type string `json:"type"`
+		Id   string `json:"id"`
+	} `json:"auth"`
+}
+
+func NewLogDocument(logType string, body any) *LogDocument {
+	return &LogDocument{
+		Type:      strings.ToLower(logType),
+		Timestamp: time.Now().UTC().Format("2006-01-02T15:04:05Z"),
+		Body:      body,
+	}
+}
+
+func (c *Client) Send(ld *LogDocument) {
+	if c.Client == nil {
+		return
+	}
+
+	serialized, _ := json.Marshal(ld)
+	go func(serialized []byte) {
+		sending := atomic.AddInt32(&c.sendingCount, 1)
+		defer atomic.AddInt32(&c.sendingCount, -1)
+
+		if sending > 100 {
+			logger.Println("sending log bottleneck :", sending)
+			logger.Println(string(serialized))
+			return
+		}
+
+		reader := bytes.NewBuffer(serialized)
+		req := osapi.IndexReq{
+			Index:  c.indexTemplatePattern + ld.Type,
+			Body:   reader,
+			Header: c.singleHeader,
+		}
+
+		resp, err := c.Do(context.Background(), req, nil)
+		if err != nil {
+			logger.Println("log send failed :", err)
+			return
+		}
+		resp.Body.Close()
+	}(serialized)
+}
+
+func (c *Client) SendBulk(ds map[string]*LogDocument) {
+	if c == nil {
+		return
+	}
+
+	var contents string
+
+	for _, d := range ds {
+		b, _ := json.Marshal(d)
+		contents += fmt.Sprintf(`{"create":{"_index":"%s%s"}}`+"\n"+`%s`+"\n", c.indexTemplatePattern, d.Type, string(b))
+	}
+
+	go func(contents string) {
+		sending := atomic.AddInt32(&c.sendingCount, 1)
+		defer atomic.AddInt32(&c.sendingCount, -1)
+
+		if sending > 100 {
+			logger.Println("sending log bottleneck :", sending)
+			logger.Println(contents)
+			return
+		}
+
+		reader := bytes.NewBuffer([]byte(contents))
+		req := osapi.BulkReq{
+			Body:   reader,
+			Header: c.bulkHeader,
+		}
+		resp, err := c.Do(context.Background(), req, nil)
+		if err != nil {
+			logger.Println("log send bulk failed :", err)
+			return
+		}
+		resp.Body.Close()
+	}(contents)
+}
+
+var jwtHeader string
+var encoding = base64.RawURLEncoding
+
+func init() {
+	src := []byte(`{"alg": "HS256","typ": "JWT"}`)
+	dst := make([]byte, len(src)*2)
+	encoding.Encode(dst, src)
+	enclen := encoding.EncodedLen(len(src))
+	jwtHeader = string(dst[:enclen])
+}
+
+func (c *Client) MakeJWT(subject string, role string, ttl time.Duration) string {
+	if len(c.signingKey) == 0 {
+		return ""
+	}
+
+	now := time.Now().Add(ttl).Unix()
+	src := []byte(fmt.Sprintf(`{"exp":%d,"sub":"%s","roles":"%s"}`, now, subject, role))
+	payload := make([]byte, encoding.EncodedLen(len(src)))
+	encoding.Encode(payload, src)
+
+	encoded := jwtHeader + "." + string(payload)
+	mac := hmac.New(sha256.New, c.signingKey)
+	mac.Write([]byte(encoded))
+	signature := mac.Sum(nil)
+	sigenc := make([]byte, encoding.EncodedLen(len(signature)))
+	encoding.Encode(sigenc, signature)
+
+	return encoded + "." + string(sigenc)
+}
+
+func (c *Client) VerifyJWT(token string) (subject string, role string) {
+	dot := strings.LastIndex(token, ".")
+	if dot < 0 {
+		return
+	}
+
+	encoded := token[:dot]
+	sigenc := token[dot+1:]
+	signature := make([]byte, encoding.DecodedLen(len(sigenc)))
+	encoding.Decode(signature, []byte(sigenc))
+
+	mac := hmac.New(sha256.New, c.signingKey)
+	mac.Write([]byte(encoded))
+	calsig := mac.Sum(nil)
+	if slices.Compare(calsig, signature) != 0 {
+		return
+	}
+
+	_, payload, ok := strings.Cut(encoded, ".")
+	if !ok {
+		return
+	}
+
+	srcjson, err := encoding.DecodeString(payload)
+	if err != nil {
+		return
+	}
+
+	var src struct {
+		Exp   int64  `json:"exp"`
+		Sub   string `json:"sub"`
+		Roles string `json:"roles"`
+	}
+	if json.Unmarshal([]byte(srcjson), &src) != nil {
+		return
+	}
+	if src.Exp < time.Now().Unix() {
+		return
+	}
+
+	return src.Sub, src.Roles
+}
+
+func NewClient(cfg Config) (Client, error) {
+	if len(cfg.Addresses) == 0 {
+		return Client{}, nil
+	}
+
+	client, err := osg.NewClient(cfg.Config)
+	if err != nil {
+		return Client{}, err
+	}
+
+	var signingKey []byte
+	if len(cfg.SigningKey) > 0 {
+		dst := make([]byte, len(cfg.SigningKey)*2)
+		dstlen, _ := base64.StdEncoding.Decode(dst, []byte(cfg.SigningKey))
+		signingKey = dst[:dstlen]
+	}
+
+	indexPrefix := cfg.IndexPrefix
+	if !strings.HasSuffix(indexPrefix, "-") && len(indexPrefix) > 0 {
+		indexPrefix += "-"
+	}
+	if !strings.HasSuffix(indexPrefix, "ds-logs-") {
+		indexPrefix = "ds-logs-" + indexPrefix
+	}
+
+	authHeader := fmt.Sprintf("Basic %s", base64.RawURLEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", cfg.Username, cfg.Password))))
+
+	bulkHeader := make(http.Header)
+	bulkHeader.Set("Authorization", authHeader)
+
+	singleHeader := make(http.Header)
+	singleHeader.Set("Authorization", authHeader)
+
+	return Client{
+		Client:               client,
+		cfg:                  cfg,
+		signingKey:           signingKey,
+		indexTemplatePattern: indexPrefix,
+		bulkHeader:           bulkHeader,
+		singleHeader:         singleHeader,
+	}, nil
+}

opensearch/client_test.go

@@ -0,0 +1,78 @@
+package opensearch
+
+import (
+	"encoding/base64"
+	"testing"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+func TestNewClient(t *testing.T) {
+	// var cfg Config
+
+	// cfg.Addresses = []string{"http://localhost:9200"}
+	// client, err := NewClient(cfg)
+	// if err != nil {
+	// 	t.Errorf("NewClient() error = %v", err)
+	// 	return
+	// }
+
+	// for i := 0; i < 10; i++ {
+	// 	MakeActorLog("LOGIN", "test_user", "stalkername").Write(&client, bson.M{
+	// 		"country": "kr",
+	// 		"ip":      "127.0.0.1",
+	// 	})
+	// 	time.Sleep(time.Second)
+	// }
+
+	// for i := 0; i < 10; i++ {
+	// 	MakeActorLog("Match", "test_user", "stalkername").Write(&client, bson.M{
+	// 		"server":  "kr001",
+	// 		"mode":    "pvp",
+	// 		"address": "server address",
+	// 	})
+	// 	time.Sleep(time.Second)
+	// }
+}
+
+func TestClient_MakeJWT(t *testing.T) {
+	sk := "UGdiOTdLVjFBTWtndTRNRiZmVjdwMDdCRW1lSSUxTnA="
+	dst := make([]byte, len(sk)*2)
+	dstlen, _ := base64.StdEncoding.Decode(dst, []byte(sk))
+	signingKey := dst[:dstlen]
+	uid := primitive.NewObjectID().Hex()
+
+	type args struct {
+		subject string
+		role    string
+		ttl     time.Duration
+	}
+	tests := []struct {
+		name string
+		c    *Client
+		args args
+		want string
+	}{
+		// TODO: Add test cases.
+		{
+			c: &Client{
+				signingKey: signingKey,
+			},
+			args: args{
+				subject: uid,
+				role:    "ds_client",
+				ttl:     time.Minute,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := tt.c.MakeJWT(tt.args.subject, tt.args.role, tt.args.ttl)
+			subj, role := tt.c.VerifyJWT(got)
+			if subj != tt.args.subject || role != tt.args.role {
+				t.Errorf("Client.MakeJWT() = %v, %v, want %v, %v", subj, role, tt.args.subject, tt.args.role)
+			}
+		})
+	}
+}

reflect_config.go

@@ -116,7 +116,13 @@ func LoadConfig[T any](outptr *T) error {
 		}
 	}
 
-	return json.Unmarshal([]byte(os.ExpandEnv(string(configContents))), outptr)
+	return json.Unmarshal([]byte(os.Expand(string(configContents), func(in string) string {
+		envval := os.Getenv(in)
+		if len(envval) == 0 {
+			return "$" + in
+		}
+		return envval
+	})), outptr)
 }
 
 type StorageAddr struct {

server.go

@@ -354,6 +354,12 @@ func ConvertInterface(from interface{}, toType reflect.Type) reflect.Value {
 	case reflect.Bool:
 		val, _ := strconv.ParseBool(from.(string))
 		return reflect.ValueOf(val)
+
+	case reflect.String:
+		if toType == reflect.TypeOf(primitive.ObjectID{}) {
+			objid, _ := primitive.ObjectIDFromHex(from.(string))
+			return reflect.ValueOf(objid)
+		}
 	}
 
 	return fromrv.Convert(toType)

session/common.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"math/rand"
+	"strconv"
 	"strings"
 	"time"
 
@@ -20,6 +21,7 @@ type Authorization struct {
 	Platform    string `bson:"p" json:"p"`
 	Uid         string `bson:"u" json:"u"`
 	Alias       string `bson:"al" json:"al"`
+	CreatedTime int64  `bson:"ct" json:"ct"`
 }
 
 func (auth *Authorization) ToStrings() []string {
@@ -29,21 +31,24 @@ func (auth *Authorization) ToStrings() []string {
 		"u", auth.Uid,
 		"al", auth.Alias,
 		"inv", auth.invalidated,
+		"ct", strconv.FormatInt(auth.CreatedTime, 10),
 	}
 }
 
-func (auth *Authorization) Invalidated() bool {
+func (auth *Authorization) Valid() bool {
-	return len(auth.invalidated) > 0
+	return len(auth.invalidated) == 0 && !auth.Account.IsZero()
 }
 
 func MakeAuthrizationFromStringMap(src map[string]string) Authorization {
 	accid, _ := primitive.ObjectIDFromHex(src["a"])
+	ct, _ := strconv.ParseInt(src["ct"], 10, 0)
 	return Authorization{
 		Account:     accid,
 		Platform:    src["p"],
 		Uid:         src["u"],
 		Alias:       src["al"],
 		invalidated: src["inv"],
+		CreatedTime: ct,
 	}
 }
 
@@ -55,7 +60,7 @@ type Provider interface {
 }
 
 type Consumer interface {
-	Query(string) (Authorization, error)
+	Query(string) Authorization
 	Touch(string) (Authorization, error)
 	IsRevoked(primitive.ObjectID) bool
 	Revoke(string)
@@ -74,10 +79,6 @@ func make_storagekey(acc primitive.ObjectID) storagekey {
 	return storagekey(acc.Hex() + hex.EncodeToString(bs[2:]))
 }
 
-func AccountToSessionKey(acc primitive.ObjectID) string {
-	return string(make_storagekey(acc))
-}
-
 func storagekey_to_publickey(sk storagekey) publickey {
 	bs, _ := hex.DecodeString(string(sk))
 

session/impl_mongo.go

@@ -263,25 +263,25 @@ func (c *consumer_mongo) query_internal(sk storagekey) (*sessionMongo, bool, err
 	return nil, false, nil
 }
 
-func (c *consumer_mongo) Query(pk string) (Authorization, error) {
+func (c *consumer_mongo) Query(pk string) Authorization {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
 	sk := publickey_to_storagekey(publickey(pk))
 	si, _, err := c.query_internal(sk)
 	if err != nil {
-		return Authorization{}, err
+		return Authorization{}
 	}
 
 	if si == nil {
-		return Authorization{}, nil
+		return Authorization{}
 	}
 
 	if time.Now().After(si.Ts.Time().Add(c.ttl)) {
-		return Authorization{}, nil
+		return Authorization{}
 	}
 
-	return *si.Auth, nil
+	return *si.Auth
 }
 
 func (c *consumer_mongo) Touch(pk string) (Authorization, error) {

session/impl_redis.go

@@ -2,6 +2,7 @@ package session
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -243,37 +244,49 @@ func (c *consumer_redis) query_internal(sk storagekey) (*sessionRedis, error) {
 		expireAt:      time.Now().Add(ttl),
 	}
 
-	if auth.Invalidated() {
+	if auth.Valid() {
-		c.stages[0].deleted[sk] = si
-	} else {
 		c.add_internal(sk, si)
+	} else {
+		c.stages[0].deleted[sk] = si
 	}
 
 	return si, nil
 }
 
-func (c *consumer_redis) Query(pk string) (Authorization, error) {
+var errRevoked = errors.New("session revoked")
+var errExpired = errors.New("session expired")
+
+func (c *consumer_redis) Query(pk string) Authorization {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
 	sk := publickey_to_storagekey(publickey(pk))
+
+	if _, deleted := c.stages[0].deleted[sk]; deleted {
+		return Authorization{}
+	}
+
+	if _, deleted := c.stages[1].deleted[sk]; deleted {
+		return Authorization{}
+	}
+
 	si, err := c.query_internal(sk)
 	if err != nil {
 		logger.Println("session consumer query :", pk, err)
-		return Authorization{}, err
+		return Authorization{}
 	}
 
 	if si == nil {
 		logger.Println("session consumer query(si nil) :", pk, nil)
-		return Authorization{}, nil
+		return Authorization{}
 	}
 
 	if time.Now().After(si.expireAt) {
 		logger.Println("session consumer query(expired):", pk, nil)
-		return Authorization{}, nil
+		return Authorization{}
 	}
 
-	return *si.Authorization, nil
+	return *si.Authorization
 }
 
 func (c *consumer_redis) Touch(pk string) (Authorization, error) {

session/session_test.go

@@ -60,11 +60,11 @@ func TestExpTable(t *testing.T) {
 
 	go func() {
 		for {
-			q1, err := cs.Query(sk1)
+			q1 := cs.Query(sk1)
-			logger.Println("query :", q1, err)
+			logger.Println("query :", q1)
 
-			q2, err := cs.Query(sk2)
+			q2 := cs.Query(sk2)
-			logger.Println("query :", q2, err)
+			logger.Println("query :", q2)
 			time.Sleep(time.Second)
 		}
 	}()
@@ -87,7 +87,7 @@ func TestExpTable(t *testing.T) {
 		t.Error(err)
 	}
 
-	q2, err := cs2.Query(sk2)
+	q2 := cs2.Query(sk2)
-	logger.Println("queryf :", q2, err)
+	logger.Println("queryf :", q2)
 	time.Sleep(20 * time.Second)
 }

wshandler/wshandler.go

@@ -364,14 +364,15 @@ func (ws *WebsocketHandler) mainLoop(ctx context.Context) {
 				buffer := bytes.NewBuffer([]byte(raw.Payload))
 				dec := gob.NewDecoder(buffer)
 
-				if raw.Channel == ws.redisMsgChanName {
+				switch raw.Channel {
+				case ws.redisMsgChanName:
 					var msg UpstreamMessage
 					if err := dec.Decode(&msg); err == nil {
 						ws.deliveryChan <- &msg
 					} else {
 						logger.Println("decode UpstreamMessage failed :", err)
 					}
-				} else if raw.Channel == ws.redisCmdChanName {
+				case ws.redisCmdChanName:
 					var cmd commandMessage
 					if err := dec.Decode(&cmd); err == nil {
 						ws.deliveryChan <- &cmd
@@ -587,6 +588,8 @@ func (ws *WebsocketHandler) mainLoop(ctx context.Context) {
 			if c.Conn == nil {
 				delete(entireConns, c.sender.Accid.Hex())
 				go ws.ClientDisconnected(c)
+			} else if ws.sessionConsumer.IsRevoked(c.sender.Accid) {
+				c.Conn.MakeWriter().WriteControl(websocket.CloseMessage, unauthdata, time.Time{})
 			} else {
 				entireConns[c.sender.Accid.Hex()] = c
 				go ws.ClientConnected(c)
@@ -680,18 +683,13 @@ func (ws *WebsocketHandler) upgrade_nosession(w http.ResponseWriter, r *http.Req
 	accid := primitive.ObjectID(*raw)
 
 	sk := r.Header.Get("AS-X-SESSION")
-	authinfo, err := ws.sessionConsumer.Query(sk)
+	authinfo := ws.sessionConsumer.Query(sk)
-	if err != nil {
+	if !authinfo.Valid() {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	if authinfo.Account != accid {
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
 
-	if authinfo.Invalidated() {
+	if authinfo.Account != accid {
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
@@ -734,19 +732,8 @@ func (ws *WebsocketHandler) upgrade(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	authinfo, err := ws.sessionConsumer.Query(sk)
+	authinfo := ws.sessionConsumer.Query(sk)
-	if err != nil {
+	if !authinfo.Valid() {
-		w.WriteHeader(http.StatusInternalServerError)
-		logger.Error("authorize query failed :", err)
-		return
-	}
-
-	if authinfo.Account.IsZero() {
-		w.WriteHeader(http.StatusUnauthorized)
-		return
-	}
-
-	if authinfo.Invalidated() {
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}

wshandler/wshandler_peer.go

@@ -305,10 +305,12 @@ func (ws *websocketPeerHandler[T]) upgrade_noauth(w http.ResponseWriter, r *http
 	sk := r.Header.Get("AS-X-SESSION")
 	var accid primitive.ObjectID
 	if len(sk) > 0 {
-		authinfo, err := ws.sessionConsumer.Query(sk)
+		authinfo := ws.sessionConsumer.Query(sk)
-		if err == nil {
+		if !authinfo.Valid() {
-			accid = authinfo.Account
+			w.WriteHeader(http.StatusUnauthorized)
+			return
 		}
+		accid = authinfo.Account
 	}
 
 	if accid.IsZero() {
@@ -363,14 +365,8 @@ func (ws *websocketPeerHandler[T]) upgrade(w http.ResponseWriter, r *http.Reques
 	}()
 
 	sk := r.Header.Get("AS-X-SESSION")
-	authinfo, err := ws.sessionConsumer.Query(sk)
+	authinfo := ws.sessionConsumer.Query(sk)
-	if err != nil {
+	if !authinfo.Valid() {
-		w.WriteHeader(http.StatusInternalServerError)
-		logger.Error("authorize query failed :", err)
-		return
-	}
-
-	if authinfo.Account.IsZero() || authinfo.Invalidated() {
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}