From 20a75f86a16dba5b4039b9d4dee695cf82501cfd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 1 Oct 2020 13:22:49 -0400 Subject: [PATCH] allow U2F with default settings for gitea in subpath (#12990) (#13001) * allow U2F with default settings for gitea in subpath * use trim suffix Co-authored-by: zeripath Co-authored-by: zeripath --- modules/setting/setting.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 45e55a2f9..42a01cc11 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1032,8 +1032,8 @@ func NewContext() { newMarkup() sec = Cfg.Section("U2F") - U2F.TrustedFacets, _ = shellquote.Split(sec.Key("TRUSTED_FACETS").MustString(strings.TrimRight(AppURL, "/"))) - U2F.AppID = sec.Key("APP_ID").MustString(strings.TrimRight(AppURL, "/")) + U2F.TrustedFacets, _ = shellquote.Split(sec.Key("TRUSTED_FACETS").MustString(strings.TrimSuffix(AppURL, AppSubURL+"/"))) + U2F.AppID = sec.Key("APP_ID").MustString(strings.TrimSuffix(AppURL, "/")) zip.Verbose = false