feat. add tls, basic-auth support

Author: PotatoCloud

cmd/rqctl/main.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/RealFax/RedQueen/internal/version"
-	client2 "github.com/RealFax/RedQueen/pkg/client"
+	"github.com/RealFax/RedQueen/pkg/client"
 	"net/netip"
 	"os"
 	"strings"
@@ -23,7 +23,7 @@ const (
 )
 
 var (
-	invoker *client2.Client
+	invoker *client.Client
 )
 
 func dialRQ() error {
@@ -47,8 +47,8 @@ func dialRQ() error {
 		endpoints[i] = addr
 	}
 
-	client2.SetMaxOpenConn(1)
-	if invoker, err = client2.New(
+	client.SetMaxOpenConn(1)
+	if invoker, err = client.New(
 		context.Background(),
 		endpoints,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),

cmd/rqd/main.go

@@ -3,42 +3,39 @@ package main
 import (
 	"fmt"
 	"github.com/RealFax/RedQueen/internal/rqd"
+	"github.com/RealFax/RedQueen/internal/rqd/config"
 	"github.com/RealFax/RedQueen/internal/version"
 	"os"
 	"os/signal"
 	"syscall"
-
-	"github.com/RealFax/RedQueen/config"
 )
 
 func main() {
 	fmt.Println("Version:", version.String())
 
 	cfg, err := config.New(os.Args...)
 	if err != nil {
-		fmt.Println("[-] parse config failed, ", err)
+		fmt.Println("[-] Failed parse config, : ", err)
 		return
 	}
 
 	server, err := rqd.NewServer(cfg)
 	if err != nil {
-		fmt.Println("[-] init server failed, ", err)
+		fmt.Println("[-] Failed to initialize server, ", err)
 		return
 	}
-	defer server.Close()
+	defer server.Shutdown() //
 
 	if err = server.ListenAndServe(); err != nil {
-		fmt.Println("[-] listen client failed, ", err)
+		fmt.Println("[-] Failed run server, ", err)
 		return
 	}
 
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, syscall.SIGTERM, syscall.SIGINT)
 	select {
 	case <-c:
-		if err = server.Close(); err != nil {
-			fmt.Println("[-] server close failed, ", err)
-		}
+		server.Shutdown()
 		return
 	}
 }

config.toml

@@ -3,9 +3,15 @@ id = "node-1"
 data-dir = "/tmp/red_queen"
 listen-peer-addr = "127.0.0.1:5290"
 listen-client-addr = "127.0.0.1:5230"
+listen-http-addr = "127.0.0.1:5231"
 max-snapshots = 5
 requests-merged = false
 
+    [node.tls]
+    auto = true
+    cert-file = ""
+    key-file = ""
+
 [store]
 # backend options
 # nuts
@@ -19,28 +25,21 @@ backend = "nuts"
 [cluster]
     [[cluster.bootstrap]]
     name = "node-1"
-    peer-addr = "127.0.0.1:2539"
-
-    [[cluster.bootstrap]]
-    name = "node-3"
-    peer-addr = "127.0.0.1:3539"
-
-    [[cluster.bootstrap]]
-    name = "node-1"
-    peer-addr = "127.0.0.1:4539"
-
-token = "red-queen-cluster"
+    peer-addr = "127.0.0.1:5290"
 
-[log]
-# logger options
-# zap, internal
-logger = ""
-debug = false
+#    [[cluster.bootstrap]]
+#    name = "node-3"
+#    peer-addr = "127.0.0.1:4290"
+#
+#    [[cluster.bootstrap]]
+#    name = "node-1"
+#    peer-addr = "127.0.0.1:3290"
 
 [misc]
 pprof = false
 # metrics = "basic"
 # metrics-addr = "localhost:8090"
 
-[auth]
-token = "RED_QUEEN_AUTH_TOKEN"
+[basic-auth]
+root = "toor"
+admin = "123456"

config.toml.exam

@@ -3,9 +3,15 @@ id = "node-1"
 data-dir = "/tmp/red_queen"
 listen-peer-addr = "127.0.0.1:5290"
 listen-client-addr = "0.0.0.0:5230"
+listen-http-addr = "0.0.0.0:5231"
 max-snapshots = 5
 requests-merged = false
 
+    [node.tls]
+    auto = false
+    cert-file = ""
+    key-file = ""
+
 [store]
 # backend options
 # nuts
@@ -19,17 +25,15 @@ backend = "nuts"
 [cluster]
     [[cluster.bootstrap]]
     name = "node-1"
-    peer-addr = "127.0.0.1:2539"
+    peer-addr = "127.0.0.1:5290"
 
     [[cluster.bootstrap]]
     name = "node-3"
-    peer-addr = "127.0.0.1:3539"
+    peer-addr = "127.0.0.1:4290"
 
     [[cluster.bootstrap]]
     name = "node-1"
-    peer-addr = "127.0.0.1:4539"
-
-token = "red-queen-cluster"
+    peer-addr = "127.0.0.1:3290"
 
 [log]
 # logger options
@@ -40,5 +44,6 @@ debug = false
 [misc]
 pprof = false
 
-[auth]
-token = "RED_QUEEN_AUTH_TOKEN"
+[basic-auth]
+root = "toor"
+admin = "123456"

go.mod

@@ -7,9 +7,11 @@ require (
 	github.com/RealFax/order-map v1.0.0
 	github.com/cespare/xxhash v1.1.0
 	github.com/google/uuid v1.6.0
+	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/raft v1.6.0
 	github.com/hashicorp/raft-boltdb/v2 v2.3.0
 	github.com/json-iterator/go v1.1.12
+	github.com/julienschmidt/httprouter v1.3.0
 	github.com/nutsdb/nutsdb v0.14.3
 	github.com/pkg/errors v0.9.1
 	github.com/urfave/cli/v2 v2.25.7
@@ -27,7 +29,6 @@ require (
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
 	github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
@@ -44,6 +45,5 @@ require (
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 )

go.sum

@@ -3,10 +3,6 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/RealFax/order-map v0.2.0 h1:/nvwx7T+q+pK9XKRuSc5+Meq3OC5JhpbxboEUVsa8ts=
-github.com/RealFax/order-map v0.2.0/go.mod h1:3HMq8xuFFVFvhxvh3siZIxfYR8fUexke/R9+Jl+5gmU=
-github.com/RealFax/order-map v0.6.0 h1:eqR3vUSCvklI0CQzfWiiyPaRX7VCYL1P4NouxWsK968=
-github.com/RealFax/order-map v0.6.0/go.mod h1:9uJpPwF3/Vbyoq6M0pI9fUpvYFYOjLlidBvyZR0XTkE=
 github.com/RealFax/order-map v1.0.0 h1:J6kRc7DEg9DqkxZk1gj7bTQYg3HK+in6JBig8gOQev4=
 github.com/RealFax/order-map v1.0.0/go.mod h1:9uJpPwF3/Vbyoq6M0pI9fUpvYFYOjLlidBvyZR0XTkE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -56,12 +52,9 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -89,6 +82,8 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -168,8 +163,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -187,30 +180,18 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
-google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
-google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
-google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
 google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
 google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=