From f5641df0d95d48f2fc71afc09de52f1fff08cb6e Mon Sep 17 00:00:00 2001 From: Akizon77 Date: Fri, 1 Aug 2025 06:22:10 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20OAuth=E6=A0=A1=E9=AA=8Cstate=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/oauth/generic/generic.go | 5 +++-- utils/oauth/github/github.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/oauth/generic/generic.go b/utils/oauth/generic/generic.go index ec0ffa0..14cdd82 100644 --- a/utils/oauth/generic/generic.go +++ b/utils/oauth/generic/generic.go @@ -6,6 +6,7 @@ import ( "fmt" "net/http" "net/url" + "time" "github.com/komari-monitor/komari/utils" "github.com/komari-monitor/komari/utils/oauth/factory" @@ -30,7 +31,7 @@ func (g *Generic) GetAuthorizationURL() (string, string) { url.QueryEscape(state), url.QueryEscape(g.Addition.Scope), ) - + g.stateCache.Set(state, true, cache.DefaultExpiration) return authURL, state } func (g *Generic) OnCallback(ctx context.Context, state string, query map[string]string) (factory.OidcCallback, error) { @@ -102,7 +103,7 @@ func (g *Generic) OnCallback(ctx context.Context, state string, query map[string return factory.OidcCallback{UserId: fmt.Sprintf("%v", userId)}, nil } func (g *Generic) Init() error { - g.stateCache = cache.New(cache.NoExpiration, cache.NoExpiration) + g.stateCache = cache.New(time.Minute*5, time.Minute*10) return nil } func (g *Generic) Destroy() error { diff --git a/utils/oauth/github/github.go b/utils/oauth/github/github.go index d443a24..4be5e8f 100644 --- a/utils/oauth/github/github.go +++ b/utils/oauth/github/github.go @@ -6,6 +6,7 @@ import ( "fmt" "net/http" "net/url" + "time" "github.com/komari-monitor/komari/utils" "github.com/komari-monitor/komari/utils/oauth/factory" @@ -32,7 +33,7 @@ func (g *Github) GetAuthorizationURL() (string, string) { url.QueryEscape(g.Addition.ClientId), url.QueryEscape(state), ) - + g.stateCache.Set(state, true, cache.NoExpiration) return authURL, state } func (g *Github) OnCallback(ctx context.Context, state string, query map[string]string) (factory.OidcCallback, error) { @@ -103,7 +104,7 @@ func (g *Github) OnCallback(ctx context.Context, state string, query map[string] return factory.OidcCallback{UserId: fmt.Sprintf("%d", githubUser.ID)}, nil } func (g *Github) Init() error { - g.stateCache = cache.New(cache.NoExpiration, cache.NoExpiration) + g.stateCache = cache.New(time.Minute*5, time.Minute*10) return nil } func (g *Github) Destroy() error {