From c81ab17de93ee14268ad2088d1b63e0162e3dd23 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 20 May 2020 17:16:06 +0100 Subject: TrimSpace when reading InternalToken from a file (#11502) InternalTokens are fixed as alphanum strings therefore TrimSpace from these. Also use isatty to not add a terminal newline when redirecting generate. Fix #11498 Signed-off-by: Andrew Thornton Co-authored-by: Lauris BH --- modules/setting/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/setting') diff --git a/modules/setting/setting.go b/modules/setting/setting.go index ede4687c81..9507d46930 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1069,7 +1069,7 @@ func loadInternalToken(sec *ini.Section) string { return token } - return string(buf) + return strings.TrimSpace(string(buf)) default: log.Fatal("Unsupported URI-Scheme %q (INTERNAL_TOKEN_URI = %q)", tempURI.Scheme, uri) } -- cgit v1.2.3