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 <[email protected]> Co-authored-by: zeripath <[email protected]>
go-gitea · Oct 1, 2020 · 20a75f8 · 20a75f8
1 parent c1c5e00
commit 20a75f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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