[lbry] config: allow non-localhost connections with TLS disabled
This commit is contained in:
parent
b4a9f5f524
commit
9d812ab865
1 changed files with 2 additions and 21 deletions
23
config.go
23
config.go
|
@ -568,17 +568,7 @@ func loadConfig() (*config, []string, error) {
|
|||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if cfg.DisableClientTLS {
|
||||
if _, ok := localhostListeners[RPCHost]; !ok {
|
||||
str := "%s: the --noclienttls option may not be used " +
|
||||
"when connecting RPC to non localhost " +
|
||||
"addresses: %s"
|
||||
err := fmt.Errorf(str, funcName, cfg.RPCConnect)
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
fmt.Fprintln(os.Stderr, usageMessage)
|
||||
return nil, nil, err
|
||||
}
|
||||
} else {
|
||||
if !cfg.DisableClientTLS {
|
||||
// If CAFile is unset, choose either the copy or local lbcd cert.
|
||||
if !cfg.CAFile.ExplicitlySet() {
|
||||
cfg.CAFile.Value = filepath.Join(cfg.AppDataDir.Value, defaultCAFilename)
|
||||
|
@ -664,7 +654,7 @@ func loadConfig() (*config, []string, error) {
|
|||
allListeners := append(cfg.LegacyRPCListeners,
|
||||
cfg.ExperimentalRPCListeners...)
|
||||
for _, addr := range allListeners {
|
||||
host, _, err := net.SplitHostPort(addr)
|
||||
_, _, err := net.SplitHostPort(addr)
|
||||
if err != nil {
|
||||
str := "%s: RPC listen interface '%s' is " +
|
||||
"invalid: %v"
|
||||
|
@ -673,15 +663,6 @@ func loadConfig() (*config, []string, error) {
|
|||
fmt.Fprintln(os.Stderr, usageMessage)
|
||||
return nil, nil, err
|
||||
}
|
||||
if _, ok := localhostListeners[host]; !ok {
|
||||
str := "%s: the --noservertls option may not be used " +
|
||||
"when binding RPC to non localhost " +
|
||||
"addresses: %s"
|
||||
err := fmt.Errorf(str, funcName, addr)
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
fmt.Fprintln(os.Stderr, usageMessage)
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue