go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-06-23 00:40:46 +02:00
Code Issues Releases Activity

Move validateSession back into refreshSessionIfNeeded

Browse Source
This commit is contained in:
Kevin Kreitner
2021-10-11 16:50:26 +02:00
committed by Joel Speed
parent ad8ce2f6a4
commit d9e0933e54
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/middleware/stored_session_test.go
View File

@ -460,6 +460,7 @@ var _ = Describe("Stored Session Suite", func() {
session *sessionsapi.SessionState
expectedErr error
expectRefreshed bool
expectValidated bool
expectedLockState TestLock
}
@ -469,6 +470,7 @@ var _ = Describe("Stored Session Suite", func() {
DescribeTable("with a session",
func(in refreshSessionIfNeededTableInput) {
refreshed := false
validated := false
store := &fakeSessionStore{}
if in.sessionStored {
@ -496,6 +498,7 @@ var _ = Describe("Stored Session Suite", func() {
}
},
sessionValidator: func(_ context.Context, ss *sessionsapi.SessionState) bool {
validated = true
return ss.AccessToken != "Invalid"
},
}
@ -508,6 +511,7 @@ var _ = Describe("Stored Session Suite", func() {
Expect(err).ToNot(HaveOccurred())
}
Expect(refreshed).To(Equal(in.expectRefreshed))
Expect(validated).To(Equal(in.expectValidated))
testLock, ok := in.session.Lock.(*TestLock)
Expect(ok).To(Equal(true))
@ -522,6 +526,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: false,
expectValidated: false,
expectedLockState: TestLock{},
}),
Entry("when the refresh period is 0, and the session needs refreshing", refreshSessionIfNeededTableInput{
@ -533,6 +538,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: false,
expectValidated: false,
expectedLockState: TestLock{},
}),
Entry("when the session does not need refreshing", refreshSessionIfNeededTableInput{
@ -544,6 +550,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: false,
expectValidated: false,
expectedLockState: TestLock{},
}),
Entry("when the session is refreshed by the provider", refreshSessionIfNeededTableInput{
@ -555,6 +562,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: true,
expectValidated: true,
expectedLockState: TestLock{
Locked: false,
WasObtained: true,
@ -574,6 +582,7 @@ var _ = Describe("Stored Session Suite", func() {
sessionStored: true,
expectedErr: nil,
expectRefreshed: false,
expectValidated: true,
expectedLockState: TestLock{
Locked: false,
PeekedCount: 2,
@ -590,6 +599,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: false,
expectValidated: true,
expectedLockState: TestLock{
PeekedCount: 1,
ObtainError: errors.New("not able to obtain lock"),
@ -605,6 +615,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: true,
expectValidated: true,
expectedLockState: TestLock{
Locked: false,
WasObtained: true,
@ -621,6 +632,7 @@ var _ = Describe("Stored Session Suite", func() {
},
expectedErr: nil,
expectRefreshed: true,
expectValidated: true,
expectedLockState: TestLock{
Locked: false,
WasObtained: true,
@ -637,8 +649,9 @@ var _ = Describe("Stored Session Suite", func() {
ExpiresOn: &createdFuture,
Lock: &TestLock{},
},
expectedErr: nil,
expectedErr: errors.New("session is invalid"),
expectRefreshed: true,
expectValidated: true,
expectedLockState: TestLock{
Locked: false,
WasObtained: true,