Merge in DNS/adguard-home from AGDNS-2743-aghuser-session to master Squashed commit of the following: commit 74fd4bc11eaf784880855fa2c710a747428db146 Merge: 844e865f67d479babaAuthor: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 18 18:14:36 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit 844e865f647efb4de7f057c392894c8f65bab422 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 18 15:18:44 2025 +0300 aghuser: imp fmt commit 584288e0a3ddbe6d7ae31c80c22b8f397cfd0cae Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 20:16:54 2025 +0300 aghuser: imp tests commit ea4c8735585f6d30d6dedf2a40a8dd6b07609d07 Merge: c3fd8fe5e3521e8ed9Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 20:10:06 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit c3fd8fe5eabaf2022a971197c018e140c254006d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 17 15:23:45 2025 +0300 aghuser: imp tests commit dfd9aba337227a8d3edc6f5a68f3f039afd1ca0b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 16 21:40:14 2025 +0300 aghuser: imp code commit b6e75223bf7960f3a2e94c1a3ed7cc33539b9806 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 14 21:49:20 2025 +0300 aghuser: imp code commit 56d6f9d478eec399c376992ffb0f1ca5b797986d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 11 16:58:11 2025 +0300 aghuser: user db commit 6fdc2f60bf7f93e72d917abb12af8e4867143b6d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:11:22 2025 +0300 all: upd scripts commit 575946756f3f622360c5feafe3e721eee010e230 Merge: 7e1fac4ec1cc6c00e4Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:05:46 2025 +0300 Merge branch 'master' into AGDNS-2743-aghuser-session commit 7e1fac4ecb1bde0013bca3f6b64e82d81a78c9c3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 10 14:05:35 2025 +0300 aghuser: session storage commit acfb040f0bdff501c7304ea100b9faf1c07291ae Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 8 15:54:24 2025 +0300 aghuser: session
163 lines
3.7 KiB
Go
163 lines
3.7 KiB
Go
package aghuser_test
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghuser"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"github.com/AdguardTeam/golibs/testutil"
|
|
"github.com/AdguardTeam/golibs/testutil/faketime"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// addSession is a helper function that saves and returns a session for a newly
|
|
// generated [aghuser.User] by login.
|
|
func addSession(
|
|
tb testing.TB,
|
|
ctx context.Context,
|
|
ds aghuser.SessionStorage,
|
|
login aghuser.Login,
|
|
) (s *aghuser.Session) {
|
|
tb.Helper()
|
|
|
|
s, err := ds.New(ctx, &aghuser.User{
|
|
ID: aghuser.MustNewUserID(),
|
|
Login: login,
|
|
})
|
|
require.NoError(tb, err)
|
|
require.NotNil(tb, s)
|
|
|
|
var got *aghuser.Session
|
|
got, err = ds.FindByToken(ctx, s.Token)
|
|
require.NoError(tb, err)
|
|
require.NotNil(tb, got)
|
|
|
|
assert.Equal(tb, login, got.UserLogin)
|
|
|
|
return s
|
|
}
|
|
|
|
func TestDefaultSessionStorage(t *testing.T) {
|
|
const (
|
|
userLoginFirst aghuser.Login = "user_one"
|
|
userLoginSecond aghuser.Login = "user_two"
|
|
)
|
|
|
|
var (
|
|
ctx = testutil.ContextWithTimeout(t, testTimeout)
|
|
logger = slogutil.NewDiscardLogger()
|
|
)
|
|
|
|
const (
|
|
sessionTTL = time.Minute
|
|
timeStep = time.Second
|
|
)
|
|
|
|
// Set up a mock clock to test expired sessions. Each call to [clock.Now]
|
|
// will return the [date] incremented by [timeStep].
|
|
date := time.Now()
|
|
clock := &faketime.Clock{
|
|
OnNow: func() (now time.Time) {
|
|
date = date.Add(timeStep)
|
|
|
|
return date
|
|
},
|
|
}
|
|
|
|
dbFile, err := os.CreateTemp(t.TempDir(), "sessions.db")
|
|
require.NoError(t, err)
|
|
testutil.CleanupAndRequireSuccess(t, dbFile.Close)
|
|
|
|
userDB := aghuser.NewDefaultDB()
|
|
|
|
err = userDB.Create(ctx, &aghuser.User{
|
|
Login: userLoginFirst,
|
|
ID: aghuser.MustNewUserID(),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
err = userDB.Create(ctx, &aghuser.User{
|
|
Login: userLoginSecond,
|
|
ID: aghuser.MustNewUserID(),
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
var (
|
|
ds *aghuser.DefaultSessionStorage
|
|
|
|
sessionFirst *aghuser.Session
|
|
sessionSecond *aghuser.Session
|
|
)
|
|
|
|
require.True(t, t.Run("prepare_session_storage", func(t *testing.T) {
|
|
ds, err = aghuser.NewDefaultSessionStorage(ctx, &aghuser.DefaultSessionStorageConfig{
|
|
Clock: clock,
|
|
UserDB: userDB,
|
|
Logger: logger,
|
|
DBPath: dbFile.Name(),
|
|
SessionTTL: sessionTTL,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
sessionFirst = addSession(t, ctx, ds, userLoginFirst)
|
|
|
|
// Advance time to ensure the first session expires before creating the
|
|
// second session.
|
|
date = date.Add(time.Hour)
|
|
|
|
sessionSecond = addSession(t, ctx, ds, userLoginSecond)
|
|
|
|
err = ds.Close()
|
|
require.NoError(t, err)
|
|
}))
|
|
|
|
require.True(t, t.Run("load_sessions", func(t *testing.T) {
|
|
ds, err = aghuser.NewDefaultSessionStorage(ctx, &aghuser.DefaultSessionStorageConfig{
|
|
Clock: clock,
|
|
UserDB: userDB,
|
|
Logger: logger,
|
|
DBPath: dbFile.Name(),
|
|
SessionTTL: sessionTTL,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
var got *aghuser.Session
|
|
got, err = ds.FindByToken(ctx, sessionFirst.Token)
|
|
require.NoError(t, err)
|
|
|
|
assert.Nil(t, got)
|
|
|
|
got, err = ds.FindByToken(ctx, sessionSecond.Token)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, got)
|
|
|
|
assert.Equal(t, userLoginSecond, got.UserLogin)
|
|
|
|
err = ds.DeleteByToken(ctx, sessionSecond.Token)
|
|
require.NoError(t, err)
|
|
|
|
got, err = ds.FindByToken(ctx, sessionSecond.Token)
|
|
require.NoError(t, err)
|
|
|
|
assert.Nil(t, got)
|
|
}))
|
|
|
|
require.True(t, t.Run("expired_session", func(t *testing.T) {
|
|
testutil.CleanupAndRequireSuccess(t, ds.Close)
|
|
|
|
sessionFirst = addSession(t, ctx, ds, userLoginFirst)
|
|
|
|
date = date.Add(time.Hour)
|
|
|
|
var got *aghuser.Session
|
|
got, err = ds.FindByToken(ctx, sessionFirst.Token)
|
|
require.NoError(t, err)
|
|
|
|
assert.Nil(t, got)
|
|
}))
|
|
}
|