barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2025-10-28 20:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: generate a verifier on every oauth auth session

Browse Source
This commit is contained in:
Stavros
2025-10-19 19:03:32 +03:00
parent 97639ae903
commit 5482430907
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/controller/oauth_controller.go
View File

@@ -72,6 +72,7 @@ func (controller *OAuthController) oauthURLHandler(c *gin.Context) {
return return
} }
service.GenerateVerifier()
state := service.GenerateState() state := service.GenerateState()
authURL := service.GetAuthURL(state) authURL := service.GetAuthURL(state)
c.SetCookie(controller.config.CSRFCookieName, state, int(time.Hour.Seconds()), "/", fmt.Sprintf(".%s", controller.config.CookieDomain), controller.config.SecureCookie, true) c.SetCookie(controller.config.CSRFCookieName, state, int(time.Hour.Seconds()), "/", fmt.Sprintf(".%s", controller.config.CookieDomain), controller.config.SecureCookie, true)

8
internal/service/generic_oauth_service.go
View File

@@ -59,10 +59,8 @@ func (generic *GenericOAuthService) Init() error {
ctx := context.Background() ctx := context.Background()
ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient)
verifier := oauth2.GenerateVerifier()
generic.context = ctx generic.context = ctx
generic.verifier = verifier
return nil return nil
} }
@@ -76,6 +74,12 @@ func (generic *GenericOAuthService) GenerateState() string {
return state return state
} }
func (generic *GenericOAuthService) GenerateVerifier() string {
verifier := oauth2.GenerateVerifier()
generic.verifier = verifier
return verifier
}
func (generic *GenericOAuthService) GetAuthURL(state string) string { func (generic *GenericOAuthService) GetAuthURL(state string) string {
return generic.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(generic.verifier)) return generic.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(generic.verifier))
} }

9
internal/service/github_oauth_service.go
View File

@@ -53,10 +53,7 @@ func (github *GithubOAuthService) Init() error {
httpClient := &http.Client{} httpClient := &http.Client{}
ctx := context.Background() ctx := context.Background()
ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient)
verifier := oauth2.GenerateVerifier()
github.context = ctx github.context = ctx
github.verifier = verifier
return nil return nil
} }
@@ -70,6 +67,12 @@ func (github *GithubOAuthService) GenerateState() string {
return state return state
} }
func (github *GithubOAuthService) GenerateVerifier() string {
verifier := oauth2.GenerateVerifier()
github.verifier = verifier
return verifier
}
func (github *GithubOAuthService) GetAuthURL(state string) string { func (github *GithubOAuthService) GetAuthURL(state string) string {
return github.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(github.verifier)) return github.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(github.verifier))
} }

9
internal/service/google_oauth_service.go
View File

@@ -48,10 +48,7 @@ func (google *GoogleOAuthService) Init() error {
httpClient := &http.Client{} httpClient := &http.Client{}
ctx := context.Background() ctx := context.Background()
ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient)
verifier := oauth2.GenerateVerifier()
google.context = ctx google.context = ctx
google.verifier = verifier
return nil return nil
} }
@@ -65,6 +62,12 @@ func (oauth *GoogleOAuthService) GenerateState() string {
return state return state
} }
func (google *GoogleOAuthService) GenerateVerifier() string {
verifier := oauth2.GenerateVerifier()
google.verifier = verifier
return verifier
}
func (google *GoogleOAuthService) GetAuthURL(state string) string { func (google *GoogleOAuthService) GetAuthURL(state string) string {
return google.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(google.verifier)) return google.config.AuthCodeURL(state, oauth2.AccessTypeOffline, oauth2.S256ChallengeOption(google.verifier))
} }

1
internal/service/oauth_broker_service.go
View File

@@ -11,6 +11,7 @@ import (
type OAuthService interface { type OAuthService interface {
Init() error Init() error
GenerateState() string GenerateState() string
GenerateVerifier() string
GetAuthURL(state string) string GetAuthURL(state string) string
VerifyCode(code string) error VerifyCode(code string) error
Userinfo() (config.Claims, error) Userinfo() (config.Claims, error)