From 85e6e07346fd408451d69f6ecc3d06c2b46bbb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bogus=C5=82awski?= Date: Mon, 1 Mar 2021 15:33:05 +0100 Subject: [PATCH] Organization removal confirmation using name not password (#14738) * Organization removal confirmation using name not password Gitea is asking for user password to confirm organization removal so this operation cannot be done in systems with SSO authentication (where no user passwords are used). This mod changes the way gitea confirms organization removal - user must enter organization name (not user password) to confirm operation (similar to repository removal confirmation). Author-Change-Id: IB#1107219 * Translation removed Translation removed from PR - will be restored using Crowdin after pull got merged. Fixes: 95ddcdd8bd8097a952894556d42641d5ec269288 Related: https://github.com/go-gitea/gitea/pull/14738 Author-Change-Id: IB#1107219 --- options/locale/locale_en-US.ini | 1 + routers/org/setting.go | 9 +++------ templates/org/settings/delete.tmpl | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4c4cc694be..0ee8e7ab0c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -386,6 +386,7 @@ password_uppercase_one = At least one uppercase character password_digit_one = At least one digit password_special_one = At least one special character (punctuation, brackets, quotes, etc.) enterred_invalid_repo_name = The repository name you entered is incorrect. +enterred_invalid_org_name = The organization name you entered is incorrect. enterred_invalid_owner_name = The new owner name is not valid. enterred_invalid_password = The password you entered is incorrect. user_not_exist = The user does not exist. diff --git a/routers/org/setting.go b/routers/org/setting.go index ac12066258..a01b2c862a 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -145,12 +145,9 @@ func SettingsDelete(ctx *context.Context) { org := ctx.Org.Organization if ctx.Req.Method == "POST" { - if _, err := models.UserSignIn(ctx.User.Name, ctx.Query("password")); err != nil { - if models.IsErrUserNotExist(err) { - ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_password"), tplSettingsDelete, nil) - } else { - ctx.ServerError("UserSignIn", err) - } + if org.Name != ctx.Query("org_name") { + ctx.Data["Err_OrgName"] = true + ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_org_name"), tplSettingsDelete, nil) return } diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 9743d71cbf..d4911e74b8 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -15,10 +15,9 @@
{{.CsrfTokenHtml}} - -
- - +
+ +
{{.i18n.Tr "org.settings.confirm_delete_account"}}