roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

node: allow JWT pass by file only (#24579)

Browse Source
This commit is contained in:
Marius van der Wijden 2022-03-24 15:04:47 +01:00 committed by GitHub
parent 535f25d65f
commit a8040bc2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/utils/flags.go
View File

@ -548,7 +548,7 @@ var (
} }
JWTSecretFlag = cli.StringFlag{ JWTSecretFlag = cli.StringFlag{
Name: "authrpc.jwtsecret", Name: "authrpc.jwtsecret",
Usage: "JWT secret (or path to a jwt secret) to use for authenticated RPC endpoints", Usage: "Path to a JWT secret to use for authenticated RPC endpoints",
} }
// Logging and debug settings // Logging and debug settings
EthStatsURLFlag = cli.StringFlag{ EthStatsURLFlag = cli.StringFlag{

13
node/node.go
View File

@ -346,17 +346,8 @@ func (n *Node) closeDataDir() {
// or from the default location. If neither of those are present, it generates // or from the default location. If neither of those are present, it generates
// a new secret and stores to the default location. // a new secret and stores to the default location.
func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) { func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) {
var fileName string fileName := cliParam
if len(cliParam) > 0 { if len(fileName) == 0 {
// If a plaintext secret was provided via cli flags, use that
jwtSecret := common.FromHex(cliParam)
if len(jwtSecret) == 32 && strings.HasPrefix(cliParam, "0x") {
log.Warn("Plaintext JWT secret provided, please consider passing via file")
return jwtSecret, nil
}
// path provided
fileName = cliParam
} else {
// no path provided, use default // no path provided, use default
fileName = n.ResolvePath(datadirJWTKey) fileName = n.ResolvePath(datadirJWTKey)
} }