From 3cdbc2f414ee9f6329b7c36c7afc9fba0847a15e Mon Sep 17 00:00:00 2001 From: jiuker <2818723467@qq.com> Date: Thu, 11 May 2023 00:37:30 +0800 Subject: [PATCH] add validationErr to validateConfig When DeleteIdentityProviderCfg (#17173) --- cmd/admin-handlers-idp-config.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmd/admin-handlers-idp-config.go b/cmd/admin-handlers-idp-config.go index 98973b182..c3fd7257f 100644 --- a/cmd/admin-handlers-idp-config.go +++ b/cmd/admin-handlers-idp-config.go @@ -423,6 +423,16 @@ func (a adminAPIHandlers) DeleteIdentityProviderCfg(w http.ResponseWriter, r *ht return } if err = validateConfig(cfg, subSys); err != nil { + + var validationErr ldap.Validation + if errors.As(err, &validationErr) { + // If we got an LDAP validation error, we need to send appropriate + // error message back to client (likely mc). + writeCustomErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminConfigLDAPValidation), + validationErr.FormatError(), r.URL) + return + } + writeCustomErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminConfigBadJSON), err.Error(), r.URL) return }