starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-05-05 22:53:23 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

generic support for weird curl versions with lower-case headers and no whitespace

Browse Source
This commit is contained in:
Lukas Schauer
2021-03-21 20:51:10 +01:00
parent 21bff55b7c
commit 24f66a3473
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dehydrated
View File

@@ -711,7 +711,7 @@ init_system() {
# if account URL is not storred, fetch it from the CA # if account URL is not storred, fetch it from the CA
if [[ -z "${ACCOUNT_URL:-}" ]]; then if [[ -z "${ACCOUNT_URL:-}" ]]; then
echo "+ Fetching account URL..." echo "+ Fetching account URL..."
ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')" ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | cut -d':' -f2- | tr -d ' \t\r\n')"
if [[ -z "${ACCOUNT_URL}" ]]; then if [[ -z "${ACCOUNT_URL}" ]]; then
_exiterr "Unknown error on fetching account information" _exiterr "Unknown error on fetching account information"
fi fi
@@ -723,7 +723,7 @@ init_system() {
if [[ ${API} -eq 1 ]]; then if [[ ${API} -eq 1 ]]; then
_exiterr "This is not implemented for ACMEv1! Consider switching to ACMEv2 :)" _exiterr "This is not implemented for ACMEv1! Consider switching to ACMEv2 :)"
else else
ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')" ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | cut -d':' -f2- | tr -d ' \t\r\n')"
ACCOUNT_INFO="$(signed_request "${ACCOUNT_URL}" '{}')" ACCOUNT_INFO="$(signed_request "${ACCOUNT_URL}" '{}')"
fi fi
echo "${ACCOUNT_INFO}" > "${ACCOUNT_KEY_JSON}" echo "${ACCOUNT_INFO}" > "${ACCOUNT_KEY_JSON}"
@@ -875,9 +875,9 @@ signed_request() {
# Retrieve nonce from acme-server # Retrieve nonce from acme-server
if [[ ${API} -eq 1 ]]; then if [[ ${API} -eq 1 ]]; then
nonce="$(http_request head "${CA}" | grep -i ^Replay-Nonce: | awk -F ':' '{print $2}' | tr -d ' \n\r')" nonce="$(http_request head "${CA}" | grep -i ^Replay-Nonce: | cut -d':' -f2- | tr -d ' \t\n\r')"
else else
nonce="$(http_request head "${CA_NEW_NONCE}" | grep -i ^Replay-Nonce: | awk -F ':' '{print $2}' | tr -d ' \n\r')" nonce="$(http_request head "${CA_NEW_NONCE}" | grep -i ^Replay-Nonce: | cut -d':' -f2- | tr -d ' \t\n\r')"
fi fi
# Build header with just our public key and algorithm information # Build header with just our public key and algorithm information
@@ -983,7 +983,7 @@ sign_csr() {
challenge_identifiers="[${challenge_identifiers%, }]" challenge_identifiers="[${challenge_identifiers%, }]"
echo " + Requesting new certificate order from CA..." echo " + Requesting new certificate order from CA..."
order_location="$(signed_request "${CA_NEW_ORDER}" '{"identifiers": '"${challenge_identifiers}"'}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')" order_location="$(signed_request "${CA_NEW_ORDER}" '{"identifiers": '"${challenge_identifiers}"'}' 4>&1 | grep -i ^Location: | cut -d':' -f2- | tr -d ' \t\r\n')"
result="$(signed_request "${order_location}" "" | jsonsh)" result="$(signed_request "${order_location}" "" | jsonsh)"
order_authorizations="$(echo "${result}" | get_json_array_values authorizations)" order_authorizations="$(echo "${result}" | get_json_array_values authorizations)"