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 <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
zeripath 2020-05-20 17:16:06 +01:00 committed by GitHub
parent 0903b1ac8c
commit c81ab17de9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions

View file

@ -7,9 +7,11 @@ package cmd
import ( import (
"fmt" "fmt"
"os"
"code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/generate"
"github.com/mattn/go-isatty"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -59,7 +61,12 @@ func runGenerateInternalToken(c *cli.Context) error {
return err return err
} }
fmt.Printf("%s\n", internalToken) fmt.Printf("%s", internalToken)
if isatty.IsTerminal(os.Stdout.Fd()) {
fmt.Printf("\n")
}
return nil return nil
} }
@ -69,7 +76,12 @@ func runGenerateLfsJwtSecret(c *cli.Context) error {
return err return err
} }
fmt.Printf("%s\n", JWTSecretBase64) fmt.Printf("%s", JWTSecretBase64)
if isatty.IsTerminal(os.Stdout.Fd()) {
fmt.Printf("\n")
}
return nil return nil
} }
@ -79,6 +91,11 @@ func runGenerateSecretKey(c *cli.Context) error {
return err return err
} }
fmt.Printf("%s\n", secretKey) fmt.Printf("%s", secretKey)
if isatty.IsTerminal(os.Stdout.Fd()) {
fmt.Printf("\n")
}
return nil return nil
} }

View file

@ -1069,7 +1069,7 @@ func loadInternalToken(sec *ini.Section) string {
return token return token
} }
return string(buf) return strings.TrimSpace(string(buf))
default: default:
log.Fatal("Unsupported URI-Scheme %q (INTERNAL_TOKEN_URI = %q)", tempURI.Scheme, uri) log.Fatal("Unsupported URI-Scheme %q (INTERNAL_TOKEN_URI = %q)", tempURI.Scheme, uri)
} }