From 156f54d6e2ec21b98ad070433fd94089ab3477c4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 1 Oct 2020 08:49:49 -0400 Subject: [PATCH] allow U2F with default settings for gitea in subpath (#12990) * allow U2F with default settings for gitea in subpath * use trim suffix Co-authored-by: zeripath --- modules/setting/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 867641e61..cdbe07f91 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -933,7 +933,7 @@ func NewContext() { newMarkup() sec = Cfg.Section("U2F") - U2F.TrustedFacets, _ = shellquote.Split(sec.Key("TRUSTED_FACETS").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, "/")) UI.ReactionsMap = make(map[string]bool)