mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-01 23:18:35 +00:00
fdb9bba6c7
# Which Problems Are Solved Some dependencies are out of date and published new version including (unaffected) vulnerability fixes. # How the Problems Are Solved - Updated at least all direct dependencies apart from i18n, webauthn (existing issues), - crewjam (https://github.com/zitadel/zitadel/issues/9783) and - github.com/gorilla/csrf (https://github.com/gorilla/csrf/issues/190, https://github.com/gorilla/csrf/issues/189, https://github.com/gorilla/csrf/issues/188, https://github.com/gorilla/csrf/issues/187, https://github.com/gorilla/csrf/issues/186) - noteworthy: https://github.com/golang/go/issues/73626 - Some dependencies require Go 1.24, which triggered an update for zitadel to go 1.24 as well. # Additional Changes None # Additional Context None (cherry picked from commit 968d91a3e0a745fda5b6dfbffdbf1dee8f1306a6)
49 lines
1.4 KiB
Go
49 lines
1.4 KiB
Go
package oidc
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"github.com/zitadel/oidc/v3/pkg/oidc"
|
|
"github.com/zitadel/oidc/v3/pkg/op"
|
|
|
|
http_util "github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
// oidcError ensures [*oidc.Error] and [op.StatusError] types for err.
|
|
// It must be used when an error passes the package boundary towards oidc.
|
|
// When err is already of the correct type is passed as-is.
|
|
// If the err is a Zitadel error, it is transformed with a proper HTTP status code.
|
|
// Unknown errors are treated as internal server errors.
|
|
func oidcError(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
if errors.Is(err, op.ErrInvalidRefreshToken) {
|
|
err = zerrors.ThrowInvalidArgument(err, "OIDCS-ef2Gi", "Errors.User.RefreshToken.Invalid")
|
|
}
|
|
var (
|
|
sError op.StatusError
|
|
oError *oidc.Error
|
|
zError *zerrors.ZitadelError
|
|
)
|
|
if errors.As(err, &sError) || errors.As(err, &oError) {
|
|
return err
|
|
}
|
|
|
|
// here we are encountering an error type that is completely unknown to us.
|
|
if !errors.As(err, &zError) {
|
|
err = zerrors.ThrowInternal(err, "OIDC-AhX2u", "Errors.Internal")
|
|
errors.As(err, &zError)
|
|
}
|
|
|
|
statusCode, _ := http_util.ZitadelErrorToHTTPStatusCode(err)
|
|
newOidcErr := oidc.ErrServerError
|
|
if statusCode < 500 {
|
|
newOidcErr = oidc.ErrInvalidRequest
|
|
}
|
|
oidcErr := newOidcErr().WithParent(err)
|
|
oidcErr.Description = zError.GetMessage()
|
|
return op.NewStatusError(oidcErr, statusCode)
|
|
}
|