Use filesystem session store (#240)

This commit is contained in:
Thomas Miceli 2024-04-03 01:48:31 +02:00
parent ef004675a5
commit a97d9cdbf4
6 changed files with 48 additions and 10 deletions

2
go.mod
View file

@ -11,6 +11,7 @@ require (
github.com/glebarez/sqlite v1.10.0 github.com/glebarez/sqlite v1.10.0
github.com/go-playground/validator/v10 v10.16.0 github.com/go-playground/validator/v10 v10.16.0
github.com/google/uuid v1.5.0 github.com/google/uuid v1.5.0
github.com/gorilla/securecookie v1.1.2
github.com/gorilla/sessions v1.2.2 github.com/gorilla/sessions v1.2.2
github.com/hashicorp/go-memdb v1.3.4 github.com/hashicorp/go-memdb v1.3.4
github.com/labstack/echo/v4 v4.11.4 github.com/labstack/echo/v4 v4.11.4
@ -57,7 +58,6 @@ require (
github.com/golang/protobuf v1.5.3 // indirect github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect

View file

@ -87,6 +87,9 @@ func Initialize(ctx *cli.Context) {
log.Fatal().Err(err).Msg("Failed to create symlinks") log.Fatal().Err(err).Msg("Failed to create symlinks")
} }
if err := os.MkdirAll(filepath.Join(homePath, "sessions"), 0755); err != nil {
log.Fatal().Err(err).Send()
}
if err := os.MkdirAll(filepath.Join(homePath, "repos"), 0755); err != nil { if err := os.MkdirAll(filepath.Join(homePath, "repos"), 0755); err != nil {
log.Fatal().Err(err).Send() log.Fatal().Err(err).Send()
} }

26
internal/utils/session.go Normal file
View file

@ -0,0 +1,26 @@
package utils
import (
"github.com/gorilla/securecookie"
"github.com/rs/zerolog/log"
"os"
)
func ReadKey(filePath string) []byte {
key, err := os.ReadFile(filePath)
if err == nil {
return key
}
key = securecookie.GenerateRandomKey(32)
if key == nil {
log.Fatal().Msg("Failed to generate a new key for sessions")
}
err = os.WriteFile(filePath, key, 0600)
if err != nil {
log.Fatal().Err(err).Msgf("Failed to save the key to %s", filePath)
}
return key
}

View file

@ -36,7 +36,8 @@ import (
var ( var (
dev bool dev bool
store *sessions.CookieStore flashStore *sessions.CookieStore // session store for flash messages
userStore *sessions.FilesystemStore // session store for user sessions
re = regexp.MustCompile("[^a-z0-9]+") re = regexp.MustCompile("[^a-z0-9]+")
fm = template.FuncMap{ fm = template.FuncMap{
"split": strings.Split, "split": strings.Split,
@ -160,8 +161,13 @@ type Server struct {
func NewServer(isDev bool) *Server { func NewServer(isDev bool) *Server {
dev = isDev dev = isDev
store = sessions.NewCookieStore([]byte("opengist")) flashStore = sessions.NewCookieStore([]byte("opengist"))
gothic.Store = store userStore = sessions.NewFilesystemStore(path.Join(config.GetHomeDir(), "sessions"),
utils.ReadKey(path.Join(config.GetHomeDir(), "sessions", "session-auth.key")),
utils.ReadKey(path.Join(config.GetHomeDir(), "sessions", "session-encrypt.key")),
)
userStore.MaxLength(10 * 1024)
gothic.Store = userStore
e := echo.New() e := echo.New()
e.HideBanner = true e.HideBanner = true

View file

@ -142,6 +142,9 @@ func setup(t *testing.T) {
homePath := config.GetHomeDir() homePath := config.GetHomeDir()
log.Info().Msg("Data directory: " + homePath) log.Info().Msg("Data directory: " + homePath)
err = os.MkdirAll(filepath.Join(homePath, "sessions"), 0755)
require.NoError(t, err, "Could not create sessions directory")
err = os.MkdirAll(filepath.Join(homePath, "tmp", "repos"), 0755) err = os.MkdirAll(filepath.Join(homePath, "tmp", "repos"), 0755)
require.NoError(t, err, "Could not create tmp repos directory") require.NoError(t, err, "Could not create tmp repos directory")

View file

@ -68,7 +68,7 @@ func getUserLogged(ctx echo.Context) *db.User {
} }
func setErrorFlashes(ctx echo.Context) { func setErrorFlashes(ctx echo.Context) {
sess, _ := store.Get(ctx.Request(), "flash") sess, _ := flashStore.Get(ctx.Request(), "flash")
setData(ctx, "flashErrors", sess.Flashes("error")) setData(ctx, "flashErrors", sess.Flashes("error"))
setData(ctx, "flashSuccess", sess.Flashes("success")) setData(ctx, "flashSuccess", sess.Flashes("success"))
@ -77,13 +77,13 @@ func setErrorFlashes(ctx echo.Context) {
} }
func addFlash(ctx echo.Context, flashMessage string, flashType string) { func addFlash(ctx echo.Context, flashMessage string, flashType string) {
sess, _ := store.Get(ctx.Request(), "flash") sess, _ := flashStore.Get(ctx.Request(), "flash")
sess.AddFlash(flashMessage, flashType) sess.AddFlash(flashMessage, flashType)
_ = sess.Save(ctx.Request(), ctx.Response()) _ = sess.Save(ctx.Request(), ctx.Response())
} }
func getSession(ctx echo.Context) *sessions.Session { func getSession(ctx echo.Context) *sessions.Session {
sess, _ := store.Get(ctx.Request(), "session") sess, _ := userStore.Get(ctx.Request(), "session")
return sess return sess
} }