fix(singleuser): fix bugs in single user handlers

src/server/config.go

@@ -6,13 +6,21 @@ type FSConfig struct {
 	OpenTTL    int    `json:"openTTL"`
 }
 
+type UsersCfg struct {
+	EnableAuth     bool `json:"enableAuth"`
+	CookieTTL      int  `json:"cookieTTL"`
+	CookieSecure   bool `json:"cookieSecure"`
+	CookieHttpOnly bool `json:"cookieHttpOnly"`
+}
+
 type Secrets struct {
 	TokenSecret string `json:"tokenSecret" cfg:"env"`
 }
 
 type ServerCfg struct {
 	Debug          bool   `json:"debug"`
-	Addr           string `json:"addr"`
+	Host           string `json:"host"`
+	Port           int    `json:"port"`
 	ReadTimeout    int    `json:"readTimeout"`
 	WriteTimeout   int    `json:"writeTimeout"`
 	MaxHeaderBytes int    `json:"maxHeaderBytes"`
@@ -22,6 +30,7 @@ type Config struct {
 	Fs      *FSConfig  `json:"fs"`
 	Secrets *Secrets   `json:"secrets"`
 	Server  *ServerCfg `json:"server"`
+	Users   *UsersCfg  `json:"users"`
 }
 
 func NewEmptyConfig() *Config {
@@ -35,12 +44,19 @@ func NewDefaultConfig() *Config {
 			OpensLimit: 128,
 			OpenTTL:    60, // 1 min
 		},
+		Users: &UsersCfg{
+			EnableAuth:     true,
+			CookieTTL:      3600 * 24 * 7, // 1 week
+			CookieSecure:   false,
+			CookieHttpOnly: true,
+		},
 		Secrets: &Secrets{
 			TokenSecret: "",
 		},
 		Server: &ServerCfg{
 			Debug:          false,
-			Addr:           "127.0.0.1:8888",
+			Host:           "127.0.0.1",
+			Port:           8888,
 			ReadTimeout:    2000,
 			WriteTimeout:   2000,
 			MaxHeaderBytes: 512,

src/server/server.go

@@ -43,7 +43,7 @@ func NewServer(cfg gocfg.ICfg) (*Server, error) {
 
 	srv := &http.Server{
 		// TODO: set more options
-		Addr:           cfg.GrabString("Server.Addr"),
+		Addr:           fmt.Sprintf("%s:%d", cfg.GrabString("Server.Host"), cfg.GrabInt("Server.Port")),
 		Handler:        router,
 		ReadTimeout:    time.Duration(cfg.GrabInt("Server.ReadTimeout")) * time.Millisecond,
 		WriteTimeout:   time.Duration(cfg.GrabInt("Server.WriteTimeout")) * time.Millisecond,
@@ -84,11 +84,17 @@ func initDeps(cfg gocfg.ICfg) *depidx.Deps {
 	opensLimit := cfg.GrabInt("Fs.OpensLimit")
 	openTTL := cfg.GrabInt("Fs.OpenTTL")
 
+	ider := simpleidgen.New()
 	filesystem := local.NewLocalFS(rootPath, 0660, opensLimit, openTTL)
 	jwtEncDec := jwt.NewJWTEncDec(secret)
 	logger := simplelog.NewSimpleLogger()
 	kv := boltdbpvd.New(".", 1024)
-	ider := simpleidgen.New()
+	if err := kv.AddNamespace(singleuserhdr.UsersNamespace); err != nil {
+		panic(err)
+	}
+	if err := kv.AddNamespace(singleuserhdr.RolesNamespace); err != nil {
+		panic(err)
+	}
 
 	deps := depidx.NewDeps(cfg)
 	deps.SetFS(filesystem)
@@ -107,15 +113,19 @@ func initDeps(cfg gocfg.ICfg) *depidx.Deps {
 }
 
 func addHandlers(router *gin.Engine, cfg gocfg.ICfg, deps *depidx.Deps) (*gin.Engine, error) {
+	userHdrs := singleuserhdr.NewSimpleUserHandlers(cfg, deps)
+	fileHdrs, err := fileshdr.NewFileHandlers(cfg, deps)
+
+	// middleware
+	router.Use(userHdrs.Auth())
+
 	v1 := router.Group("/v1")
 
 	users := v1.Group("/users")
-	userHdrs := singleuserhdr.NewSimpleUserHandlers(cfg, deps)
 	users.POST("/login", userHdrs.Login)
 	users.POST("/logout", userHdrs.Logout)
 
 	filesSvc := v1.Group("/fs")
-	fileHdrs, err := fileshdr.NewFileHandlers(cfg, deps)
 	if err != nil {
 		panic(err)
 	}

src/server/server_files_test.go

@@ -36,11 +36,14 @@ func TestFileHandlers(t *testing.T) {
 	root := "./testData"
 	chunkSize := 2
 	config := `{
-		"Server": {
-			"Debug": true
+		"users": {
+			"enableAuth": false
 		},
-		"FS": {
-			"Root": "./testData"
+		"server": {
+			"debug": true
+		},
+		"fs": {
+			"root": "./testData"
 		}
 	}`