From 320576624848131a15f663d62a1890bd14df1a24 Mon Sep 17 00:00:00 2001 From: Adhityaa Chandrasekar Date: Sun, 12 Aug 2018 22:38:48 +0530 Subject: [PATCH] config.go: add http prefix to ORIGIN and CDN_PREFIX --- api/config.go | 2 ++ api/utils_sanitise.go | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/api/config.go b/api/config.go index 7fa518e..6115bf8 100644 --- a/api/config.go +++ b/api/config.go @@ -63,12 +63,14 @@ func configParse() error { } os.Setenv("ORIGIN", strings.TrimSuffix(os.Getenv("ORIGIN"), "/")) + os.Setenv("ORIGIN", addHttpIfAbsent(os.Getenv("ORIGIN"))) if os.Getenv("CDN_PREFIX") == "" { os.Setenv("CDN_PREFIX", os.Getenv("ORIGIN")) } os.Setenv("CDN_PREFIX", strings.TrimSuffix(os.Getenv("ORIGIN"), "/")) + os.Setenv("CDN_PREFIX", addHttpIfAbsent(os.Getenv("CDN_PREFIX"))) if os.Getenv("FORBID_NEW_OWNERS") != "true" && os.Getenv("FORBID_NEW_OWNERS") != "false" { logger.Errorf("COMMENTO_FORBID_NEW_OWNERS neither 'true' nor 'false'") diff --git a/api/utils_sanitise.go b/api/utils_sanitise.go index 087b274..bf59643 100644 --- a/api/utils_sanitise.go +++ b/api/utils_sanitise.go @@ -2,6 +2,7 @@ package main import ( "regexp" + "strings" ) var prePlusMatch = regexp.MustCompile(`([^@\+]*)\+?(.*)@.*`) @@ -43,3 +44,11 @@ func isHttpsUrl(in string) bool { // solves this. If this function returns false, prefix with "http://" return len(httpsUrl.FindAllString(in, -1)) != 0 } + +func addHttpIfAbsent(in string) string { + if !strings.HasPrefix(in, "http://") && !strings.HasPrefix(in, "https://") { + return "http://" + in + } + + return in +}