From f5cd8a93acf7e7e7e1ba17d293689c1da4491b47 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 11:07:33 +0900 Subject: [PATCH 01/19] remove SnakeCase --- modules/web/middleware/binding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 8b74a864d9571..7dd402770f4ff 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -42,7 +42,7 @@ func AssignForm(form interface{}, data map[string]interface{}) { if fieldName == "-" { continue } else if len(fieldName) == 0 { - fieldName = util.ToSnakeCase(field.Name) + fieldName = field.Name } data[fieldName] = val.Field(i).Interface() From 1195121d17f06df1497634f0a62441a5fb0d41f7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 11:08:22 +0900 Subject: [PATCH 02/19] fix repo create --- routers/web/repo/repo.go | 17 ++++++++-------- templates/repo/create.tmpl | 40 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 0a51dfa73325f..716fd7cc5d1f6 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -131,14 +131,15 @@ func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_repo") // Give default value for template to render. - ctx.Data["Gitignores"] = repo_module.Gitignores + ctx.Data["DefaultGitignores"] = repo_module.Gitignores ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes - ctx.Data["readme"] = "Default" - ctx.Data["private"] = getRepoPrivate(ctx) + ctx.Data["Readme"] = "Default" + ctx.Data["Private"] = getRepoPrivate(ctx) ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate - ctx.Data["default_branch"] = setting.Repository.DefaultBranch + ctx.Data["DefaultBranch"] = setting.Repository.DefaultBranch + ctx.Data["TrustModel"] = "Default" ctxUser := checkContextUser(ctx, ctx.FormInt64("org")) if ctx.Written() { @@ -146,13 +147,13 @@ func Create(ctx *context.Context) { } ctx.Data["ContextUser"] = ctxUser - ctx.Data["repo_template_name"] = ctx.Tr("repo.template_select") + ctx.Data["RepoTemplateName"] = ctx.Tr("repo.template_select") templateID := ctx.FormInt64("template_id") if templateID > 0 { templateRepo, err := repo_model.GetRepositoryByID(ctx, templateID) if err == nil && access_model.CheckRepoUnitUser(ctx, templateRepo, ctxUser, unit.TypeCode) { - ctx.Data["repo_template"] = templateID - ctx.Data["repo_template_name"] = templateRepo.Name + ctx.Data["RepoTemplate"] = templateID + ctx.Data["RepoTemplateName"] = templateRepo.Name } } @@ -199,7 +200,7 @@ func CreatePost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.CreateRepoForm) ctx.Data["Title"] = ctx.Tr("new_repo") - ctx.Data["Gitignores"] = repo_module.Gitignores + ctx.Data["DefaultGitignores"] = repo_module.Gitignores ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 115d829e4f954..193498e2f71d3 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -43,7 +43,7 @@
- + {{.locale.Tr "repo.repo_name_helper"}}
@@ -53,7 +53,7 @@ {{else}} - + {{end}}
@@ -61,13 +61,13 @@
- +
@@ -77,33 +77,33 @@
- +
- +
- +
- +
- +
- +
@@ -113,7 +113,7 @@
- +
{{.locale.Tr "repo.issue_labels_helper"}}
{{.locale.Tr "repo.issue_labels_helper"}}
@@ -129,10 +129,10 @@
- +
{{.locale.Tr "repo.repo_gitignore_helper"}}
- {{range .Gitignores}} + {{range .DefaultGitignores}}
{{.}}
{{end}}
@@ -142,7 +142,7 @@
- +
{{.locale.Tr "repo.license_helper"}}
{{.locale.Tr "repo.license_helper"}}
@@ -157,7 +157,7 @@
- +
{{.locale.Tr "repo.readme_helper"}}
{{range .Readmes}} @@ -169,19 +169,19 @@
- +
- + {{.locale.Tr "repo.default_branch_helper"}}
- +
{{.locale.Tr "repo.settings.trust_model"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -204,7 +204,7 @@
- +
From 49ea88b1dbb6f24c44e1593629548c0aac049fd3 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 11:16:22 +0900 Subject: [PATCH 03/19] fix org create --- routers/web/org/org.go | 4 +++- templates/org/create.tmpl | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/routers/web/org/org.go b/routers/web/org/org.go index f67e7edb4c7cc..faf2daa84c494 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -27,7 +27,9 @@ const ( // Create render the page for create organization func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_org") - ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode + ctx.Data["Visibility"] = setting.Service.DefaultOrgVisibilityMode + ctx.Data["RepoAdminChangeTeamAccess"] = true + if !ctx.Doer.CanCreateOrganization() { ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed"))) return diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 8da46fb325b24..a6a4a1889026d 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -11,7 +11,7 @@ {{template "base/alert" .}}
- + {{.locale.Tr "org.org_name_helper"}}
@@ -19,15 +19,15 @@
- +
- +
- +
@@ -37,7 +37,7 @@
- +
From 6dd02cc78f65c1bb4a11f0a9cbbfe47ebe901e1f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:25:31 +0900 Subject: [PATCH 04/19] Revert "fix org create" This reverts commit 49ea88b1dbb6f24c44e1593629548c0aac049fd3. --- routers/web/org/org.go | 4 +--- templates/org/create.tmpl | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/routers/web/org/org.go b/routers/web/org/org.go index faf2daa84c494..f67e7edb4c7cc 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -27,9 +27,7 @@ const ( // Create render the page for create organization func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_org") - ctx.Data["Visibility"] = setting.Service.DefaultOrgVisibilityMode - ctx.Data["RepoAdminChangeTeamAccess"] = true - + ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode if !ctx.Doer.CanCreateOrganization() { ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed"))) return diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index a6a4a1889026d..8da46fb325b24 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -11,7 +11,7 @@ {{template "base/alert" .}}
- + {{.locale.Tr "org.org_name_helper"}}
@@ -19,15 +19,15 @@
- +
- +
- +
@@ -37,7 +37,7 @@
- +
From add2d3ca8dfa873d085c9fbb11e39d8ef5e6ef7b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:25:41 +0900 Subject: [PATCH 05/19] Revert "fix repo create" This reverts commit 1195121d17f06df1497634f0a62441a5fb0d41f7. --- routers/web/repo/repo.go | 17 ++++++++-------- templates/repo/create.tmpl | 40 +++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 716fd7cc5d1f6..0a51dfa73325f 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -131,15 +131,14 @@ func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_repo") // Give default value for template to render. - ctx.Data["DefaultGitignores"] = repo_module.Gitignores + ctx.Data["Gitignores"] = repo_module.Gitignores ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes - ctx.Data["Readme"] = "Default" - ctx.Data["Private"] = getRepoPrivate(ctx) + ctx.Data["readme"] = "Default" + ctx.Data["private"] = getRepoPrivate(ctx) ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate - ctx.Data["DefaultBranch"] = setting.Repository.DefaultBranch - ctx.Data["TrustModel"] = "Default" + ctx.Data["default_branch"] = setting.Repository.DefaultBranch ctxUser := checkContextUser(ctx, ctx.FormInt64("org")) if ctx.Written() { @@ -147,13 +146,13 @@ func Create(ctx *context.Context) { } ctx.Data["ContextUser"] = ctxUser - ctx.Data["RepoTemplateName"] = ctx.Tr("repo.template_select") + ctx.Data["repo_template_name"] = ctx.Tr("repo.template_select") templateID := ctx.FormInt64("template_id") if templateID > 0 { templateRepo, err := repo_model.GetRepositoryByID(ctx, templateID) if err == nil && access_model.CheckRepoUnitUser(ctx, templateRepo, ctxUser, unit.TypeCode) { - ctx.Data["RepoTemplate"] = templateID - ctx.Data["RepoTemplateName"] = templateRepo.Name + ctx.Data["repo_template"] = templateID + ctx.Data["repo_template_name"] = templateRepo.Name } } @@ -200,7 +199,7 @@ func CreatePost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.CreateRepoForm) ctx.Data["Title"] = ctx.Tr("new_repo") - ctx.Data["DefaultGitignores"] = repo_module.Gitignores + ctx.Data["Gitignores"] = repo_module.Gitignores ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 193498e2f71d3..115d829e4f954 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -43,7 +43,7 @@
- + {{.locale.Tr "repo.repo_name_helper"}}
@@ -53,7 +53,7 @@ {{else}} - + {{end}}
@@ -61,13 +61,13 @@
- +
@@ -77,33 +77,33 @@
- +
- +
- +
- +
- +
- +
@@ -113,7 +113,7 @@
- +
{{.locale.Tr "repo.issue_labels_helper"}}
{{.locale.Tr "repo.issue_labels_helper"}}
@@ -129,10 +129,10 @@
- +
{{.locale.Tr "repo.repo_gitignore_helper"}}
- {{range .DefaultGitignores}} + {{range .Gitignores}}
{{.}}
{{end}}
@@ -142,7 +142,7 @@
- +
{{.locale.Tr "repo.license_helper"}}
{{.locale.Tr "repo.license_helper"}}
@@ -157,7 +157,7 @@
- +
{{.locale.Tr "repo.readme_helper"}}
{{range .Readmes}} @@ -169,19 +169,19 @@
- +
- + {{.locale.Tr "repo.default_branch_helper"}}
- +
{{.locale.Tr "repo.settings.trust_model"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -204,7 +204,7 @@
- +
From 8e4d3c3b68e96078ee41267df59c90cd398ca873 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:26:01 +0900 Subject: [PATCH 06/19] Revert "remove SnakeCase" This reverts commit f5cd8a93acf7e7e7e1ba17d293689c1da4491b47. --- modules/web/middleware/binding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 7dd402770f4ff..8b74a864d9571 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -42,7 +42,7 @@ func AssignForm(form interface{}, data map[string]interface{}) { if fieldName == "-" { continue } else if len(fieldName) == 0 { - fieldName = field.Name + fieldName = util.ToSnakeCase(field.Name) } data[fieldName] = val.Field(i).Interface() From 2404441a03b5c4c4893f25b4e990771d15db0615 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:29:06 +0900 Subject: [PATCH 07/19] rewrite AssignForm --- modules/web/middleware/binding.go | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go index 8b74a864d9571..4ba73d52109a9 100644 --- a/modules/web/middleware/binding.go +++ b/modules/web/middleware/binding.go @@ -26,27 +26,8 @@ func init() { // AssignForm assign form values back to the template data. func AssignForm(form interface{}, data map[string]interface{}) { - typ := reflect.TypeOf(form) - val := reflect.ValueOf(form) - - for typ.Kind() == reflect.Ptr { - typ = typ.Elem() - val = val.Elem() - } - - for i := 0; i < typ.NumField(); i++ { - field := typ.Field(i) - - fieldName := field.Tag.Get("form") - // Allow ignored fields in the struct - if fieldName == "-" { - continue - } else if len(fieldName) == 0 { - fieldName = util.ToSnakeCase(field.Name) - } - - data[fieldName] = val.Field(i).Interface() - } + // TODO: Allow ignored fields in the struct? + data["Form"] = form } func getRuleBody(field reflect.StructField, prefix string) string { From 7c3043a8de2bb2bbf1adcbabfb1b99bd2359112d Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:32:32 +0900 Subject: [PATCH 08/19] fix org create --- routers/web/org/org.go | 6 +++++- templates/org/create.tmpl | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/routers/web/org/org.go b/routers/web/org/org.go index f67e7edb4c7cc..4663ec3734f1d 100644 --- a/routers/web/org/org.go +++ b/routers/web/org/org.go @@ -27,7 +27,11 @@ const ( // Create render the page for create organization func Create(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_org") - ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode + ctx.Data["Form"] = forms.CreateOrgForm{ + Visibility: setting.Service.DefaultOrgVisibilityMode, + RepoAdminChangeTeamAccess: true, + } + if !ctx.Doer.CanCreateOrganization() { ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed"))) return diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 8da46fb325b24..a3bfbd868e8cb 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -19,15 +19,15 @@
- +
- +
- +
@@ -37,7 +37,7 @@
- +
From 9cd9cebecbfed71f2ccbf52525ac9f76a6f949cc Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:57:25 +0900 Subject: [PATCH 09/19] fix repo create --- routers/web/repo/repo.go | 18 ++++++++++++------ templates/repo/create.tmpl | 38 +++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 0a51dfa73325f..181063200dd55 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -135,10 +135,7 @@ func Create(ctx *context.Context) { ctx.Data["LabelTemplates"] = repo_module.LabelTemplates ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes - ctx.Data["readme"] = "Default" - ctx.Data["private"] = getRepoPrivate(ctx) ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate - ctx.Data["default_branch"] = setting.Repository.DefaultBranch ctxUser := checkContextUser(ctx, ctx.FormInt64("org")) if ctx.Written() { @@ -146,16 +143,25 @@ func Create(ctx *context.Context) { } ctx.Data["ContextUser"] = ctxUser - ctx.Data["repo_template_name"] = ctx.Tr("repo.template_select") + ctx.Data["RepoTemplateName"] = ctx.Tr("repo.template_select") templateID := ctx.FormInt64("template_id") + repoTemplate := int64(0) if templateID > 0 { templateRepo, err := repo_model.GetRepositoryByID(ctx, templateID) if err == nil && access_model.CheckRepoUnitUser(ctx, templateRepo, ctxUser, unit.TypeCode) { - ctx.Data["repo_template"] = templateID - ctx.Data["repo_template_name"] = templateRepo.Name + repoTemplate = templateID + ctx.Data["RepoTemplateName"] = templateRepo.Name } } + ctx.Data["Form"] = forms.CreateRepoForm{ + Private: getRepoPrivate(ctx), + DefaultBranch: setting.Repository.DefaultBranch, + Readme: "Default", + RepoTemplate: repoTemplate, + TrustModel: "Default", + } + ctx.Data["CanCreateRepo"] = ctx.Doer.CanCreateRepo() ctx.Data["MaxCreationLimit"] = ctx.Doer.MaxCreationLimit() diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 115d829e4f954..e107a6d007ff3 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -43,7 +43,7 @@
- + {{.locale.Tr "repo.repo_name_helper"}}
@@ -53,7 +53,7 @@ {{else}} - + {{end}}
@@ -61,13 +61,13 @@
- +
@@ -77,33 +77,33 @@
- +
- +
- +
- +
- +
- +
@@ -113,7 +113,7 @@
- +
{{.locale.Tr "repo.issue_labels_helper"}}
{{.locale.Tr "repo.issue_labels_helper"}}
@@ -129,7 +129,7 @@
- +
{{.locale.Tr "repo.repo_gitignore_helper"}}
{{range .Gitignores}} @@ -142,7 +142,7 @@
- +
{{.locale.Tr "repo.license_helper"}}
{{.locale.Tr "repo.license_helper"}}
@@ -157,7 +157,7 @@
- +
{{.locale.Tr "repo.readme_helper"}}
{{range .Readmes}} @@ -169,19 +169,19 @@
- +
- + {{.locale.Tr "repo.default_branch_helper"}}
- +
{{.locale.Tr "repo.settings.trust_model"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -204,7 +204,7 @@
- +
From da3b9acb45b557f7ca28c7f35ca511fbe371b3be Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Feb 2023 19:58:30 +0900 Subject: [PATCH 10/19] fix org name in org create --- templates/org/create.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index a3bfbd868e8cb..12d264b092dbb 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -11,7 +11,7 @@ {{template "base/alert" .}}
- + {{.locale.Tr "org.org_name_helper"}}
From 02f156eb45da42c117945be5f8a46aedbc38ad70 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 30 Mar 2023 02:06:09 +0000 Subject: [PATCH 11/19] fix AdminCreateUserForm --- routers/web/admin/users.go | 8 +++++--- templates/admin/user/new.tmpl | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 1bb9d0480682e..904d050b82ea8 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -82,10 +82,12 @@ func NewUser(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.users.new_account") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true - ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() - ctx.Data["login_type"] = "0-0" + ctx.Data["Form"] = forms.AdminCreateUserForm{ + LoginType: "0-0", + Visibility: setting.Service.DefaultUserVisibilityMode, + } sources, err := auth.Sources() if err != nil { @@ -104,7 +106,7 @@ func NewUserPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.users.new_account") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true - ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode + ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() sources, err := auth.Sources() if err != nil { diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 3f25c30c8b5d8..3b1f3d0b0aa4b 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -14,7 +14,7 @@
- +
{{.locale.Tr "admin.users.local"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -29,11 +29,11 @@
- +
- {{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} - {{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} - {{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}} + {{if .Form.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} + {{if .Form.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} + {{if .Form.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -50,27 +50,27 @@
-
+
- +
- +
- +
-
+
- +
-
+
- +
@@ -79,7 +79,7 @@
- +
{{end}} From aa1584f291efd6b1c05c714fca49d8fbee7c20da Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 30 Mar 2023 02:41:28 +0000 Subject: [PATCH 12/19] fix --- routers/web/admin/users.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 904d050b82ea8..c88eafe027623 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -275,6 +275,7 @@ func EditUserPost(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations + ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() u := prepareUserInfo(ctx) if ctx.Written() { @@ -316,13 +317,13 @@ func EditUserPost(ctx *context.Context) { log.Error(err.Error()) errMsg = ctx.Tr("auth.password_pwned_err") } - ctx.RenderWithErr(errMsg, tplUserNew, &form) + ctx.RenderWithErr(errMsg, tplUserEdit, &form) return } if err := user_model.ValidateEmail(form.Email); err != nil { ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserNew, &form) + ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserEdit, &form) return } @@ -338,7 +339,10 @@ func EditUserPost(ctx *context.Context) { if len(form.UserName) != 0 && u.Name != form.UserName { if err := user_setting.HandleUsernameChange(ctx, u, form.UserName); err != nil { - ctx.Redirect(setting.AppSubURL + "/admin/users") + if ctx.Written() { + return + } + ctx.RenderWithErr(ctx.Flash.ErrorMsg, tplUserEdit, &form) return } u.Name = form.UserName From bf1af92c395c55ad159cc40d703594772fbe3db1 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 30 Mar 2023 04:58:13 +0000 Subject: [PATCH 13/19] fix visibility in new user page --- templates/admin/user/new.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 3b1f3d0b0aa4b..30b0b5e17d307 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -29,7 +29,9 @@
- + {{if .Form.Visibility.IsPublic}}{{end}} + {{if .Form.Visibility.IsLimited}}{{end}} + {{if .Form.Visibility.IsPrivate}}{{end}}
{{if .Form.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} {{if .Form.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} From a64ba42e1b679aa9699e4adee2dc71b9f5593e1f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 30 Mar 2023 08:29:09 +0000 Subject: [PATCH 14/19] fix AdminEditUserForm --- routers/web/admin/users.go | 87 ++++++++++++++++++++++++++-------- templates/admin/user/edit.tmpl | 54 ++++++++++----------- 2 files changed, 93 insertions(+), 48 deletions(-) diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index c88eafe027623..f3d71e2841844 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -5,6 +5,7 @@ package admin import ( + "fmt" "net/http" "net/url" "strconv" @@ -28,6 +29,11 @@ import ( user_service "code.gitea.io/gitea/services/user" ) +type EditUserForm struct { + *forms.AdminEditUserForm + *forms.AvatarForm +} + const ( tplUsers base.TplName = "admin/user/list" tplUserNew base.TplName = "admin/user/new" @@ -207,7 +213,7 @@ func NewUserPost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10)) } -func prepareUserInfo(ctx *context.Context) *user_model.User { +func prepareUserInfo(ctx *context.Context, adminEditUserForm *forms.AdminEditUserForm, avatarForm *forms.AvatarForm) (*user_model.User, *EditUserForm) { u, err := user_model.GetUserByID(ctx, ctx.ParamsInt64(":userid")) if err != nil { if user_model.IsErrUserNotExist(err) { @@ -215,40 +221,78 @@ func prepareUserInfo(ctx *context.Context) *user_model.User { } else { ctx.ServerError("GetUserByID", err) } - return nil + return nil, nil } ctx.Data["User"] = u + var loginSource *auth.Source if u.LoginSource > 0 { - ctx.Data["LoginSource"], err = auth.GetSourceByID(u.LoginSource) + loginSource, err = auth.GetSourceByID(u.LoginSource) if err != nil { ctx.ServerError("auth.GetSourceByID", err) - return nil + return nil, nil } } else { - ctx.Data["LoginSource"] = &auth.Source{} + loginSource = &auth.Source{} } + ctx.Data["LoginSource"] = loginSource sources, err := auth.Sources() if err != nil { ctx.ServerError("auth.Sources", err) - return nil + return nil, nil } ctx.Data["Sources"] = sources hasTOTP, err := auth.HasTwoFactorByUID(u.ID) if err != nil { ctx.ServerError("auth.HasTwoFactorByUID", err) - return nil + return nil, nil } hasWebAuthn, err := auth.HasWebAuthnRegistrationsByUID(u.ID) if err != nil { ctx.ServerError("auth.HasWebAuthnRegistrationsByUID", err) - return nil + return nil, nil } ctx.Data["TwoFactorEnabled"] = hasTOTP || hasWebAuthn - return u + var source string + if u.UseCustomAvatar { + source = "local" + } else { + source = "lookup" + } + + if adminEditUserForm == nil { + adminEditUserForm = &forms.AdminEditUserForm{ + LoginType: fmt.Sprintf("%d-%d", loginSource.Type.Int(), loginSource.ID), + UserName: u.Name, + LoginName: u.LoginName, + FullName: u.FullName, + Email: u.Email, + Website: u.Website, + Location: u.Location, + MaxRepoCreation: u.MaxRepoCreation, + Active: u.IsActive, + Admin: u.IsAdmin, + Restricted: u.IsRestricted, + AllowGitHook: u.CanEditGitHook(), + AllowImportLocal: u.CanImportLocal(), + AllowCreateOrganization: u.CanCreateOrganization(), + ProhibitLogin: u.ProhibitLogin, + Visibility: u.Visibility, + } + } + if avatarForm == nil { + avatarForm = &forms.AvatarForm{ + Source: source, + Gravatar: u.AvatarEmail, + } + } + form := &EditUserForm{adminEditUserForm, avatarForm} + ctx.Data["Form"] = form + + return u, form } // EditUser show editing user page @@ -260,7 +304,7 @@ func EditUser(ctx *context.Context) { ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() - prepareUserInfo(ctx) + prepareUserInfo(ctx, nil, nil) if ctx.Written() { return } @@ -277,7 +321,7 @@ func EditUserPost(ctx *context.Context) { ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() - u := prepareUserInfo(ctx) + u, f := prepareUserInfo(ctx, form, nil) if ctx.Written() { return } @@ -302,11 +346,11 @@ func EditUserPost(ctx *context.Context) { var err error if len(form.Password) < setting.MinPasswordLength { ctx.Data["Err_Password"] = true - ctx.RenderWithErr(ctx.Tr("auth.password_too_short", setting.MinPasswordLength), tplUserEdit, &form) + ctx.RenderWithErr(ctx.Tr("auth.password_too_short", setting.MinPasswordLength), tplUserEdit, &f) return } if !password.IsComplexEnough(form.Password) { - ctx.RenderWithErr(password.BuildComplexityError(ctx), tplUserEdit, &form) + ctx.RenderWithErr(password.BuildComplexityError(ctx), tplUserEdit, &f) return } pwned, err := password.IsPwned(ctx, form.Password) @@ -317,13 +361,13 @@ func EditUserPost(ctx *context.Context) { log.Error(err.Error()) errMsg = ctx.Tr("auth.password_pwned_err") } - ctx.RenderWithErr(errMsg, tplUserEdit, &form) + ctx.RenderWithErr(errMsg, tplUserEdit, &f) return } if err := user_model.ValidateEmail(form.Email); err != nil { ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserEdit, &form) + ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserEdit, &f) return } @@ -342,7 +386,7 @@ func EditUserPost(ctx *context.Context) { if ctx.Written() { return } - ctx.RenderWithErr(ctx.Flash.ErrorMsg, tplUserEdit, &form) + ctx.RenderWithErr(ctx.Flash.ErrorMsg, tplUserEdit, &f) return } u.Name = form.UserName @@ -401,11 +445,11 @@ func EditUserPost(ctx *context.Context) { if err := user_model.UpdateUser(ctx, u, emailChanged); err != nil { if user_model.IsErrEmailAlreadyUsed(err) { ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserEdit, &form) + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserEdit, &f) } else if user_model.IsErrEmailCharIsNotSupported(err) || user_model.IsErrEmailInvalid(err) { ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserEdit, &form) + ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserEdit, &f) } else { ctx.ServerError("UpdateUser", err) } @@ -456,12 +500,13 @@ func DeleteUser(ctx *context.Context) { // AvatarPost response for change user's avatar request func AvatarPost(ctx *context.Context) { - u := prepareUserInfo(ctx) + form := web.GetForm(ctx).(*forms.AvatarForm) + + u, _ := prepareUserInfo(ctx, nil, form) if ctx.Written() { return } - form := web.GetForm(ctx).(*forms.AvatarForm) if err := user_setting.UpdateAvatarSetting(ctx, form, u); err != nil { ctx.Flash.Error(err.Error()) } else { @@ -473,7 +518,7 @@ func AvatarPost(ctx *context.Context) { // DeleteAvatar render delete avatar page func DeleteAvatar(ctx *context.Context) { - u := prepareUserInfo(ctx) + u, _ := prepareUserInfo(ctx, nil, nil) if ctx.Written() { return } diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 4fd0d892f258d..101d6cf04c1e7 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -12,13 +12,13 @@ {{.CsrfTokenHtml}}
- +
- +
{{.locale.Tr "admin.users.local"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -33,13 +33,13 @@
- {{if .User.Visibility.IsPublic}}{{end}} - {{if .User.Visibility.IsLimited}}{{end}} - {{if .User.Visibility.IsPrivate}}{{end}} + {{if .Form.Visibility.IsPublic}}{{end}} + {{if .Form.Visibility.IsLimited}}{{end}} + {{if .Form.Visibility.IsPrivate}}{{end}}
- {{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} - {{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} - {{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}} + {{if .Form.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}} + {{if .Form.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}} + {{if .Form.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -58,35 +58,35 @@
- +
- +
- +
- +

{{.locale.Tr "admin.users.password_helper"}}

- +
- +
- +

{{.locale.Tr "admin.users.max_repo_creation_desc"}}

@@ -95,44 +95,44 @@
- +
- +
- +
- +
- +
- +
{{if not .DisableRegularOrgCreation}}
- +
{{end}} @@ -142,7 +142,7 @@
- +
{{end}} @@ -165,26 +165,26 @@ {{if not (DisableGravatar $.Context)}}
- +
- +
{{end}}
- +
- +
From ad6a1916878d6e5f99c768ea7d8e3a625812f50b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 31 Mar 2023 01:43:38 +0000 Subject: [PATCH 15/19] fix AuthenticationForm --- routers/web/admin/auths.go | 31 ++++++-------- templates/admin/auth/edit.tmpl | 2 +- templates/admin/auth/new.tmpl | 22 +++++----- templates/admin/auth/source/ldap.tmpl | 58 +++++++++++++------------- templates/admin/auth/source/oauth.tmpl | 42 +++++++++---------- templates/admin/auth/source/smtp.tmpl | 20 ++++----- templates/admin/auth/source/sspi.tmpl | 16 +++---- 7 files changed, 93 insertions(+), 98 deletions(-) diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index d2953f753d7a4..b9d87b19f2f8f 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -92,26 +92,26 @@ func NewAuthSource(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true - ctx.Data["type"] = auth.LDAP.Int() ctx.Data["CurrentTypeName"] = auth.Names[auth.LDAP] ctx.Data["CurrentSecurityProtocol"] = ldap.SecurityProtocolNames[ldap.SecurityProtocolUnencrypted] - ctx.Data["smtp_auth"] = "PLAIN" - ctx.Data["is_active"] = true - ctx.Data["is_sync_enabled"] = true ctx.Data["AuthSources"] = authSources ctx.Data["SecurityProtocols"] = securityProtocols ctx.Data["SMTPAuths"] = smtp.Authenticators oauth2providers := oauth2.GetOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers - ctx.Data["SSPIAutoCreateUsers"] = true - ctx.Data["SSPIAutoActivateUsers"] = true - ctx.Data["SSPIStripDomainNames"] = true - ctx.Data["SSPISeparatorReplacement"] = "_" - ctx.Data["SSPIDefaultLanguage"] = "" - - // only the first as default - ctx.Data["oauth2_provider"] = oauth2providers[0].Name() + ctx.Data["Form"] = forms.AuthenticationForm{ + Type: auth.LDAP.Int(), + SMTPAuth: "PLAIN", + IsActive: true, + IsSyncEnabled: true, + Oauth2Provider: oauth2providers[0].Name(), // only the first as default + SSPIAutoCreateUsers: true, + SSPIAutoActivateUsers: true, + SSPIStripDomainNames: true, + SSPISeparatorReplacement: "_", + SSPIDefaultLanguage: "", + } ctx.HTML(http.StatusOK, tplAuthNew) } @@ -248,12 +248,6 @@ func NewAuthSourcePost(ctx *context.Context) { oauth2providers := oauth2.GetOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers - ctx.Data["SSPIAutoCreateUsers"] = true - ctx.Data["SSPIAutoActivateUsers"] = true - ctx.Data["SSPIStripDomainNames"] = true - ctx.Data["SSPISeparatorReplacement"] = "_" - ctx.Data["SSPIDefaultLanguage"] = "" - hasTLS := false var config convert.Conversion switch auth.Type(form.Type) { @@ -361,6 +355,7 @@ func EditAuthSource(ctx *context.Context) { } } } + ctx.Data["Form"] = forms.AuthenticationForm{} ctx.HTML(http.StatusOK, tplAuthEdit) } diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 9b07774653478..52e56c9260bb8 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -407,7 +407,7 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}
-
-
+
-
{{range .AllLangs}}
{{.Name}}
{{end}} diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index b7715cb5fe425..12888c0b0a051 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -14,7 +14,7 @@
- +
{{.CurrentTypeName}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -26,7 +26,7 @@
- +
@@ -36,16 +36,16 @@ {{template "admin/auth/source/smtp" .}} -
+
- + - +
-
+
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

@@ -59,19 +59,19 @@
- +
-
+
- +
- +
diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index 902cfcbcce70b..72bf1cb471880 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -2,7 +2,7 @@
- +
{{.CurrentSecurityProtocol}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -14,103 +14,103 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +

{{.locale.Tr "admin.auths.restricted_filter_helper"}}

- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -118,24 +118,24 @@
- +
-
+
- +
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

- +
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index e4ae736e8fa6c..0101a5dbabc6e 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -2,8 +2,8 @@
- -
{{.oauth2_provider}}
+ +
{{.Form.Oauth2Provider}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .OAuth2Providers}} @@ -14,24 +14,24 @@
- +
- +
- +
- +
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

@@ -39,28 +39,28 @@
- +
- +
- +
- +
- +
- +
{{range .OAuth2Providers}}{{if .CustomURLSettings}} @@ -74,36 +74,36 @@
- +
- +

{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}

- +

{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}

- +
- +
- +
- +
- +
diff --git a/templates/admin/auth/source/smtp.tmpl b/templates/admin/auth/source/smtp.tmpl index e83f7afb6953f..85e5ab3fca8d1 100644 --- a/templates/admin/auth/source/smtp.tmpl +++ b/templates/admin/auth/source/smtp.tmpl @@ -2,8 +2,8 @@
- -
{{.smtp_auth}}
+ +
{{.Form.SMTPAuth}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .SMTPAuths}} @@ -14,45 +14,45 @@
- +
- +
- +

{{.locale.Tr "admin.auths.force_smtps_helper"}}

- +
- +

{{.locale.Tr "admin.auths.helo_hostname_helper"}}

- +
- +

{{.locale.Tr "admin.auths.allowed_domains_helper"}}

- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl index 9608616e1b2d2..704e5fe29ca31 100644 --- a/templates/admin/auth/source/sspi.tmpl +++ b/templates/admin/auth/source/sspi.tmpl @@ -2,39 +2,39 @@
- +

{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

From a205529a8017ef61cc481a8e85412506c7412c0e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 31 Mar 2023 01:44:12 +0000 Subject: [PATCH 16/19] fix name conflict --- models/auth/source.go | 9 ++++++++- routers/web/admin/auths.go | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/models/auth/source.go b/models/auth/source.go index bade2fecf098b..0a904b7772394 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -317,7 +317,14 @@ func UpdateSource(source *Source) error { } } - _, err := db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source) + has, err := db.GetEngine(db.DefaultContext).Where("name=? AND id!=?", source.Name, source.ID).Exist(new(Source)) + if err != nil { + return err + } else if has { + return ErrSourceAlreadyExist{source.Name} + } + + _, err = db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source) if err != nil { return err } diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index b9d87b19f2f8f..c06796fdb492c 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -421,9 +421,11 @@ func EditAuthSourcePost(ctx *context.Context) { source.IsActive = form.IsActive source.IsSyncEnabled = form.IsSyncEnabled source.Cfg = config - // FIXME: if the name conflicts, it will result in 500: Error 1062: Duplicate entry 'aa' for key 'login_source.UQE_login_source_name' if err := auth.UpdateSource(source); err != nil { - if oauth2.IsErrOpenIDConnectInitialize(err) { + if auth.IsErrSourceAlreadyExist(err) { + ctx.Data["Err_Name"] = true + ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(auth.ErrSourceAlreadyExist).Name), tplAuthEdit, form) + } else if oauth2.IsErrOpenIDConnectInitialize(err) { ctx.Flash.Error(err.Error(), true) ctx.Data["Err_DiscoveryURL"] = true ctx.HTML(http.StatusOK, tplAuthEdit) From d0524a5afe3bf0b5c460d1c42374bd459f1abc26 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 31 Mar 2023 07:27:16 +0000 Subject: [PATCH 17/19] fix --- models/auth/source.go | 42 ++++++-- routers/web/admin/auths.go | 138 ++++++++++++++++++++++++-- templates/admin/auth/edit.tmpl | 124 +++++++++++------------ templates/admin/auth/new.tmpl | 2 +- templates/admin/auth/source/ldap.tmpl | 2 +- 5 files changed, 230 insertions(+), 78 deletions(-) diff --git a/models/auth/source.go b/models/auth/source.go index 0a904b7772394..373c44dc10797 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -42,6 +42,36 @@ func (typ Type) Int() int { return int(typ) } +// IsLDAP returns true of this type is of the LDAP type. +func (typ Type) IsLDAP() bool { + return typ == LDAP +} + +// IsDLDAP returns true of this type is of the DLDAP type. +func (typ Type) IsDLDAP() bool { + return typ == DLDAP +} + +// IsSMTP returns true of this type is of the SMTP type. +func (typ Type) IsSMTP() bool { + return typ == SMTP +} + +// IsPAM returns true of this type is of the PAM type. +func (typ Type) IsPAM() bool { + return typ == PAM +} + +// IsOAuth2 returns true of this type is of the OAuth2 type. +func (typ Type) IsOAuth2() bool { + return typ == OAuth2 +} + +// IsSSPI returns true of this type is of the SSPI type. +func (typ Type) IsSSPI() bool { + return typ == SSPI +} + // Names contains the name of LoginType values. var Names = map[Type]string{ LDAP: "LDAP (via BindDN)", @@ -150,32 +180,32 @@ func (source *Source) TypeName() string { // IsLDAP returns true of this source is of the LDAP type. func (source *Source) IsLDAP() bool { - return source.Type == LDAP + return source.Type.IsLDAP() } // IsDLDAP returns true of this source is of the DLDAP type. func (source *Source) IsDLDAP() bool { - return source.Type == DLDAP + return source.Type.IsDLDAP() } // IsSMTP returns true of this source is of the SMTP type. func (source *Source) IsSMTP() bool { - return source.Type == SMTP + return source.Type.IsSMTP() } // IsPAM returns true of this source is of the PAM type. func (source *Source) IsPAM() bool { - return source.Type == PAM + return source.Type.IsPAM() } // IsOAuth2 returns true of this source is of the OAuth2 type. func (source *Source) IsOAuth2() bool { - return source.Type == OAuth2 + return source.Type.IsOAuth2() } // IsSSPI returns true of this source is of the SSPI type. func (source *Source) IsSSPI() bool { - return source.Type == SSPI + return source.Type.IsSSPI() } // HasTLS returns true of this source supports TLS. diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index c06796fdb492c..95bfc8ec0e7e6 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -92,8 +92,7 @@ func NewAuthSource(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true - ctx.Data["CurrentTypeName"] = auth.Names[auth.LDAP] - ctx.Data["CurrentSecurityProtocol"] = ldap.SecurityProtocolNames[ldap.SecurityProtocolUnencrypted] + ctx.Data["TypeNames"] = auth.Names ctx.Data["AuthSources"] = authSources ctx.Data["SecurityProtocols"] = securityProtocols ctx.Data["SMTPAuths"] = smtp.Authenticators @@ -240,8 +239,6 @@ func NewAuthSourcePost(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true - ctx.Data["CurrentTypeName"] = auth.Type(form.Type).String() - ctx.Data["CurrentSecurityProtocol"] = ldap.SecurityProtocolNames[ldap.SecurityProtocol(form.SecurityProtocol)] ctx.Data["AuthSources"] = authSources ctx.Data["SecurityProtocols"] = securityProtocols ctx.Data["SMTPAuths"] = smtp.Authenticators @@ -334,15 +331,80 @@ func EditAuthSource(ctx *context.Context) { ctx.Data["SMTPAuths"] = smtp.Authenticators oauth2providers := oauth2.GetOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers + ctx.Data["SourceTypeNames"] = auth.Names source, err := auth.GetSourceByID(ctx.ParamsInt64(":authid")) if err != nil { ctx.ServerError("auth.GetSourceByID", err) return } - ctx.Data["Source"] = source ctx.Data["HasTLS"] = source.HasTLS() + form := forms.AuthenticationForm{ + ID : source.ID, + Type : source.Type.Int(), + Name : source.Name, + SkipVerify: source.SkipVerify, + IsActive : bool + IsSyncEnabled : bool + } + + if source.Cfg == nil { + + } + + switch source.Type { + case auth.LDAP, auth.DLDAP: + Name: form.Name, + Host: form.Host, + Port: form.Port, + SecurityProtocol: ldap.SecurityProtocol(form.SecurityProtocol), + SkipVerify: form.SkipVerify, + BindDN: form.BindDN, + UserDN: form.UserDN, + BindPassword: form.BindPassword, + UserBase: form.UserBase, + AttributeUsername: form.AttributeUsername, + AttributeName: form.AttributeName, + AttributeSurname: form.AttributeSurname, + AttributeMail: form.AttributeMail, + AttributesInBind: form.AttributesInBind, + AttributeSSHPublicKey: form.AttributeSSHPublicKey, + AttributeAvatar: form.AttributeAvatar, + SearchPageSize: pageSize, + Filter: form.Filter, + GroupsEnabled: form.GroupsEnabled, + GroupDN: form.GroupDN, + GroupFilter: form.GroupFilter, + GroupMemberUID: form.GroupMemberUID, + GroupTeamMap: form.GroupTeamMap, + GroupTeamMapRemoval: form.GroupTeamMapRemoval, + UserUID: form.UserUID, + AdminFilter: form.AdminFilter, + RestrictedFilter: form.RestrictedFilter, + AllowDeactivateAll: form.AllowDeactivateAll, + Enabled: true, + SkipLocalTwoFA: form.SkipLocalTwoFA, + + forms.SecurityProtocol= source.Cfg.SecurityProtocol.Int() + forms.Host = source.Cfg.Host + forms.Port = source.Cfg.Port + forms.BindDN = source.Cfg.BindDN + forms.BindPassword = source.Cfg.BindPassword + + case auth.SMTP: + + case auth.PAM: + + case auth.OAuth2: + + case auth.SSPI: + + default: + ctx.Error(http.StatusBadRequest) + return + } + if source.IsOAuth2() { type Named interface { Name() string @@ -355,7 +417,71 @@ func EditAuthSource(ctx *context.Context) { } } } - ctx.Data["Form"] = forms.AuthenticationForm{} + + ctx.Data["Form"] = forms.AuthenticationForm{ + + + UserBase : source.Cfg.UserBase, + UserDN : source.Cfg.UserDN, + AttributeUsername : source.Cfg.AttributeUsername, + AttributeName : source.Cfg.AttributeName, + AttributeSurname : source.Cfg.AttributeSurname, + AttributeMail : source.Cfg.AttributeMail, + AttributeSSHPublicKey : source.Cfg.AttributeSSHPublicKey, + AttributeAvatar : source.Cfg.AttributeAvatar, + AttributesInBind : source.Cfg.AttributesInBind, + UsePagedSearch : source.Cfg.UsePagedSearch, + SearchPageSize : source.Cfg.SearchPageSize, + Filter : source.Cfg.Filter, + AdminFilter : source.Cfg.AdminFilter, + GroupsEnabled : source.Cfg.GroupsEnabled, + GroupDN : source.Cfg.GroupDN, + GroupFilter : source.Cfg.GroupFilter, + GroupMemberUID : source.Cfg.GroupMemberUID, + UserUID : source.Cfg.UserUID, + RestrictedFilter : source.Cfg.RestrictedFilter, + AllowDeactivateAll: source.Cfg.AllowDeactivateAll, + + SMTPAuth : source.Cfg.Auth, + SMTPHost : source.Cfg.Host, + SMTPPort : source.Cfg.Port, + AllowedDomains : source.Cfg.AllowedDomains, + + TLS : bool + + HeloHostname : source.Cfg.HeloHostname, + DisableHelo : source.Cfg.DisableHelo, + ForceSMTPS : source.Cfg.ForceSMTPS, + PAMServiceName : source.Cfg.PAMServiceName, + PAMEmailDomain : source.Cfg.PAMEmailDomain, + Oauth2Provider : source.Cfg.Provider, + Oauth2Key : source.Cfg. + Oauth2Secret : source.Cfg. + OpenIDConnectAutoDiscoveryURL: source.Cfg. + Oauth2UseCustomURL : source.Cfg. + Oauth2TokenURL : source.Cfg. + Oauth2AuthURL : source.Cfg. + Oauth2ProfileURL : source.Cfg. + Oauth2EmailURL : source.Cfg. + Oauth2IconURL : source.Cfg. + Oauth2Tenant : source.Cfg. + Oauth2Scopes : string + Oauth2RequiredClaimName : string + Oauth2RequiredClaimValue : string + Oauth2GroupClaimName : string + Oauth2AdminGroup : string + Oauth2RestrictedGroup : string + Oauth2GroupTeamMap : string `binding:"ValidGroupTeamMap"` + Oauth2GroupTeamMapRemoval : bool + SkipLocalTwoFA : source.Cfg.SkipLocalTwoFA, + SSPIAutoCreateUsers : bool + SSPIAutoActivateUsers : bool + SSPIStripDomainNames : bool + SSPISeparatorReplacement : string `binding:"AlphaDashDot;MaxSize(5)"` + SSPIDefaultLanguage : string + GroupTeamMap : source.Cfg.GroupTeamMap, + GroupTeamMapRemoval : source.Cfg.GroupTeamMapRemoval, + } ctx.HTML(http.StatusOK, tplAuthEdit) } diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 52e56c9260bb8..9d5c4d994552c 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -10,25 +10,24 @@
{{template "base/disable_form_autofill"}} {{.CsrfTokenHtml}} - +
- - {{.Source.TypeName}} + + {{index .SourceTypeNames .Form.Type}}
- +
- {{if or .Source.IsLDAP .Source.IsDLDAP}} - {{$cfg:=.Source.Cfg}} + {{if or .Form.Type.IsLDAP .Form.Type.IsDLDAP}}
- -
{{$cfg.SecurityProtocolName}}
+ +
{{index .SecurityProtocols .Form.SecurityProtocol}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .SecurityProtocols}} @@ -39,74 +38,74 @@
- +
- +
- +
- {{if .Source.IsLDAP}} + {{if .Form.Type.IsLDAP}}
- +
- +
{{end}} -
+
- +
- {{if .Source.IsDLDAP}} + {{if .Form.Type.IsDLDAP}}
- +
{{end}}
- +
- +
- +

{{.locale.Tr "admin.auths.restricted_filter_helper"}}

- +
- +
- +
- +
- +
- +
@@ -114,78 +113,77 @@
- +
-
+
- +
- +
- +
- +
- +
- +
- {{if .Source.IsLDAP}} + {{if .Form.Type.IsLDAP}}
- +
-
+
- +
- +
{{end}}
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

- +
{{end}} - {{if .Source.IsSMTP}} - {{$cfg:=.Source.Cfg}} + {{if .Form.Type.IsSMTP}}
- -
{{$cfg.Auth}}
+ +
{{.Form.SMTPAuth}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .SMTPAuths}} @@ -196,77 +194,75 @@
- +
- +
- +

{{.locale.Tr "admin.auths.force_smtps_helper"}}

- +
- +

{{.locale.Tr "admin.auths.helo_hostname_helper"}}

- +
- +

{{.locale.Tr "admin.auths.allowed_domains_helper"}}

- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

{{end}} - {{if .Source.IsPAM}} - {{$cfg:=.Source.Cfg}} + {{if .Form.Type.IsPAM}}
- +
- +
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

{{end}} - {{if .Source.IsOAuth2}} - {{$cfg:=.Source.Cfg}} + {{if .Form.Type.IsOAuth2}}
- +
{{.CurrentOAuth2Provider.DisplayName}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -372,7 +368,7 @@ {{end}} - {{if .Source.IsSSPI}} + {{if .Form.Type.IsSSPI}} {{$cfg:=.Source.Cfg}}
@@ -416,7 +412,7 @@

{{.locale.Tr "admin.auths.sspi_default_language_helper"}}

{{end}} - {{if .Source.IsLDAP}} + {{if .Form.Type.IsLDAP}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 12888c0b0a051..a388e17b6e26a 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -15,7 +15,7 @@
-
{{.CurrentTypeName}}
+
{{index .TypeNames .Form.Type}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .AuthSources}} diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index 72bf1cb471880..824a6dc72e471 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -3,7 +3,7 @@
-
{{.CurrentSecurityProtocol}}
+
{{index .SecurityProtocols .Form.SecurityProtocol}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .SecurityProtocols}} From 6a2262d06e48b64cfe85a54310ad0078a9b5f8f8 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 6 Apr 2023 06:07:03 +0000 Subject: [PATCH 18/19] fix --- routers/web/admin/auths.go | 270 ++++++++++++++------------------- templates/admin/auth/edit.tmpl | 81 +++++----- 2 files changed, 154 insertions(+), 197 deletions(-) diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 95bfc8ec0e7e6..f345677973804 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -109,7 +109,6 @@ func NewAuthSource(ctx *context.Context) { SSPIAutoActivateUsers: true, SSPIStripDomainNames: true, SSPISeparatorReplacement: "_", - SSPIDefaultLanguage: "", } ctx.HTML(http.StatusOK, tplAuthNew) @@ -321,168 +320,132 @@ func NewAuthSourcePost(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/admin/auths") } -// EditAuthSource render editing auth source page -func EditAuthSource(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.auths.edit") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminAuthentications"] = true - - ctx.Data["SecurityProtocols"] = securityProtocols - ctx.Data["SMTPAuths"] = smtp.Authenticators - oauth2providers := oauth2.GetOAuth2Providers() - ctx.Data["OAuth2Providers"] = oauth2providers - ctx.Data["SourceTypeNames"] = auth.Names - +func parseSource(ctx *context.Context) *auth.Source { source, err := auth.GetSourceByID(ctx.ParamsInt64(":authid")) if err != nil { ctx.ServerError("auth.GetSourceByID", err) - return + return nil } ctx.Data["HasTLS"] = source.HasTLS() + ctx.Data["Type"] = source.Type form := forms.AuthenticationForm{ - ID : source.ID, - Type : source.Type.Int(), - Name : source.Name, - SkipVerify: source.SkipVerify, - IsActive : bool - IsSyncEnabled : bool + ID: source.ID, + Type: source.Type.Int(), + Name: source.Name, + IsActive: source.IsActive, + IsSyncEnabled: source.IsSyncEnabled, } - if source.Cfg == nil { - + if source.Cfg != nil { + switch source.Type { + case auth.LDAP, auth.DLDAP: + cfg := source.Cfg.(*ldap.Source) + if cfg.SearchPageSize > 0 { + form.UsePagedSearch = true + } + form.Host = cfg.Host + form.Port = cfg.Port + form.SecurityProtocol = cfg.SecurityProtocol.Int() + form.SkipVerify = cfg.SkipVerify + form.BindDN = cfg.BindDN + form.BindPassword = cfg.BindPassword + form.UserBase = cfg.UserBase + form.AttributeUsername = cfg.AttributeUsername + form.AttributeName = cfg.AttributeName + form.AttributeSurname = cfg.AttributeSurname + form.AttributeMail = cfg.AttributeMail + form.AttributesInBind = cfg.AttributesInBind + form.AttributeSSHPublicKey = cfg.AttributeSSHPublicKey + form.AttributeAvatar = cfg.AttributeAvatar + form.SearchPageSize = int(cfg.SearchPageSize) + form.Filter = cfg.Filter + form.GroupsEnabled = cfg.GroupsEnabled + form.GroupDN = cfg.GroupDN + form.GroupFilter = cfg.GroupFilter + form.GroupMemberUID = cfg.GroupMemberUID + form.GroupTeamMap = cfg.GroupTeamMap + form.GroupTeamMapRemoval = cfg.GroupTeamMapRemoval + form.UserUID = cfg.UserUID + form.AdminFilter = cfg.AdminFilter + form.RestrictedFilter = cfg.RestrictedFilter + form.AllowDeactivateAll = cfg.AllowDeactivateAll + //form.Enabled=cfg.Enabled + form.SkipLocalTwoFA = cfg.SkipLocalTwoFA + case auth.SMTP: + cfg := source.Cfg.(*smtp.Source) + form.SMTPAuth = cfg.Auth + form.SMTPHost = cfg.Host + form.SMTPPort = cfg.Port + form.AllowedDomains = cfg.AllowedDomains + form.ForceSMTPS = cfg.ForceSMTPS + form.SkipVerify = cfg.SkipVerify + form.HeloHostname = cfg.HeloHostname + form.DisableHelo = cfg.DisableHelo + form.SkipLocalTwoFA = cfg.SkipLocalTwoFA + case auth.PAM: + cfg := source.Cfg.(*pam_service.Source) + form.PAMServiceName = cfg.ServiceName + form.PAMEmailDomain = cfg.EmailDomain + form.SkipLocalTwoFA = cfg.SkipLocalTwoFA + case auth.OAuth2: + cfg := source.Cfg.(*oauth2.Source) + form.Oauth2Provider = cfg.Provider + form.Oauth2Key = cfg.ClientID + form.Oauth2Secret = cfg.ClientSecret + form.OpenIDConnectAutoDiscoveryURL = cfg.OpenIDConnectAutoDiscoveryURL + if cfg.CustomURLMapping != nil { + form.Oauth2UseCustomURL = true + form.Oauth2TokenURL = cfg.CustomURLMapping.TokenURL + form.Oauth2AuthURL = cfg.CustomURLMapping.AuthURL + form.Oauth2ProfileURL = cfg.CustomURLMapping.ProfileURL + form.Oauth2EmailURL = cfg.CustomURLMapping.EmailURL + form.Oauth2Tenant = cfg.CustomURLMapping.Tenant + } + form.Oauth2IconURL = cfg.IconURL + form.Oauth2Scopes = strings.Join(cfg.Scopes, ",") + form.Oauth2RequiredClaimName = cfg.RequiredClaimName + form.Oauth2RequiredClaimValue = cfg.RequiredClaimValue + form.SkipLocalTwoFA = cfg.SkipLocalTwoFA + form.Oauth2GroupClaimName = cfg.GroupClaimName + form.Oauth2RestrictedGroup = cfg.RestrictedGroup + form.Oauth2AdminGroup = cfg.AdminGroup + form.Oauth2GroupTeamMap = cfg.GroupTeamMap + form.Oauth2GroupTeamMapRemoval = cfg.GroupTeamMapRemoval + case auth.SSPI: + cfg := source.Cfg.(*sspi.Source) + form.SSPIAutoCreateUsers = cfg.AutoCreateUsers + form.SSPIAutoActivateUsers = cfg.AutoActivateUsers + form.SSPIStripDomainNames = cfg.StripDomainNames + form.SSPISeparatorReplacement = cfg.SeparatorReplacement + form.SSPIDefaultLanguage = cfg.DefaultLanguage + default: + ctx.Error(http.StatusBadRequest) + return nil + } } + ctx.Data["Form"] = form - switch source.Type { - case auth.LDAP, auth.DLDAP: - Name: form.Name, - Host: form.Host, - Port: form.Port, - SecurityProtocol: ldap.SecurityProtocol(form.SecurityProtocol), - SkipVerify: form.SkipVerify, - BindDN: form.BindDN, - UserDN: form.UserDN, - BindPassword: form.BindPassword, - UserBase: form.UserBase, - AttributeUsername: form.AttributeUsername, - AttributeName: form.AttributeName, - AttributeSurname: form.AttributeSurname, - AttributeMail: form.AttributeMail, - AttributesInBind: form.AttributesInBind, - AttributeSSHPublicKey: form.AttributeSSHPublicKey, - AttributeAvatar: form.AttributeAvatar, - SearchPageSize: pageSize, - Filter: form.Filter, - GroupsEnabled: form.GroupsEnabled, - GroupDN: form.GroupDN, - GroupFilter: form.GroupFilter, - GroupMemberUID: form.GroupMemberUID, - GroupTeamMap: form.GroupTeamMap, - GroupTeamMapRemoval: form.GroupTeamMapRemoval, - UserUID: form.UserUID, - AdminFilter: form.AdminFilter, - RestrictedFilter: form.RestrictedFilter, - AllowDeactivateAll: form.AllowDeactivateAll, - Enabled: true, - SkipLocalTwoFA: form.SkipLocalTwoFA, - - forms.SecurityProtocol= source.Cfg.SecurityProtocol.Int() - forms.Host = source.Cfg.Host - forms.Port = source.Cfg.Port - forms.BindDN = source.Cfg.BindDN - forms.BindPassword = source.Cfg.BindPassword - - case auth.SMTP: - - case auth.PAM: + return source +} - case auth.OAuth2: +// EditAuthSource render editing auth source page +func EditAuthSource(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.auths.edit") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminAuthentications"] = true - case auth.SSPI: + ctx.Data["SecurityProtocols"] = securityProtocols + ctx.Data["SMTPAuths"] = smtp.Authenticators + oauth2providers := oauth2.GetOAuth2Providers() + ctx.Data["OAuth2Providers"] = oauth2providers + ctx.Data["SourceTypeNames"] = auth.Names - default: - ctx.Error(http.StatusBadRequest) + parseSource(ctx) + if ctx.Written() { return } - if source.IsOAuth2() { - type Named interface { - Name() string - } - - for _, provider := range oauth2providers { - if provider.Name() == source.Cfg.(Named).Name() { - ctx.Data["CurrentOAuth2Provider"] = provider - break - } - } - } - - ctx.Data["Form"] = forms.AuthenticationForm{ - - - UserBase : source.Cfg.UserBase, - UserDN : source.Cfg.UserDN, - AttributeUsername : source.Cfg.AttributeUsername, - AttributeName : source.Cfg.AttributeName, - AttributeSurname : source.Cfg.AttributeSurname, - AttributeMail : source.Cfg.AttributeMail, - AttributeSSHPublicKey : source.Cfg.AttributeSSHPublicKey, - AttributeAvatar : source.Cfg.AttributeAvatar, - AttributesInBind : source.Cfg.AttributesInBind, - UsePagedSearch : source.Cfg.UsePagedSearch, - SearchPageSize : source.Cfg.SearchPageSize, - Filter : source.Cfg.Filter, - AdminFilter : source.Cfg.AdminFilter, - GroupsEnabled : source.Cfg.GroupsEnabled, - GroupDN : source.Cfg.GroupDN, - GroupFilter : source.Cfg.GroupFilter, - GroupMemberUID : source.Cfg.GroupMemberUID, - UserUID : source.Cfg.UserUID, - RestrictedFilter : source.Cfg.RestrictedFilter, - AllowDeactivateAll: source.Cfg.AllowDeactivateAll, - - SMTPAuth : source.Cfg.Auth, - SMTPHost : source.Cfg.Host, - SMTPPort : source.Cfg.Port, - AllowedDomains : source.Cfg.AllowedDomains, - - TLS : bool - - HeloHostname : source.Cfg.HeloHostname, - DisableHelo : source.Cfg.DisableHelo, - ForceSMTPS : source.Cfg.ForceSMTPS, - PAMServiceName : source.Cfg.PAMServiceName, - PAMEmailDomain : source.Cfg.PAMEmailDomain, - Oauth2Provider : source.Cfg.Provider, - Oauth2Key : source.Cfg. - Oauth2Secret : source.Cfg. - OpenIDConnectAutoDiscoveryURL: source.Cfg. - Oauth2UseCustomURL : source.Cfg. - Oauth2TokenURL : source.Cfg. - Oauth2AuthURL : source.Cfg. - Oauth2ProfileURL : source.Cfg. - Oauth2EmailURL : source.Cfg. - Oauth2IconURL : source.Cfg. - Oauth2Tenant : source.Cfg. - Oauth2Scopes : string - Oauth2RequiredClaimName : string - Oauth2RequiredClaimValue : string - Oauth2GroupClaimName : string - Oauth2AdminGroup : string - Oauth2RestrictedGroup : string - Oauth2GroupTeamMap : string `binding:"ValidGroupTeamMap"` - Oauth2GroupTeamMapRemoval : bool - SkipLocalTwoFA : source.Cfg.SkipLocalTwoFA, - SSPIAutoCreateUsers : bool - SSPIAutoActivateUsers : bool - SSPIStripDomainNames : bool - SSPISeparatorReplacement : string `binding:"AlphaDashDot;MaxSize(5)"` - SSPIDefaultLanguage : string - GroupTeamMap : source.Cfg.GroupTeamMap, - GroupTeamMapRemoval : source.Cfg.GroupTeamMapRemoval, - } - ctx.HTML(http.StatusOK, tplAuthEdit) } @@ -493,23 +456,18 @@ func EditAuthSourcePost(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true + ctx.Data["SecurityProtocols"] = securityProtocols ctx.Data["SMTPAuths"] = smtp.Authenticators oauth2providers := oauth2.GetOAuth2Providers() ctx.Data["OAuth2Providers"] = oauth2providers + ctx.Data["SourceTypeNames"] = auth.Names - source, err := auth.GetSourceByID(ctx.ParamsInt64(":authid")) - if err != nil { - ctx.ServerError("auth.GetSourceByID", err) - return - } - ctx.Data["Source"] = source - ctx.Data["HasTLS"] = source.HasTLS() - - if ctx.HasError() { - ctx.HTML(http.StatusOK, tplAuthEdit) + source := parseSource(ctx) + if ctx.Written() { return } + var err error var config convert.Conversion switch auth.Type(form.Type) { case auth.LDAP, auth.DLDAP: diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 9d5c4d994552c..340848efdc7d0 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -22,7 +22,7 @@
- {{if or .Form.Type.IsLDAP .Form.Type.IsDLDAP}} + {{if or .Type.IsLDAP .Type.IsDLDAP}}
@@ -50,7 +50,7 @@
- {{if .Form.Type.IsLDAP}} + {{if .Type.IsLDAP}}
@@ -60,11 +60,11 @@
{{end}} -
+
- +
- {{if .Form.Type.IsDLDAP}} + {{if .Type.IsDLDAP}}
@@ -144,7 +144,7 @@
- {{if .Form.Type.IsLDAP}} + {{if .Type.IsLDAP}}
@@ -178,7 +178,7 @@ {{end}} - {{if .Form.Type.IsSMTP}} + {{if .Type.IsSMTP}}
@@ -239,7 +239,7 @@ {{end}} - {{if .Form.Type.IsPAM}} + {{if .Type.IsPAM}}
@@ -258,12 +258,12 @@ {{end}} - {{if .Form.Type.IsOAuth2}} + {{if .Type.IsOAuth2}}
-
{{.CurrentOAuth2Provider.DisplayName}}
+
{{.From.Oauth2Provider}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range .OAuth2Providers}} @@ -274,52 +274,52 @@
- +
- +
- +
- +
- +

{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}

- +
- +
- +
- +
- +
- +
{{range .OAuth2Providers}}{{if .CustomURLSettings}} @@ -333,97 +333,96 @@
- +
- +

{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}

- +

{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}

- +
- +
- +
- +
- +
{{end}} - {{if .Form.Type.IsSSPI}} - {{$cfg:=.Source.Cfg}} + {{if .Type.IsSSPI}}
- +

{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}

- +

{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}

{{.locale.Tr "admin.auths.sspi_default_language_helper"}}

{{end}} - {{if .Form.Type.IsLDAP}} + {{if .Type.IsLDAP}}
- +
{{end}}
- +
From d268c40e155249b27eaede98369c1be64452ab16 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 6 Apr 2023 06:18:00 +0000 Subject: [PATCH 19/19] fix UpdateOrgSettingForm --- routers/web/org/setting.go | 13 ++++++++++--- templates/org/settings/options.tmpl | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 7d84c101d8a60..b132d734270a4 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -48,8 +48,16 @@ func Settings(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.settings") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsOptions"] = true - ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility - ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess + ctx.Data["Form"] = forms.UpdateOrgSettingForm{ + Name: ctx.Org.Organization.Name, + FullName: ctx.Org.Organization.FullName, + Description: ctx.Org.Organization.Description, + Website: ctx.Org.Organization.Website, + Location: ctx.Org.Organization.Location, + Visibility: ctx.Org.Organization.Visibility, + MaxRepoCreation: ctx.Org.Organization.MaxRepoCreation, + RepoAdminChangeTeamAccess: ctx.Org.Organization.RepoAdminChangeTeamAccess, + } ctx.HTML(http.StatusOK, tplSettingsOptions) } @@ -59,7 +67,6 @@ func SettingsPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.settings") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsOptions"] = true - ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility if ctx.HasError() { ctx.HTML(http.StatusOK, tplSettingsOptions) diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 833b97e347253..bc763046f4957 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -17,23 +17,23 @@ {{.locale.Tr "org.settings.change_orgname_prompt"}} {{.locale.Tr "org.settings.change_orgname_redirect_prompt"}} - +
- +
- +
- +
- +
@@ -41,19 +41,19 @@
- +
- +
- +
@@ -63,7 +63,7 @@
- +
@@ -74,7 +74,7 @@
- +

{{.locale.Tr "admin.users.max_repo_creation_desc"}}

{{end}}