1
0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-05-19 22:23:30 +02:00
Nuno Miguel Micaelo Borges e079c60dfe
Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is wri… (#2013)
* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Fixes CVE-2022-41721 (#1994)

See: https://avd.aquasec.com/nvd/2022/cve-2022-41717/

* update checkout actions (#1981)

* Fix a typo in oauthproxy.go (#2021)

* fix typo (#2001)

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

* Issue 1929: Oauth2-proxy v7.4.0 is not using alpine:3.16 as it is written in code & updates versions due to fixed CVEs

---------

Co-authored-by: Nuno Borges <Nuno.Borges@ctw.bmwgroup.com>
Co-authored-by: Jeroen Landheer <jlandheer@bintelligence.nl>
Co-authored-by: Ryuichi Watanabe <ryucrosskey@gmail.com>
Co-authored-by: Ho Kim <ho.kim@ulagbulag.io>
Co-authored-by: Terrell Russell <terrellrussell@gmail.com>
2023-03-05 17:12:55 +00:00

85 lines
1.9 KiB
Go

package redis
import (
"context"
"errors"
"fmt"
"time"
"github.com/bsm/redislock"
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
"github.com/redis/go-redis/v9"
)
const LockSuffix = "lock"
type Lock struct {
client redis.Cmdable
locker *redislock.Client
lock *redislock.Lock
key string
}
// NewLock instantiate a new lock instance. This will not yet apply a lock on Redis side.
// For that you have to call Obtain(ctx context.Context, expiration time.Duration)
func NewLock(client redis.Cmdable, key string) sessions.Lock {
return &Lock{
client: client,
locker: redislock.New(client),
key: key,
}
}
// Obtain obtains a distributed lock on Redis for the configured key.
func (l *Lock) Obtain(ctx context.Context, expiration time.Duration) error {
lock, err := l.locker.Obtain(ctx, l.lockKey(), expiration, nil)
if errors.Is(err, redislock.ErrNotObtained) {
return sessions.ErrLockNotObtained
}
if err != nil {
return err
}
l.lock = lock
return nil
}
// Refresh refreshes an already existing lock.
func (l *Lock) Refresh(ctx context.Context, expiration time.Duration) error {
if l.lock == nil {
return sessions.ErrNotLocked
}
err := l.lock.Refresh(ctx, expiration, nil)
if errors.Is(err, redislock.ErrNotObtained) {
return sessions.ErrNotLocked
}
return err
}
// Peek returns true, if the lock is still applied.
func (l *Lock) Peek(ctx context.Context) (bool, error) {
v, err := l.client.Exists(ctx, l.lockKey()).Result()
if err != nil {
return false, err
}
if v == 0 {
return false, nil
}
return true, nil
}
// Release releases the lock on Redis side.
func (l *Lock) Release(ctx context.Context) error {
if l.lock == nil {
return sessions.ErrNotLocked
}
err := l.lock.Release(ctx)
if errors.Is(err, redislock.ErrLockNotHeld) {
return sessions.ErrNotLocked
}
return err
}
func (l *Lock) lockKey() string {
return fmt.Sprintf("%s.%s", l.key, LockSuffix)
}