Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions internal/core/service/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,20 @@ func (s *authService) RefreshTokens(ctx context.Context, refreshToken, ip, userA
return "", "", fmt.Errorf("hash refresh token: %w", err)
}

accessToken, newRawToken, reused, err := s.refreshTokensInTransaction(ctx, hash, ip, userAgent)
if err != nil {
return "", "", err
}
if reused {
return "", "", fmt.Errorf("%w: %w", ErrRefreshTokenReused, domain.ErrUnauthenticated)
}
return accessToken, newRawToken, nil
}

func (s *authService) refreshTokensInTransaction(ctx context.Context, hash []byte, ip, userAgent string) (string, string, bool, error) {
var accessToken, newRawToken string
var reused bool
err = s.repo.WithTx(ctx, func(u port.UnitOfWork) error {
err := s.repo.WithTx(ctx, func(u port.UnitOfWork) error {
token, err := s.lookupRefreshToken(ctx, u.Auth(), hash)
if err != nil {
return err
Expand All @@ -252,13 +263,7 @@ func (s *authService) RefreshTokens(ctx context.Context, refreshToken, ip, userA
newRawToken, err = s.rotateRefreshToken(ctx, u.Auth(), token, ip, userAgent)
return err
})
if err != nil {
return "", "", err
}
if reused {
return "", "", fmt.Errorf("%w: %w", ErrRefreshTokenReused, domain.ErrUnauthenticated)
}
return accessToken, newRawToken, nil
return accessToken, newRawToken, reused, err
}

func (s *authService) lookupRefreshToken(ctx context.Context, auth port.AuthRepository, hash []byte) (*domain.RefreshToken, error) {
Expand Down
53 changes: 41 additions & 12 deletions internal/platform/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,32 @@ func (c Config) Validate() error {
if c.Environment != "development" && c.Environment != "test" && c.Environment != "production" {
return fmt.Errorf("ENVIRONMENT must be development, test, or production")
}
if err := c.validateAllowedOrigins(); err != nil {
return err
}
if err := c.validateRequiredSettings(); err != nil {
return err
}
if err := c.validateOAuthSettings(); err != nil {
return err
}
if err := c.validateProductionSecrets(); err != nil {
return err
}
return c.RateLimit.Validate(c.Environment)
}

func (c Config) validateAllowedOrigins() error {
for index, origin := range c.AllowedOrigins {
parsed, err := url.ParseRequestURI(origin)
if origin != "*" && (err != nil || parsed.Scheme != "http" && parsed.Scheme != "https" || parsed.Hostname() == "" || parsed.Path != "" || parsed.RawQuery != "" || parsed.Fragment != "" || parsed.User != nil) {
return fmt.Errorf("ALLOWED_ORIGINS[%d] is invalid: %q", index, origin)
}
}
return nil
}

func (c Config) validateRequiredSettings() error {
required := []struct{ name, value string }{
{"ALLOWED_ORIGINS", first(c.AllowedOrigins)},
{"BASE_URL", c.BaseURL},
Expand All @@ -85,26 +105,35 @@ func (c Config) Validate() error {
return fmt.Errorf("%s is required", setting.name)
}
}
return nil
}

func (c Config) validateOAuthSettings() error {
if (c.GitHubClientID == "") != (c.GitHubClientSecret == "") {
return fmt.Errorf("GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET must be configured together")
}
if (c.GoogleClientID == "") != (c.GoogleClientSecret == "") {
return fmt.Errorf("GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET must be configured together")
}
if c.Environment == "production" {
secrets := []struct{ name, value string }{
{"JWT_ACCESS_SECRET", c.JWTAccessSecret},
{"REFRESH_TOKEN_HASH_KEY", c.RefreshTokenHashKey},
{"SESSION_SECRET", c.SessionSecret},
{"RATE_LIMIT_KEY", c.RateLimit.Key},
}
for _, secret := range secrets {
if len(secret.value) < 32 {
return fmt.Errorf("%s must be at least 32 bytes in production", secret.name)
}
return nil
}

func (c Config) validateProductionSecrets() error {
if c.Environment != "production" {
return nil
}
secrets := []struct{ name, value string }{
{"JWT_ACCESS_SECRET", c.JWTAccessSecret},
{"REFRESH_TOKEN_HASH_KEY", c.RefreshTokenHashKey},
{"SESSION_SECRET", c.SessionSecret},
{"RATE_LIMIT_KEY", c.RateLimit.Key},
}
for _, secret := range secrets {
if len(secret.value) < 32 {
return fmt.Errorf("%s must be at least 32 bytes in production", secret.name)
}
}
return c.RateLimit.Validate(c.Environment)
return nil
}

func first(values []string) string {
Expand Down
25 changes: 25 additions & 0 deletions internal/platform/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,24 @@ func TestConfigValidate(t *testing.T) {
t.Fatalf("Validate() error = %v", err)
}

cfg = validConfig()
cfg.Environment = "invalid"
if err := cfg.Validate(); err == nil || !strings.Contains(err.Error(), "ENVIRONMENT") {
t.Fatalf("invalid environment error = %v", err)
}

cfg = validConfig()
cfg.AllowedOrigins = []string{"https://example.com", "not-an-origin"}
if err := cfg.Validate(); err == nil || !strings.Contains(err.Error(), "ALLOWED_ORIGINS[1]") {
t.Fatalf("invalid second origin error = %v", err)
}

cfg = validConfig()
cfg.AllowedOrigins = nil
if err := cfg.Validate(); err == nil || !strings.Contains(err.Error(), "ALLOWED_ORIGINS") {
t.Fatalf("missing origins error = %v", err)
}

cfg = validConfig()
cfg.DatabaseURL = ""
if err := cfg.Validate(); err == nil || !strings.Contains(err.Error(), "DATABASE_URL") {
Expand All @@ -50,6 +62,19 @@ func TestConfigValidate(t *testing.T) {
t.Fatal("Validate succeeded with partial GitHub configuration")
}

cfg = validConfig()
cfg.GoogleClientSecret = "secret"
if err := cfg.Validate(); err == nil {
t.Fatal("Validate succeeded with partial Google configuration")
}

cfg = validConfig()
cfg.Environment = "production"
cfg.RateLimit.AllowMemoryInProduction = true
if err := cfg.Validate(); err != nil {
t.Fatalf("valid production config error = %v", err)
}

cfg = validConfig()
cfg.Environment = "production"
cfg.JWTAccessSecret = "short"
Expand Down
Loading