greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: curl: exit with error status on HTTP errors

Browse Source 
This makes scripts fail early on request errors.
Previously, curl exited with status 0 when enountering HTTP error status
codes.
`-fsS` equals `--fail --silent --show-error`.
This commit is contained in:
Erik Arvstedt 2022-05-17 13:18:38 +02:00
parent 63b3eec9cd
commit 84fe731c94
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helper/fetch-release
View File

@ -8,7 +8,7 @@ trap 'echo "Error at ${BASH_SOURCE[0]}, line $LINENO"' ERR
repo=fort-nix/nix-bitcoin repo=fort-nix/nix-bitcoin
if [[ ! -v version ]]; then if [[ ! -v version ]]; then
version=$(curl -s --show-error "https://api.github.com/repos/$repo/releases/latest" | jq -r '.tag_name' | tail -c +2) version=$(curl -fsS "https://api.github.com/repos/$repo/releases/latest" | jq -r '.tag_name' | tail -c +2)
fi fi
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
@ -27,8 +27,8 @@ gpg --list-keys "36C7 1A37 C9D9 88BD E825 08D9 B1A7 0E4F 8DCD 0366" > /dev/null
# Fetch nar-hash of release # Fetch nar-hash of release
cd $TMPDIR cd $TMPDIR
baseUrl=https://github.com/$repo/releases/download/v$version baseUrl=https://github.com/$repo/releases/download/v$version
curl -s --show-error -L -O $baseUrl/nar-hash.txt curl -fsS -L -O $baseUrl/nar-hash.txt
curl -s --show-error -L -O $baseUrl/nar-hash.txt.asc curl -fsS -L -O $baseUrl/nar-hash.txt.asc
# Verify signature for nar-hash # Verify signature for nar-hash
gpg --verify nar-hash.txt.asc &> /dev/null || { gpg --verify nar-hash.txt.asc &> /dev/null || {

2
modules/lnd.nix
View File

@ -234,7 +234,7 @@ in {
RestartSec = "10s"; RestartSec = "10s";
ReadWritePaths = [ cfg.dataDir ]; ReadWritePaths = [ cfg.dataDir ];
ExecStartPost = let ExecStartPost = let
curl = "${pkgs.curl}/bin/curl -s --show-error --cacert ${cfg.certPath}"; curl = "${pkgs.curl}/bin/curl -fsS --cacert ${cfg.certPath}";
restUrl = "https://${nbLib.addressWithPort cfg.restAddress cfg.restPort}/v1"; restUrl = "https://${nbLib.addressWithPort cfg.restAddress cfg.restPort}/v1";
in in
# Setting macaroon permissions for other users needs root permissions # Setting macaroon permissions for other users needs root permissions

2
pkgs/lndinit/get-sha256.sh
View File

@ -8,7 +8,7 @@ cd $TMPDIR
echo "Fetching latest release" echo "Fetching latest release"
repo=lightninglabs/lndinit repo=lightninglabs/lndinit
latest=$(curl -s --show-error https://api.github.com/repos/$repo/releases/latest | jq -r .tag_name) latest=$(curl -fsS https://api.github.com/repos/$repo/releases/latest | jq -r .tag_name)
echo "Latest release is $latest" echo "Latest release is $latest"
git clone --depth 1 --branch $latest https://github.com/lightninglabs/lndinit 2>/dev/null git clone --depth 1 --branch $latest https://github.com/lightninglabs/lndinit 2>/dev/null
cd lndinit cd lndinit

6
test/tests.py
View File

@ -203,13 +203,13 @@ def _():
wait_for_open_port(ip("btcpayserver"), 23000) wait_for_open_port(ip("btcpayserver"), 23000)
# test lnd custom macaroon # test lnd custom macaroon
assert_matches( assert_matches(
"runuser -u btcpayserver -- curl -s --cacert /secrets/lnd-cert " "runuser -u btcpayserver -- curl -fsS --cacert /secrets/lnd-cert "
'--header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 /run/lnd/btcpayserver.macaroon)" ' '--header "Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 /run/lnd/btcpayserver.macaroon)" '
f"-X GET https://{ip('lnd')}:8080/v1/getinfo | jq", f"-X GET https://{ip('lnd')}:8080/v1/getinfo | jq",
'"version"', '"version"',
) )
# Test web server response # Test web server response
assert_matches(f"curl -L {ip('btcpayserver')}:23000", "Welcome to your BTCPay Server") assert_matches(f"curl -fsS -L {ip('btcpayserver')}:23000", "Welcome to your BTCPay Server")
@test("rtl") @test("rtl")
def _(): def _():
@ -230,7 +230,7 @@ def _():
assert_running("spark-wallet") assert_running("spark-wallet")
wait_for_open_port(ip("spark-wallet"), 9737) wait_for_open_port(ip("spark-wallet"), 9737)
spark_auth = re.search("login=(.*)", succeed("cat /secrets/spark-wallet-login"))[1] spark_auth = re.search("login=(.*)", succeed("cat /secrets/spark-wallet-login"))[1]
assert_matches(f"curl -s {spark_auth}@{ip('spark-wallet')}:9737", "Spark") assert_matches(f"curl -fsS {spark_auth}@{ip('spark-wallet')}:9737", "Spark")
@test("joinmarket") @test("joinmarket")
def _(): def _():