mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2025-02-03 13:21:51 +02:00
f648c54d87
* Add sensible logging flag to default setup for logger * Add Redis lock * Fix default value flag for sensitive logging * Split RefreshSessionIfNeeded in two methods and use Redis lock * Small adjustments to doc and code * Remove sensible logging * Fix method names in ticket.go * Revert "Fix method names in ticket.go" This reverts commit 408ba1a1a5c55a3cad507a0be8634af1977769cb. * Fix methods name in ticket.go * Remove block in Redis client get * Increase lock time to 1 second * Perform retries, if session store is locked * Reverse if condition, because it should return if session does not have to be refreshed * Update go.sum * Update MockStore * Return error if loading session fails * Fix and update tests * Change validSession to session in docs and strings * Change validSession to session in docs and strings * Fix docs * Fix wrong field name * Fix linting * Fix imports for linting * Revert changes except from locking functionality * Add lock feature on session state * Update from master * Remove errors package, because it is not used * Only pass context instead of request to lock * Use lock key * By default use NoOpLock * Remove debug output * Update ticket_test.go * Map internal error to sessions error * Add ErrLockNotObtained * Enable lock peek for all redis clients * Use lock key prefix consistent * Fix imports * Use exists method for peek lock * Fix imports * Fix imports * Fix imports * Remove own Dockerfile * Fix imports * Fix tests for ticket and session store * Fix session store test * Update pkg/apis/sessions/interfaces.go Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk> * Do not wrap lock method Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk> * Use errors package for lock constants * Use better naming for initLock function * Add comments * Add session store lock test * Fix tests * Fix tests * Fix tests * Fix tests * Add cookies after saving session * Add mock lock * Fix imports for mock_lock.go * Store mock lock for key * Apply elapsed time on mock lock * Check if lock is initially applied * Reuse existing lock * Test all lock methods * Update CHANGELOG.md * Use redis client methods in redis.lock for release an refresh * Use lock key suffix instead of prefix for lock key * Add comments for Lock interface * Update comment for Lock interface * Update CHANGELOG.md * Change LockSuffix to const * Check lock on already loaded session * Use global var for loadedSession in lock tests * Use lock instance for refreshing and releasing of lock * Update possible error type for Refresh Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
75 lines
1.7 KiB
Go
75 lines
1.7 KiB
Go
package tests
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
|
|
)
|
|
|
|
// entry is a MockStore cache entry with an expiration
|
|
type entry struct {
|
|
data []byte
|
|
expiration time.Duration
|
|
}
|
|
|
|
// MockStore is a generic in-memory implementation of persistence.Store
|
|
// for mocking in tests
|
|
type MockStore struct {
|
|
cache map[string]entry
|
|
lockCache map[string]*MockLock
|
|
elapsed time.Duration
|
|
}
|
|
|
|
// NewMockStore creates a MockStore
|
|
func NewMockStore() *MockStore {
|
|
return &MockStore{
|
|
cache: map[string]entry{},
|
|
lockCache: map[string]*MockLock{},
|
|
elapsed: 0 * time.Second,
|
|
}
|
|
}
|
|
|
|
// Save sets a key to the data to the memory cache
|
|
func (s *MockStore) Save(_ context.Context, key string, value []byte, exp time.Duration) error {
|
|
s.cache[key] = entry{
|
|
data: value,
|
|
expiration: exp,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Load gets data from the memory cache via a key
|
|
func (s *MockStore) Load(_ context.Context, key string) ([]byte, error) {
|
|
entry, ok := s.cache[key]
|
|
if !ok || entry.expiration <= s.elapsed {
|
|
delete(s.cache, key)
|
|
return nil, fmt.Errorf("key not found: %s", key)
|
|
}
|
|
return entry.data, nil
|
|
}
|
|
|
|
// Clear deletes an entry from the memory cache
|
|
func (s *MockStore) Clear(_ context.Context, key string) error {
|
|
delete(s.cache, key)
|
|
return nil
|
|
}
|
|
|
|
func (s *MockStore) Lock(key string) sessions.Lock {
|
|
if s.lockCache[key] != nil {
|
|
return s.lockCache[key]
|
|
}
|
|
lock := &MockLock{}
|
|
s.lockCache[key] = lock
|
|
return lock
|
|
}
|
|
|
|
// FastForward simulates the flow of time to test expirations
|
|
func (s *MockStore) FastForward(duration time.Duration) {
|
|
for _, mockLock := range s.lockCache {
|
|
mockLock.FastForward(duration)
|
|
}
|
|
s.elapsed += duration
|
|
}
|