peezy-tech/jojo
2
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2026-05-12 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update module code.forgejo.org/go-chi/session to v1.0.3 (forgejo) (#11324)

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11324
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
This commit is contained in:
Gusted 2026-03-20 08:18:51 +01:00
commit dc65408618
7 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -15,7 +15,7 @@ require (
code.forgejo.org/go-chi/binding v1.0.1
code.forgejo.org/go-chi/cache v1.0.1
code.forgejo.org/go-chi/captcha v1.0.2
code.forgejo.org/go-chi/session v1.0.2
code.forgejo.org/go-chi/session v1.0.3
code.gitea.io/sdk/gitea v0.21.0
code.superseriousbusiness.org/exif-terminator v0.11.1
code.superseriousbusiness.org/go-jpeg-image-structure/v2 v2.3.0

4
go.sum
View file

@ -40,8 +40,8 @@ code.forgejo.org/go-chi/cache v1.0.1 h1:w6IsDcPbeEnEYZn7M2HJe3/3/Ehtcw/72VjcVK7+
code.forgejo.org/go-chi/cache v1.0.1/go.mod h1:K3aQSyRIN4xiuqV1kanfQ6O4ToDpzDpY3bNOyGjFe3U=
code.forgejo.org/go-chi/captcha v1.0.2 h1:vyHDPXkpjDv8bLO9NqtWzZayzstD/WpJ5xwEkAaqZGQ=
code.forgejo.org/go-chi/captcha v1.0.2/go.mod h1:lxiPLcJ76UCZHoH31/Wbum4GUi2NgjfFZLrJkKv1lLE=
code.forgejo.org/go-chi/session v1.0.2 h1:pG+AXre9L9VXJmTaADXkmeEPuRalhmBXyv6tG2Rvjcc=
code.forgejo.org/go-chi/session v1.0.2/go.mod h1:HnEGyBny7WPzCiVLP2vzL5ssma+3gCSl/vLpuVNYrqc=
code.forgejo.org/go-chi/session v1.0.3 h1:ByJ9c/UC0AU57hxiGl53TXh+NdBOBwK/bhZ9jyadEwE=
code.forgejo.org/go-chi/session v1.0.3/go.mod h1:xzGtFrV/agCJoZCUhFDlqAr1he6BrAdqlaprKOB1W90=
code.forgejo.org/xorm/xorm v1.3.9-forgejo.8 h1:dsSKm2nus0NhHsqYxeuB3Gldk6TtlusD1CBGV6V1SS0=
code.forgejo.org/xorm/xorm v1.3.9-forgejo.8/go.mod h1:A7sFd3BFmRp20h6drSsCXgQRQdF8Vz8HuCSrzFS3m90=
code.gitea.io/sdk/gitea v0.21.0 h1:69n6oz6kEVHRo1+APQQyizkhrZrLsTLXey9142pfkD4=

5
modules/session/db.go
View file

@ -84,6 +84,11 @@ func (s *DBStore) Flush() error {
return nil
}
// True if no keys have been set
func (s *DBStore) Empty() bool {
return len(s.data) == 0
}
// DBProvider represents a DB session provider implementation.
type DBProvider struct {
maxLifetime int64

5
modules/session/redis.go
View file

@ -103,6 +103,11 @@ func (s *RedisStore) Flush() error {
return nil
}
// True if no keys have been set
func (s *RedisStore) Empty() bool {
return len(s.data) == 0
}
// RedisProvider represents a redis session provider implementation.
type RedisProvider struct {
c nosql.RedisClient

10
modules/session/virtual.go
View file

@ -76,7 +76,10 @@ func (o *VirtualSessionProvider) Exist(sid string) bool {
func (o *VirtualSessionProvider) Destroy(sid string) error {
o.lock.Lock()
defer o.lock.Unlock()
return o.provider.Destroy(sid)
if o.provider.Exist(sid) {
return o.provider.Destroy(sid)
}
return nil
}
// Regenerate regenerates a session store from old session ID to new one.
@ -195,3 +198,8 @@ func (s *VirtualStore) Flush() error {
s.data = make(map[any]any)
return nil
}
// True if no keys have been set
func (s *VirtualStore) Empty() bool {
return len(s.data) == 0
}

1
routers/common/middleware.go
View file

@ -118,5 +118,6 @@ func Sessioner() func(next http.Handler) http.Handler {
Secure: setting.SessionConfig.Secure,
SameSite: setting.SessionConfig.SameSite,
Domain: setting.SessionConfig.Domain,
DeferSetCookie: true,
})
}

22
tests/integration/create_no_session_test.go
View file

@ -6,7 +6,6 @@ package integration
import (
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"testing"
@ -31,8 +30,9 @@ func getSessionID(t *testing.T, resp *httptest.ResponseRecorder) string {
found = true
}
}
assert.True(t, found)
assert.NotEmpty(t, sessionID)
if found {
assert.NotEmpty(t, sessionID)
}
return sessionID
}
@ -40,18 +40,6 @@ func sessionFile(tmpDir, sessionID string) string {
return filepath.Join(tmpDir, sessionID[0:1], sessionID[1:2], sessionID)
}
func sessionFileExist(t *testing.T, tmpDir, sessionID string) bool {
sessionFile := sessionFile(tmpDir, sessionID)
_, err := os.Lstat(sessionFile)
if err != nil {
if os.IsNotExist(err) {
return false
}
require.NoError(t, err)
}
return true
}
func TestSessionFileCreation(t *testing.T) {
defer tests.PrepareTestEnv(t)()
defer test.MockProtect(&setting.SessionConfig.ProviderConfig)()
@ -82,7 +70,7 @@ func TestSessionFileCreation(t *testing.T) {
sessionID := getSessionID(t, resp)
// We're not logged in so there should be no session
assert.False(t, sessionFileExist(t, tmpDir, sessionID))
assert.Empty(t, sessionID)
})
t.Run("CreateSessionOnLogin", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
@ -92,7 +80,7 @@ func TestSessionFileCreation(t *testing.T) {
sessionID := getSessionID(t, resp)
// We're not logged in so there should be no session
assert.False(t, sessionFileExist(t, tmpDir, sessionID))
assert.Empty(t, sessionID)
req = NewRequestWithValues(t, "POST", "/user/login", map[string]string{
"user_name": "user2",