fix: address btcpay hardening review feedback
Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
co-authored by
naturallaw777
parent
05a42bcc4b
commit
dcfee1fb32
@@ -423,21 +423,21 @@ in {
|
|||||||
|
|
||||||
if [[ ! -e "$hmacFile" ]]; then
|
if [[ ! -e "$hmacFile" ]]; then
|
||||||
echo "Error: Bitcoin RPC HMAC file is missing: $hmacFile" >&2
|
echo "Error: Bitcoin RPC HMAC file is missing: $hmacFile" >&2
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [[ ! -r "$hmacFile" ]]; then
|
if [[ ! -r "$hmacFile" ]]; then
|
||||||
echo "Error: Bitcoin RPC HMAC file is unreadable: $hmacFile" >&2
|
echo "Error: Bitcoin RPC HMAC file is unreadable: $hmacFile" >&2
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
hmacPayload="$(<"$hmacFile")"
|
hmacPayload="$(<"$hmacFile")"
|
||||||
if [[ -z "$hmacPayload" ]]; then
|
if [[ -z "$hmacPayload" ]]; then
|
||||||
echo "Error: Bitcoin RPC HMAC file is empty: $hmacFile" >&2
|
echo "Error: Bitcoin RPC HMAC file is empty: $hmacFile" >&2
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [[ ! "$hmacPayload" =~ ^[[:xdigit:]]+\$[[:xdigit:]]+$ ]]; then
|
if [[ ! "$hmacPayload" =~ ^[[:xdigit:]]+\$[[:xdigit:]]+$ ]]; then
|
||||||
echo "Error: Bitcoin RPC HMAC file has invalid format: $hmacFile" >&2
|
echo "Error: Bitcoin RPC HMAC file has invalid format: $hmacFile" >&2
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf '%s\n' "$hmacPayload"
|
printf '%s\n' "$hmacPayload"
|
||||||
|
|||||||
@@ -264,9 +264,8 @@ in {
|
|||||||
);
|
);
|
||||||
in rec {
|
in rec {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
requires = [ "postgresql.target" ];
|
requires = [ "postgresql.target" "nbxplorer.service" ];
|
||||||
wants = [ "nbxplorer.service" ]
|
wants = optional (cfg.btcpayserver.lightningBackend == "lnd") "lnd.service";
|
||||||
++ optional (cfg.btcpayserver.lightningBackend == "lnd") "lnd.service";
|
|
||||||
after = requires ++ wants;
|
after = requires ++ wants;
|
||||||
serviceConfig = nbLib.defaultHardening // {
|
serviceConfig = nbLib.defaultHardening // {
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user