Skip to content

Commit f3f888e

Browse files
Gustedearl-warren
authored andcommitted
[GITEA] Fix session generation for database
- If the session doesn't exist, it shouldn't be expected that the variable is non-nil. Define the session variable instead and insert that. - Add unit tests to test the behavior of the database sessions code . - Regression caused by dd30d9d. - Resolves https://codeberg.org/forgejo/forgejo/issues/2042 (cherry picked from commit 90307ad2004a9a9ddda30af4038224fedf0e6ca3) (cherry picked from commit 874ef1978d7db5e8ba1482d4c8190b914fa110b3) (cherry picked from commit 27d5f035fc744d932d1e4c95c55d98479fccf368) (cherry picked from commit 65dbc4303ba8afdef70c573aaf782b76aaf0bbad) [GITEA] Fix session generation for database (squash) timeutil.Mock because of e743570 * Refactor timeutil package (go-gitea#28623) (cherry picked from commit acc6b51be2b6d676129f653a8949b2c06aa2ad94) (cherry picked from commit 02b74317f2d8120a705599d6ae908634a1fa2b44) (cherry picked from commit 63b9b624bd203b7b5eff7439dbc09eeb9bc52ade) (cherry picked from commit 7752ff8baa525918e00193606048e3c2dd5a4999) (cherry picked from commit c0af4d943854ce3a77eaa75c06b04394301f45c4)
1 parent 41871ba commit f3f888e

File tree

1 file changed

+142
-0
lines changed

1 file changed

+142
-0
lines changed

models/auth/session_test.go

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
// Copyright 2023 The Forgejo Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package auth_test
5+
6+
import (
7+
"testing"
8+
"time"
9+
10+
"code.gitea.io/gitea/models/auth"
11+
"code.gitea.io/gitea/models/db"
12+
"code.gitea.io/gitea/models/unittest"
13+
"code.gitea.io/gitea/modules/timeutil"
14+
15+
"github.com/stretchr/testify/assert"
16+
)
17+
18+
func TestAuthSession(t *testing.T) {
19+
assert.NoError(t, unittest.PrepareTestDatabase())
20+
defer timeutil.MockUnset()
21+
22+
key := "I-Like-Free-Software"
23+
24+
t.Run("Create Session", func(t *testing.T) {
25+
// Ensure it doesn't exist.
26+
ok, err := auth.ExistSession(db.DefaultContext, key)
27+
assert.NoError(t, err)
28+
assert.False(t, ok)
29+
30+
preCount, err := auth.CountSessions(db.DefaultContext)
31+
assert.NoError(t, err)
32+
33+
now := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)
34+
timeutil.MockSet(now)
35+
36+
// New session is created.
37+
sess, err := auth.ReadSession(db.DefaultContext, key)
38+
assert.NoError(t, err)
39+
assert.EqualValues(t, key, sess.Key)
40+
assert.Empty(t, sess.Data)
41+
assert.EqualValues(t, now.Unix(), sess.Expiry)
42+
43+
// Ensure it exists.
44+
ok, err = auth.ExistSession(db.DefaultContext, key)
45+
assert.NoError(t, err)
46+
assert.True(t, ok)
47+
48+
// Ensure the session is taken into account for count..
49+
postCount, err := auth.CountSessions(db.DefaultContext)
50+
assert.NoError(t, err)
51+
assert.Greater(t, postCount, preCount)
52+
})
53+
54+
t.Run("Update session", func(t *testing.T) {
55+
data := []byte{0xba, 0xdd, 0xc0, 0xde}
56+
now := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
57+
timeutil.MockSet(now)
58+
59+
// Update session.
60+
err := auth.UpdateSession(db.DefaultContext, key, data)
61+
assert.NoError(t, err)
62+
63+
timeutil.MockSet(time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC))
64+
65+
// Read updated session.
66+
// Ensure data is updated and expiry is set from the update session call.
67+
sess, err := auth.ReadSession(db.DefaultContext, key)
68+
assert.NoError(t, err)
69+
assert.EqualValues(t, key, sess.Key)
70+
assert.EqualValues(t, data, sess.Data)
71+
assert.EqualValues(t, now.Unix(), sess.Expiry)
72+
73+
timeutil.MockSet(now)
74+
})
75+
76+
t.Run("Delete session", func(t *testing.T) {
77+
// Ensure it't exist.
78+
ok, err := auth.ExistSession(db.DefaultContext, key)
79+
assert.NoError(t, err)
80+
assert.True(t, ok)
81+
82+
preCount, err := auth.CountSessions(db.DefaultContext)
83+
assert.NoError(t, err)
84+
85+
err = auth.DestroySession(db.DefaultContext, key)
86+
assert.NoError(t, err)
87+
88+
// Ensure it doens't exists.
89+
ok, err = auth.ExistSession(db.DefaultContext, key)
90+
assert.NoError(t, err)
91+
assert.False(t, ok)
92+
93+
// Ensure the session is taken into account for count..
94+
postCount, err := auth.CountSessions(db.DefaultContext)
95+
assert.NoError(t, err)
96+
assert.Less(t, postCount, preCount)
97+
})
98+
99+
t.Run("Cleanup sessions", func(t *testing.T) {
100+
timeutil.MockSet(time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC))
101+
102+
_, err := auth.ReadSession(db.DefaultContext, "sess-1")
103+
assert.NoError(t, err)
104+
105+
// One minute later.
106+
timeutil.MockSet(time.Date(2023, 1, 1, 0, 1, 0, 0, time.UTC))
107+
_, err = auth.ReadSession(db.DefaultContext, "sess-2")
108+
assert.NoError(t, err)
109+
110+
// 5 minutes, shouldn't clean up anything.
111+
err = auth.CleanupSessions(db.DefaultContext, 5*60)
112+
assert.NoError(t, err)
113+
114+
ok, err := auth.ExistSession(db.DefaultContext, "sess-1")
115+
assert.NoError(t, err)
116+
assert.True(t, ok)
117+
118+
ok, err = auth.ExistSession(db.DefaultContext, "sess-2")
119+
assert.NoError(t, err)
120+
assert.True(t, ok)
121+
122+
// 1 minute, should clean up sess-1.
123+
err = auth.CleanupSessions(db.DefaultContext, 60)
124+
assert.NoError(t, err)
125+
126+
ok, err = auth.ExistSession(db.DefaultContext, "sess-1")
127+
assert.NoError(t, err)
128+
assert.False(t, ok)
129+
130+
ok, err = auth.ExistSession(db.DefaultContext, "sess-2")
131+
assert.NoError(t, err)
132+
assert.True(t, ok)
133+
134+
// Now, should clean up sess-2.
135+
err = auth.CleanupSessions(db.DefaultContext, 0)
136+
assert.NoError(t, err)
137+
138+
ok, err = auth.ExistSession(db.DefaultContext, "sess-2")
139+
assert.NoError(t, err)
140+
assert.False(t, ok)
141+
})
142+
}

0 commit comments

Comments
 (0)