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

replace echo (-n) with printf

Browse Source 
printf is more portable and never interprets any escape characters.
This commit is contained in:
Simon Ruderich
2015-12-05 14:08:41 +01:00
parent a53cd91694
commit 4aa48d33d5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
letsencrypt.sh
View File

@@ -12,16 +12,16 @@ hex2bin() {
} }
signed_request() { signed_request() {
payload64="$(echo -n "${2}" | urlbase64)" payload64="$(printf '%s' "${2}" | urlbase64)"
nonce="$(curl -s -I "${CA}"/directory | grep Replay-Nonce | awk -F ': ' '{print $2}' | tr -d '\n\r')" nonce="$(curl -s -I "${CA}"/directory | grep Replay-Nonce | awk -F ': ' '{print $2}' | tr -d '\n\r')"
header='{"alg": "RS256", "jwk": {"e": "'"${pubExponent64}"'", "kty": "RSA", "n": "'"${pubMod64}"'"}}' header='{"alg": "RS256", "jwk": {"e": "'"${pubExponent64}"'", "kty": "RSA", "n": "'"${pubMod64}"'"}}'
protected='{"alg": "RS256", "jwk": {"e": "'"${pubExponent64}"'", "kty": "RSA", "n": "'"${pubMod64}"'"}, "nonce": "'"${nonce}"'"}' protected='{"alg": "RS256", "jwk": {"e": "'"${pubExponent64}"'", "kty": "RSA", "n": "'"${pubMod64}"'"}, "nonce": "'"${nonce}"'"}'
protected64="$(echo -n "${protected}" | urlbase64)" protected64="$(printf '%s' "${protected}" | urlbase64)"
signed64="$(echo -n "${protected64}.${payload64}" | openssl dgst -sha256 -sign private_key.pem | urlbase64)" signed64="$(printf '%s' "${protected64}.${payload64}" | openssl dgst -sha256 -sign private_key.pem | urlbase64)"
data='{"header": '"${header}"', "protected": "'"${protected64}"'", "payload": "'"${payload64}"'", "signature": "'"${signed64}"'"}' data='{"header": '"${header}"', "protected": "'"${protected64}"'", "payload": "'"${payload64}"'", "signature": "'"${signed64}"'"}'
@@ -37,7 +37,7 @@ sign_domain() {
for altname in $altnames; do for altname in $altnames; do
SAN+="DNS:${altname}, " SAN+="DNS:${altname}, "
done done
SAN="$(echo -n "${SAN}" | sed 's/,\s*$//g')" SAN="$(printf '%s' "${SAN}" | sed 's/,\s*$//g')"
mkdir "certs/${domain}" mkdir "certs/${domain}"
@@ -51,8 +51,8 @@ sign_domain() {
echo " + Requesting challenge for ${altname}..." echo " + Requesting challenge for ${altname}..."
response="$(signed_request "${CA}/acme/new-authz" '{"resource": "new-authz", "identifier": {"type": "dns", "value": "'"${altname}"'"}}')" response="$(signed_request "${CA}/acme/new-authz" '{"resource": "new-authz", "identifier": {"type": "dns", "value": "'"${altname}"'"}}')"
challenge_token="$(echo "${response}" | grep -Eo '"challenges":[^\[]*\[[^]]*]' | sed 's/{/\n{/g' | grep 'http-01' | grep -Eo '"token":\s*"[^"]*"' | cut -d'"' -f4 | sed 's/[^A-Za-z0-9_\-]/_/g')" challenge_token="$(printf '%s\n' "${response}" | grep -Eo '"challenges":[^\[]*\[[^]]*]' | sed 's/{/\n{/g' | grep 'http-01' | grep -Eo '"token":\s*"[^"]*"' | cut -d'"' -f4 | sed 's/[^A-Za-z0-9_\-]/_/g')"
challenge_uri="$(echo "${response}" | grep -Eo '"challenges":[^\[]*\[[^]]*]' | sed 's/{/\n{/g' | grep 'http-01' | grep -Eo '"uri":\s*"[^"]*"' | cut -d'"' -f4)" challenge_uri="$(printf '%s\n' "${response}" | grep -Eo '"challenges":[^\[]*\[[^]]*]' | sed 's/{/\n{/g' | grep 'http-01' | grep -Eo '"uri":\s*"[^"]*"' | cut -d'"' -f4)"
if [ "${challenge_token}" = "" ] || [ "${challenge_uri}" = "" ]; then if [ "${challenge_token}" = "" ] || [ "${challenge_uri}" = "" ]; then
echo " + Error: Can't retrieve challenges (${response})" echo " + Error: Can't retrieve challenges (${response})"
@@ -61,12 +61,12 @@ sign_domain() {
keyauth="${challenge_token}.${thumbprint}" keyauth="${challenge_token}.${thumbprint}"
echo -n "${keyauth}" > "${WELLKNOWN}/${challenge_token}" printf '%s' "${keyauth}" > "${WELLKNOWN}/${challenge_token}"
echo " + Responding to challenge for ${altname}..." echo " + Responding to challenge for ${altname}..."
result="$(signed_request "${challenge_uri}" '{"resource": "challenge", "keyAuthorization": "'"${keyauth}"'"}')" result="$(signed_request "${challenge_uri}" '{"resource": "challenge", "keyAuthorization": "'"${keyauth}"'"}')"
status="$(echo "${result}" | grep -Eo '"status":\s*"[^"]*"' | cut -d'"' -f4)" status="$(printf '%s\n' "${result}" | grep -Eo '"status":\s*"[^"]*"' | cut -d'"' -f4)"
if [ ! "${status}" = "pending" ] && [ ! "${status}" = "valid" ]; then if [ ! "${status}" = "pending" ] && [ ! "${status}" = "valid" ]; then
echo " + Challenge is invalid! (${result})" echo " + Challenge is invalid! (${result})"
@@ -83,7 +83,7 @@ sign_domain() {
echo " + Requesting certificate..." echo " + Requesting certificate..."
csr64="$(openssl req -in "certs/${domain}/cert.csr" -outform DER | urlbase64)" csr64="$(openssl req -in "certs/${domain}/cert.csr" -outform DER | urlbase64)"
crt64="$(signed_request "${CA}/acme/new-cert" '{"resource": "new-cert", "csr": "'"${csr64}"'"}' | base64 -w 64)" crt64="$(signed_request "${CA}/acme/new-cert" '{"resource": "new-cert", "csr": "'"${csr64}"'"}' | base64 -w 64)"
echo -e "-----BEGIN CERTIFICATE-----\n${crt64}\n-----END CERTIFICATE-----\n" > "certs/${domain}/cert.pem" printf -- '-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----\n' "${crt64}" > "certs/${domain}/cert.pem"
echo " + Done!" echo " + Done!"
} }
@@ -95,9 +95,9 @@ if [ ! -e "private_key.pem" ]; then
fi fi
pubExponent64="$(printf "%06x" "$(openssl rsa -in private_key.pem -noout -text | grep publicExponent | head -1 | cut -d' ' -f2)" | hex2bin | urlbase64)" pubExponent64="$(printf "%06x" "$(openssl rsa -in private_key.pem -noout -text | grep publicExponent | head -1 | cut -d' ' -f2)" | hex2bin | urlbase64)"
pubMod64="$(echo -n "$(openssl rsa -in private_key.pem -noout -modulus | cut -d'=' -f2)" | hex2bin | urlbase64)" pubMod64="$(printf '%s' "$(openssl rsa -in private_key.pem -noout -modulus | cut -d'=' -f2)" | hex2bin | urlbase64)"
thumbprint="$(echo -n "$(echo -n '{"e":"'"${pubExponent64}"'","kty":"RSA","n":"'"${pubMod64}"'"}' | sha256sum | awk '{print $1}')" | hex2bin | urlbase64)" thumbprint="$(printf '%s' "$(printf '%s' '{"e":"'"${pubExponent64}"'","kty":"RSA","n":"'"${pubMod64}"'"}' | sha256sum | awk '{print $1}')" | hex2bin | urlbase64)"
if [ "${register}" = "1" ]; then if [ "${register}" = "1" ]; then
echo "+ Registering account key with letsencrypt..." echo "+ Registering account key with letsencrypt..."