mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-24 08:41:33 +00:00
af4e0484d0
* fix: uniform oidc errors sanitize oidc error reporting when passing package boundary towards oidc. * add should TriggerBulk in get audiences for auth request * upgrade to oidc 3.10.1 * provisional oidc upgrade to error branch * pin oidc 3.10.2
50 lines
1.3 KiB
Go
50 lines
1.3 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
|
|
}
|
|
|
|
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
|
|
}
|
|
return op.NewStatusError(
|
|
newOidcErr().
|
|
WithParent(err).
|
|
WithDescription(zError.GetMessage()),
|
|
statusCode,
|
|
)
|
|
}
|