Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Respect alt --appdata default location of clients.pem #1927

Merged
merged 1 commit into from Nov 24, 2020
Merged

Respect alt --appdata default location of clients.pem #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions config.go
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@ type config struct {
// RPC client options
RPCConnect string `short:"c" long:"rpcconnect" description:"Network address of dcrd RPC server"`
CAFile *cfgutil.ExplicitString `long:"cafile" description:"dcrd RPC Certificate Authority"`
ClientCAFile string `long:"clientcafile" description:"Certficate Authority to verify TLS client certificates"`
ClientCAFile *cfgutil.ExplicitString `long:"clientcafile" description:"Certficate Authority to verify TLS client certificates"`
DisableClientTLS bool `long:"noclienttls" description:"Disable TLS for dcrd RPC; only allowed when connecting to localhost"`
DcrdUsername string `long:"dcrdusername" description:"dcrd RPC username; overrides --username"`
DcrdPassword string `long:"dcrdpassword" default-mask:"-" description:"dcrd RPC password; overrides --password"`
Expand Down Expand Up @@ -333,7 +333,7 @@ func loadConfig(ctx context.Context) (*config, []string, error) {
LogDir: cfgutil.NewExplicitString(defaultLogDir),
WalletPass: wallet.InsecurePubPassphrase,
CAFile: cfgutil.NewExplicitString(""),
ClientCAFile: defaultRPCClientCAFile,
ClientCAFile: cfgutil.NewExplicitString(defaultRPCClientCAFile),
dial: new(net.Dialer).DialContext,
lookup: net.LookupIP,
PromptPass: defaultPromptPass,
Expand Down Expand Up @@ -433,6 +433,9 @@ func loadConfig(ctx context.Context) (*config, []string, error) {
if !cfg.RPCCert.ExplicitlySet() {
cfg.RPCCert.Value = filepath.Join(cfg.AppDataDir.Value, "rpc.cert")
}
if !cfg.ClientCAFile.ExplicitlySet() {
cfg.ClientCAFile.Value = filepath.Join(cfg.AppDataDir.Value, "clients.pem")
}
if !cfg.LogDir.ExplicitlySet() {
cfg.LogDir.Value = filepath.Join(cfg.AppDataDir.Value, defaultLogDirname)
}
Expand Down Expand Up @@ -921,7 +924,7 @@ func loadConfig(ctx context.Context) (*config, []string, error) {
cfg.CAFile.Value = cleanAndExpandPath(cfg.CAFile.Value)
cfg.RPCCert.Value = cleanAndExpandPath(cfg.RPCCert.Value)
cfg.RPCKey.Value = cleanAndExpandPath(cfg.RPCKey.Value)
cfg.ClientCAFile = cleanAndExpandPath(cfg.ClientCAFile)
cfg.ClientCAFile.Value = cleanAndExpandPath(cfg.ClientCAFile.Value)

// If the dcrd username or password are unset, use the same auth as for
// the client. The two settings were previously shared for dcrd and
Expand Down
4 changes: 2 additions & 2 deletions rpcserver.go
View file
Open in desktop
Expand Up @@ -265,9 +265,9 @@ func startRPCServers(walletLoader *loader.Loader) (*grpc.Server, *jsonrpc.Server
MinVersion: tls.VersionTLS12,
ClientCAs: x509.NewCertPool(),
}
clientCAsExist, _ = cfgutil.FileExists(cfg.ClientCAFile)
clientCAsExist, _ = cfgutil.FileExists(cfg.ClientCAFile.Value)
if clientCAsExist {
cafile, err := ioutil.ReadFile(cfg.ClientCAFile)
cafile, err := ioutil.ReadFile(cfg.ClientCAFile.Value)
if err != nil {
return nil, nil, err
}
Expand Down