github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-06 08:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(session): remove duplicate method, token expiry must be shorter than inactivity timeout

Browse Source
This commit is contained in:
Trong Huu Nguyen
2023-02-21 15:34:50 +01:00
parent 9074547163
commit 2796e1c9bc
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/session/data.go
View File

@@ -208,10 +208,6 @@ func (in *Metadata) TokenLifetime() time.Duration {
return in.Tokens.ExpireAt.Sub(in.Tokens.RefreshedAt)
}
func (in *Metadata) ExtendTimeout(duration time.Duration) {
in.Session.TimeoutAt = time.Now().Add(duration)
}
func (in *Metadata) IsTimedOut() bool {
if in.Session.TimeoutAt.IsZero() {
return false
@@ -221,7 +217,12 @@ func (in *Metadata) IsTimedOut() bool {
}
func (in *Metadata) WithTimeout(timeoutIn time.Duration) {
in.Session.TimeoutAt = time.Now().Add(timeoutIn)
timeoutAt := time.Now().Add(timeoutIn)
in.Session.TimeoutAt = timeoutAt
if timeoutAt.Before(in.Tokens.ExpireAt) {
in.Tokens.ExpireAt = timeoutAt
}
}
func (in *Metadata) Verbose() MetadataVerbose {

32
pkg/session/data_test.go
View File

@@ -56,17 +56,24 @@ func TestMetadata_WithTimeout(t *testing.T) {
tokenLifetime := 30 * time.Minute
sessionLifetime := time.Hour
sessionInactivityTimeout := 15 * time.Minute
metadata := session.NewMetadata(tokenLifetime, sessionLifetime)
metadata.WithTimeout(sessionInactivityTimeout)
maxDelta := time.Second
metadata := session.NewMetadata(tokenLifetime, sessionLifetime)
assert.WithinDuration(t, time.Now().Add(tokenLifetime), metadata.Tokens.ExpireAt, maxDelta)
metadata.WithTimeout(sessionInactivityTimeout)
assert.False(t, metadata.Session.TimeoutAt.IsZero())
assert.WithinDuration(t, time.Now().Add(sessionInactivityTimeout), metadata.Tokens.ExpireAt, maxDelta)
assert.WithinDuration(t, metadata.Session.TimeoutAt, metadata.Tokens.ExpireAt, maxDelta)
expected := time.Now().Add(sessionInactivityTimeout)
actual := metadata.Session.TimeoutAt
assert.WithinDuration(t, expected, actual, maxDelta)
previousTimeoutAt := metadata.Session.TimeoutAt
time.Sleep(100 * time.Millisecond)
metadata.WithTimeout(sessionInactivityTimeout)
assert.True(t, metadata.Session.TimeoutAt.After(previousTimeoutAt))
}
func TestMetadata_IsExpired(t *testing.T) {
@@ -338,23 +345,6 @@ func TestMetadata_Verbose_WithTimeout(t *testing.T) {
assert.WithinDuration(t, expected, actual, maxDelta)
}
func TestMetadata_ExtendTimeout(t *testing.T) {
tokenLifetime := 30 * time.Minute
sessionLifetime := time.Hour
timeout := 15 * time.Minute
metadata := session.NewMetadata(tokenLifetime, sessionLifetime)
metadata.WithTimeout(timeout)
previousTimeoutAt := metadata.Session.TimeoutAt
time.Sleep(100 * time.Millisecond)
metadata.ExtendTimeout(timeout)
assert.True(t, metadata.Session.TimeoutAt.After(previousTimeoutAt))
}
func TestMetadata_IsTimedOut(t *testing.T) {
tokenLifetime := 30 * time.Minute
sessionLifetime := time.Hour

2
pkg/session/session_manager.go
View File

@@ -204,7 +204,7 @@ func (in *manager) Refresh(r *http.Request, sess *Session) (*Session, error) {
sess.data.Metadata.Refresh(resp.ExpiresIn)
if in.cfg.Session.Inactivity {
sess.data.Metadata.ExtendTimeout(in.cfg.Session.InactivityTimeout)
sess.data.Metadata.WithTimeout(in.cfg.Session.InactivityTimeout)
}
err = in.update(ctx, sess)