starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-07-12 16:12:45 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

cleanup for dns-01-challenge-support code

Browse Source
This commit is contained in:
Lukas Schauer
2016-01-08 22:51:57 +01:00
parent 9b78b251d5
commit de17389245
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt.sh
+18 -28
View File
@@ -33,7 +33,7 @@ load_config() {
# Default values # Default values
CA="https://acme-v01.api.letsencrypt.org/directory" CA="https://acme-v01.api.letsencrypt.org/directory"
LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf" LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
CHALLENGETYPE="http-01" CHALLENGETYPE="http-01"
HOOK= HOOK=
RENEW_DAYS="30" RENEW_DAYS="30"
PRIVATE_KEY="${BASEDIR}/private_key.pem" PRIVATE_KEY="${BASEDIR}/private_key.pem"
@@ -63,22 +63,12 @@ load_config() {
# Check BASEDIR and set default variables # Check BASEDIR and set default variables
[[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}" [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
if [[ -n "${PARAM_HOOK:-}" ]]; then [[ -n "${PARAM_HOOK:-}" ]] && HOOK="${PARAM_HOOK}"
HOOK="${PARAM_HOOK}" [[ -n "${PARAM_CHALLENGETYPE:-}" ]] && CHALLENGETYPE="${PARAM_CHALLENGETYPE}"
fi
if [[ -n "${PARAM_CHALLENGETYPE:-}" ]]; then
CHALLENGETYPE="${PARAM_CHALLENGETYPE}"
fi
case "${CHALLENGETYPE}" in
http-01|dns-01) ;; # We suppport these types
*) echo "Unknown challenge type ${CHALLENGETYPE} ... can not continue"; exit 1;;
esac
[[ "${CHALLENGETYPE}" =~ (http-01|dns-01) ]] || _exiterr "Unknown challenge type ${CHALLENGETYPE}... can not continue."
if [[ "${CHALLENGETYPE}" = "dns-01" ]] && [[ -z "${HOOK}" ]]; then if [[ "${CHALLENGETYPE}" = "dns-01" ]] && [[ -z "${HOOK}" ]]; then
echo "Challenge type dns-01 needs a hook script for deployment ... can not continue" _exiterr "Challenge type dns-01 needs a hook script for deployment... can not continue."
exit 1
fi fi
} }
@@ -296,16 +286,18 @@ sign_domain() {
# Challenge response consists of the challenge token and the thumbprint of our public certificate # Challenge response consists of the challenge token and the thumbprint of our public certificate
keyauth="${challenge_token}.${thumbprint}" keyauth="${challenge_token}.${thumbprint}"
if [[ "${CHALLENGETYPE}" = "http-01" ]]; then case "${CHALLENGETYPE}" in
# Store challenge response in well-known location and make world-readable (so that a webserver can access it) "http-01")
printf '%s' "${keyauth}" > "${WELLKNOWN}/${challenge_token}" # Store challenge response in well-known location and make world-readable (so that a webserver can access it)
chmod a+r "${WELLKNOWN}/${challenge_token}" printf '%s' "${keyauth}" > "${WELLKNOWN}/${challenge_token}"
fi chmod a+r "${WELLKNOWN}/${challenge_token}"
keyauth_hook="${keyauth}"
keyauth_hook="${keyauth}" ;;
if [[ "${CHALLENGETYPE}" = "dns-01" ]]; then "dns-01")
keyauth_hook="$(printf '%s' "${keyauth}" | openssl sha -sha256 -binary | urlbase64)" # Generate DNS entry content for dns-01 validation
fi keyauth_hook="$(printf '%s' "${keyauth}" | openssl sha -sha256 -binary | urlbase64)"
;;
esac
# Wait for hook script to deploy the challenge if used # Wait for hook script to deploy the challenge if used
[[ -n "${HOOK}" ]] && ${HOOK} "deploy_challenge" "${altname}" "${challenge_token}" "${keyauth_hook}" [[ -n "${HOOK}" ]] && ${HOOK} "deploy_challenge" "${altname}" "${challenge_token}" "${keyauth_hook}"
@@ -321,9 +313,7 @@ sign_domain() {
status="$(http_request get "${challenge_uri}" | get_json_string_value status)" status="$(http_request get "${challenge_uri}" | get_json_string_value status)"
done done
if [[ "${CHALLENGETYPE}" = "http-01" ]]; then [[ "${CHALLENGETYPE}" = "http-01" ]] && rm -f "${WELLKNOWN}/${challenge_token}"
rm -f "${WELLKNOWN}/${challenge_token}"
fi
# Wait for hook script to clean the challenge if used # Wait for hook script to clean the challenge if used
if [[ -n "${HOOK}" ]] && [[ -n "${challenge_token}" ]]; then if [[ -n "${HOOK}" ]] && [[ -n "${challenge_token}" ]]; then