compare setting once

Author: 6543

modules/markup/html.go

@@ -386,7 +386,7 @@ func visitNode(ctx *RenderContext, procs, textProcs []processor, node *html.Node
 
 					attr.Val = util.URLJoin(prefix, attr.Val)
 				}
-				if setting.CamoServerURL != "" {
+				if setting.CamoEnabled {
 					lnkURL, err := url.Parse(attr.Val)
 					if err != nil && lnkURL.IsAbs() && !strings.HasPrefix(attr.Val, setting.AppURL) &&
 						(setting.CamoAllways || lnkURL.Scheme != "https") {

modules/setting/setting.go

@@ -196,6 +196,7 @@ var (
 	PasswordHashAlgo                   string
 	PasswordCheckPwn                   bool
 	SuccessfulTokensCacheSize          int
+	CamoEnabled                        bool
 	CamoServerURL                      string
 	CamoHMACKey                        string
 	CamoAllways                        bool
@@ -920,9 +921,12 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
 	CamoServerURL = sec.Key("CAMO_SERVER_URL").MustString("")
 	CamoHMACKey = sec.Key("CAMO_HMAC_KEY").MustString("")
 	CamoAllways = sec.Key("CAMO_ALLWAYS").MustBool(false)
-	if CamoServerURL != "" && CamoHMACKey == "" {
-		log.Error("CAMO_SERVER_URL is set but CAMO_HMAC_KEY is empty, skip media proxy settings")
-		CamoServerURL = ""
+	if CamoServerURL != "" {
+		if CamoHMACKey == "" {
+			log.Error("CAMO_SERVER_URL is set but CAMO_HMAC_KEY is empty, skip media proxy settings")
+		} else {
+			CamoEnabled = true
+		}
 	}
 
 	InternalToken = loadInternalToken(sec)