github/filestash
4
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash.git synced 2026-10-19 16:14:39 +00:00
Code Issues Releases Wiki Activity

fix (log): additional debug logs

Browse Source
This commit is contained in:
MickaelK
2026-10-13 01:13:53 +11:00
parent 15dc751989
commit 8c3bc7e8af
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/pkg/session/from.go
+11 -6
View File
@@ -1,13 +1,13 @@
package session
import (
"encoding/json"
"net/http"
"time"
"encoding/json"
. "github.com/mickael-kerjean/filestash/server/pkg/core"
. "github.com/mickael-kerjean/filestash/server/pkg/utils"
"github.com/mickael-kerjean/filestash/server/pkg/env"
. "github.com/mickael-kerjean/filestash/server/pkg/utils"
)
func FromRequest(req *http.Request, ctx *App) (map[string]string, error) {
@@ -21,31 +21,36 @@ func FromRequest(req *http.Request, ctx *App) (map[string]string, error) {
str, err = DecryptString(env.SECRET_KEY_DERIVATE_FOR_USER, ctx.Share.Auth)
if err != nil {
// This typically happen when changing the secret key
Log.Debug("pkg::session::from action=token_decrypt source=share error=%s", err)
return session, ErrNotAuthorized
}
err = json.Unmarshal([]byte(str), &session)
if err = json.Unmarshal([]byte(str), &session); err != nil {
Log.Debug("pkg::session::from action=token_unmarshal source=share error=%q", err)
}
session["path"] = ctx.Share.Path
return session, err
}
if ctx.Authorization == "" {
Log.Debug("pkg::session::from action=restore reason=missing_token")
return session, nil
}
str, err = DecryptString(env.SECRET_KEY_DERIVATE_FOR_USER, ctx.Authorization)
if err != nil {
// This typically happen when changing the secret key
Log.Debug("middleware::session decrypt error '%s'", err.Error())
Log.Debug("pkg::session::from action=token_decrypt source=token error=%q", err)
return session, ErrNotAuthorized
}
if err = json.Unmarshal([]byte(str), &session); err != nil {
Log.Debug("pkg::session::from action=token_unmarshal source=token error=%q", err)
return session, err
}
t, err := time.Parse(time.RFC3339, session["timestamp"])
if err != nil {
Log.Warning("middleware::session 'cannot parse time - %s'", err.Error())
Log.Warning("pkg::session::from action=parse_time err=%q", err.Error())
return session, ErrNotAuthorized
} else if t.Add(24 * 365 * time.Hour).Before(time.Now()) {
Log.Warning("middleware::session 'cookie too old - %s'", t.Format(time.RFC3339))
Log.Warning("pkg::session::from action=cookie_old time=%q", t.Format(time.RFC3339))
return session, ErrNotAuthorized
}
return session, err
server/pkg/session/middleware.go
+2 -1
View File
@@ -38,14 +38,15 @@ func Start(fn HandlerFunc) HandlerFunc {
}
if ctx.Backend, err = _extractBackend(req, ctx); err != nil {
if len(ctx.Session) == 0 {
Log.Debug("middleware::session::start action=extractBackend reason=no+session error=%q", err)
SendErrorResult(res, ErrNotAuthorized)
return
}
Log.Debug("middleware::session::start action=extractBackend error=%q", err)
SendErrorResult(res, err)
return
}
ctx.Languages = _extractLanguages(req)
fn(ctx, res, req)
})
}