Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(oauth2): add error handling for previously ignored errors (#18495)

p0nybb15b365c37b
diff --git a/backend/api/oauth2/authorize.go b/backend/api/oauth2/authorize.go
index 242045997b..a7f5888cb0 100644
--- a/backend/api/oauth2/authorize.go
+++ b/backend/api/oauth2/authorize.go
@@ -2,6 +2,7 @@ package oauth2
import (
"fmt"
+ "log/slog"
"net/http"
"net/url"
"time"
@@ -12,6 +13,7 @@ import (
"github.com/bytebase/bytebase/backend/api/auth"
"github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/log"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/store"
)
@@ -157,10 +159,15 @@ func (s *Service) handleAuthorizePost(c echo.Context) error {
}
// Update client last active
- _ = s.store.UpdateOAuth2ClientLastActiveAt(ctx, clientID)
+ if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, clientID); err != nil {
+ slog.Warn("failed to update OAuth2 client last active", slog.String("clientID", clientID), log.BBError(err))
+ }
// Build redirect URL with code
- u, _ := url.Parse(redirectURI)
+ u, err := url.Parse(redirectURI)
+ if err != nil {
+ return oauth2ErrorRedirect(c, redirectURI, state, "server_error", "failed to parse redirect URI")
+ }
q := u.Query()
q.Set("code", code)
if state != "" {
diff --git a/backend/api/oauth2/oauth2.go b/backend/api/oauth2/oauth2.go
index ebbc9526bc..909fc058a5 100644
--- a/backend/api/oauth2/oauth2.go
+++ b/backend/api/oauth2/oauth2.go
@@ -7,6 +7,7 @@ import (
"crypto/subtle"
"encoding/base64"
"html"
+ "log/slog"
"net/http"
"net/url"
"slices"
@@ -16,6 +17,7 @@ import (
"golang.org/x/crypto/bcrypt"
"github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/config"
"github.com/bytebase/bytebase/backend/store"
)
@@ -50,6 +52,7 @@ func NewService(store *store.Store, profile *config.Profile, secret string) *Ser
func (s *Service) getExternalURL(ctx context.Context) string {
setting, err := s.store.GetWorkspaceProfileSetting(ctx)
if err != nil {
+ slog.Warn("failed to get workspace profile setting for OAuth2, using profile external URL", log.BBError(err))
return s.profile.ExternalURL
}
return common.GetEffectiveExternalURL(s.profile.ExternalURL, setting.ExternalUrl)
@@ -183,7 +186,11 @@ func oauth2Error(c echo.Context, statusCode int, errorCode, description string)
}
func oauth2ErrorRedirect(c echo.Context, redirectURI, state, errorCode, description string) error {
- u, _ := url.Parse(redirectURI)
+ u, err := url.Parse(redirectURI)
+ if err != nil {
+ slog.Error("failed to parse redirect URI for OAuth2 error redirect", slog.String("redirectURI", redirectURI), log.BBError(err))
+ return oauth2Error(c, http.StatusInternalServerError, errorCode, description)
+ }
q := u.Query()
q.Set("error", errorCode)
q.Set("error_description", description)
diff --git a/backend/api/oauth2/revoke.go b/backend/api/oauth2/revoke.go
index df959b8353..7a9cd33a9c 100644
--- a/backend/api/oauth2/revoke.go
+++ b/backend/api/oauth2/revoke.go
@@ -2,10 +2,13 @@ package oauth2
import (
"encoding/base64"
+ "log/slog"
"net/http"
"strings"
"github.com/labstack/echo/v4"
+
+ "github.com/bytebase/bytebase/backend/common/log"
)
type revokeRequest struct {
@@ -51,9 +54,11 @@ func (s *Service) handleRevoke(c echo.Context) error {
}
// Try to revoke as refresh token
- // RFC 7009 says to return 200 even if token is invalid, so we ignore errors
+ // RFC 7009 says to return 200 even if token is invalid, but we log errors for debugging
tokenHash := hashToken(req.Token)
- _ = s.store.DeleteOAuth2RefreshToken(ctx, tokenHash)
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ slog.Warn("failed to delete OAuth2 refresh token during revocation", log.BBError(err))
+ }
// Return success (RFC 7009: always return 200)
return c.NoContent(http.StatusOK)
diff --git a/backend/api/oauth2/token.go b/backend/api/oauth2/token.go
index 4d14a4714d..3a315c6e73 100644
--- a/backend/api/oauth2/token.go
+++ b/backend/api/oauth2/token.go
@@ -2,6 +2,7 @@ package oauth2
import (
"encoding/base64"
+ "log/slog"
"net/http"
"slices"
"strings"
@@ -11,6 +12,7 @@ import (
"github.com/labstack/echo/v4"
"github.com/bytebase/bytebase/backend/api/auth"
+ "github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/store"
)
@@ -118,7 +120,9 @@ func (s *Service) handleAuthorizationCodeGrant(c echo.Context, client *store.OAu
// Validate code not expired
if time.Now().After(authCode.ExpiresAt) {
// Delete expired code
- _ = s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code)
+ if err := s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code); err != nil {
+ slog.Warn("failed to delete expired OAuth2 authorization code", slog.String("code", req.Code), log.BBError(err))
+ }
return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "code has expired")
}
@@ -136,7 +140,9 @@ func (s *Service) handleAuthorizationCodeGrant(c echo.Context, client *store.OAu
}
// Delete code after all validations pass (single use)
- _ = s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code)
+ if err := s.store.DeleteOAuth2AuthorizationCode(ctx, req.Code); err != nil {
+ slog.Warn("failed to delete OAuth2 authorization code after use", slog.String("code", req.Code), log.BBError(err))
+ }
// Get user
user, err := s.store.GetUserByEmail(ctx, authCode.UserEmail)
@@ -179,12 +185,16 @@ func (s *Service) handleRefreshTokenGrant(c echo.Context, client *store.OAuth2Cl
// Validate not expired
if time.Now().After(refreshToken.ExpiresAt) {
// Delete expired token
- _ = s.store.DeleteOAuth2RefreshToken(ctx, tokenHash)
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ slog.Warn("failed to delete expired OAuth2 refresh token", log.BBError(err))
+ }
return oauth2Error(c, http.StatusBadRequest, "invalid_grant", "refresh token has expired")
}
// Delete token after validations pass (single use, will issue new one)
- _ = s.store.DeleteOAuth2RefreshToken(ctx, tokenHash)
+ if err := s.store.DeleteOAuth2RefreshToken(ctx, tokenHash); err != nil {
+ slog.Warn("failed to delete OAuth2 refresh token after use", log.BBError(err))
+ }
// Get user
user, err := s.store.GetUserByEmail(ctx, refreshToken.UserEmail)
@@ -236,7 +246,9 @@ func (s *Service) issueTokens(c echo.Context, client *store.OAuth2ClientMessage,
}
// Update client last active
- _ = s.store.UpdateOAuth2ClientLastActiveAt(ctx, client.ClientID)
+ if err := s.store.UpdateOAuth2ClientLastActiveAt(ctx, client.ClientID); err != nil {
+ slog.Warn("failed to update OAuth2 client last active", slog.String("clientID", client.ClientID), log.BBError(err))
+ }
return c.JSON(http.StatusOK, &tokenResponse{
AccessToken: accessToken,