Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: move some helpers to utils
Kyle Mendell3b51b65de1c4
diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex 250c4f84c..ebc0c011a 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -2,8 +2,6 @@ package servicesimport ("context"- "crypto/rand"- "crypto/sha256""encoding/base64""encoding/json""errors"@@ -17,6 +15,7 @@ import ("github.com/ofkm/arcane-backend/internal/config""github.com/ofkm/arcane-backend/internal/dto""github.com/ofkm/arcane-backend/internal/models"+ "github.com/ofkm/arcane-backend/internal/utils")type OidcService struct {@@ -102,7 +101,6 @@ func (s *OidcService) getEffectiveConfig(ctx context.Context) (*models.OidcConfireturn nil, fmt.Errorf("failed to discover OIDC endpoints: %w", err)}- // Create effective config with discovered endpointseffectiveConfig := *configeffectiveConfig.AuthorizationEndpoint = discovery.AuthorizationEndpointeffectiveConfig.TokenEndpoint = discovery.TokenEndpoint@@ -113,30 +111,24 @@ func (s *OidcService) getEffectiveConfig(ctx context.Context) (*models.OidcConfi}func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string) (string, string, error) {- // Get effective OIDC configuration with discovered endpointsconfig, err := s.getEffectiveConfig(ctx)if err != nil {return "", "", err}- // Generate state and code verifier for PKCE- state := generateRandomString(32)- codeVerifier := generateRandomString(128)- codeChallenge := generateCodeChallenge(codeVerifier)+ state := utils.GenerateRandomString(32)+ codeVerifier := utils.GenerateRandomString(128)+ codeChallenge := utils.GenerateCodeChallenge(codeVerifier)- // Parse scopesscopes := strings.Fields(config.Scopes)if len(scopes) == 0 {scopes = []string{"openid", "email", "profile"}}- // Build authorization URLauthURL, err := url.Parse(config.AuthorizationEndpoint)if err != nil {return "", "", fmt.Errorf("invalid authorization endpoint: %w", err)}-- // Get auto-generated redirect URI from configredirectURI := s.config.GetOidcRedirectURI()query := authURL.Query()@@ -149,7 +141,6 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string) (squery.Set("code_challenge_method", "S256")authURL.RawQuery = query.Encode()- // Store state with code verifierstateData := OidcState{State: state,CodeVerifier: codeVerifier,@@ -157,7 +148,6 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string) (sCreatedAt: time.Now(),}- // Encode state data as base64 for storagestateJSON, err := json.Marshal(stateData)if err != nil {return "", "", err@@ -168,13 +158,11 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string) (s}func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState string) (*dto.OidcUserInfo, error) {- // Decode stored state to get the original state value and code verifierstateData, err := s.decodeState(storedState)if err != nil {return nil, fmt.Errorf("failed to decode state: %w", err)}- // Verify state matches what we originally sentif state != stateData.State {return nil, errors.New("invalid state parameter")}@@ -184,19 +172,16 @@ func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedStareturn nil, errors.New("state has expired")}- // Get effective OIDC configuration with discovered endpointsconfig, err := s.getEffectiveConfig(ctx)if err != nil {return nil, err}- // Exchange code for tokenstokenResponse, err := s.exchangeCodeForTokens(ctx, config, code, stateData.CodeVerifier)if err != nil {return nil, fmt.Errorf("failed to exchange code for tokens: %w", err)}- // Get user info from the userinfo endpointuserInfo, err := s.getUserInfo(ctx, config, tokenResponse.AccessToken)if err != nil {return nil, fmt.Errorf("failed to get user info: %w", err)@@ -288,18 +273,3 @@ func (s *OidcService) decodeState(encodedState string) (*OidcState, error) {return &stateData, nil}--// Helper functions--func generateRandomString(length int) string {- bytes := make([]byte, length)- if _, err := rand.Read(bytes); err != nil {- panic(err)- }- return base64.URLEncoding.EncodeToString(bytes)[:length]-}--func generateCodeChallenge(verifier string) string {- hash := sha256.Sum256([]byte(verifier))- return base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString(hash[:])-}diff --git a/backend/internal/utils/string_util.go b/backend/internal/utils/string_util.goindex 2b6d18d52..ecbcbb25d 100644--- a/backend/internal/utils/string_util.go+++ b/backend/internal/utils/string_util.go@@ -1,6 +1,11 @@package utils-import "strings"+import (+ "crypto/rand"+ "crypto/sha256"+ "encoding/base64"+ "strings"+)func CapitalizeFirstLetter(str string) string {if len(str) == 0 {@@ -19,3 +24,16 @@ func CamelCaseToSnakeCase(str string) string {}return strings.ToLower(result.String())}++func GenerateRandomString(length int) string {+ bytes := make([]byte, length)+ if _, err := rand.Read(bytes); err != nil {+ panic(err)+ }+ return base64.URLEncoding.EncodeToString(bytes)[:length]+}++func GenerateCodeChallenge(verifier string) string {+ hash := sha256.Sum256([]byte(verifier))+ return base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString(hash[:])+}