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

Make temporary files identifiable (fixes #169)

Browse Source
This commit is contained in:
Lukas Schauer
2016-03-29 09:36:17 +02:00
parent dca25e8e45
commit 1f6a80a0c7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt.sh
+9 -4
View File
@@ -22,13 +22,18 @@ SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
BASEDIR="${SCRIPTDIR}" BASEDIR="${SCRIPTDIR}"
# Create (identifiable) temporary files
_mktemp() {
mktemp -t letsencrypt.sh-XXXXXX "${@}"
}
# Check for script dependencies # Check for script dependencies
check_dependencies() { check_dependencies() {
# just execute some dummy and/or version commands to see if required tools exist and are actually usable # just execute some dummy and/or version commands to see if required tools exist and are actually usable
openssl version > /dev/null 2>&1 || _exiterr "This script requires an openssl binary." openssl version > /dev/null 2>&1 || _exiterr "This script requires an openssl binary."
_sed "" < /dev/null > /dev/null 2>&1 || _exiterr "This script requires sed with support for extended (modern) regular expressions." _sed "" < /dev/null > /dev/null 2>&1 || _exiterr "This script requires sed with support for extended (modern) regular expressions."
command -v grep > /dev/null 2>&1 || _exiterr "This script requires grep." command -v grep > /dev/null 2>&1 || _exiterr "This script requires grep."
mktemp -u -t XXXXXX > /dev/null 2>&1 || _exiterr "This script requires mktemp." _mktemp -u > /dev/null 2>&1 || _exiterr "This script requires mktemp."
# curl returns with an error code in some ancient versions so we have to catch that # curl returns with an error code in some ancient versions so we have to catch that
set +e set +e
@@ -240,7 +245,7 @@ _openssl() {
# Send http(s) request with specified method # Send http(s) request with specified method
http_request() { http_request() {
tempcont="$(mktemp -t XXXXXX)" tempcont="$(_mktemp)"
set +e set +e
if [[ "${1}" = "head" ]]; then if [[ "${1}" = "head" ]]; then
@@ -515,7 +520,7 @@ sign_domain() {
done done
SAN="${SAN%%, }" SAN="${SAN%%, }"
local tmp_openssl_cnf local tmp_openssl_cnf
tmp_openssl_cnf="$(mktemp -t XXXXXX)" tmp_openssl_cnf="$(_mktemp)"
cat "${OPENSSL_CNF}" > "${tmp_openssl_cnf}" cat "${OPENSSL_CNF}" > "${tmp_openssl_cnf}"
printf "[SAN]\nsubjectAltName=%s" "${SAN}" >> "${tmp_openssl_cnf}" printf "[SAN]\nsubjectAltName=%s" "${SAN}" >> "${tmp_openssl_cnf}"
openssl req -new -sha256 -key "${BASEDIR}/certs/${domain}/${privkey}" -out "${BASEDIR}/certs/${domain}/cert-${timestamp}.csr" -subj "/CN=${domain}/" -reqexts SAN -config "${tmp_openssl_cnf}" openssl req -new -sha256 -key "${BASEDIR}/certs/${domain}/${privkey}" -out "${BASEDIR}/certs/${domain}/cert-${timestamp}.csr" -subj "/CN=${domain}/" -reqexts SAN -config "${tmp_openssl_cnf}"
@@ -556,7 +561,7 @@ command_sign_domains() {
init_system init_system
if [[ -n "${PARAM_DOMAIN:-}" ]]; then if [[ -n "${PARAM_DOMAIN:-}" ]]; then
DOMAINS_TXT="$(mktemp -t XXXXXX)" DOMAINS_TXT="$(_mktemp)"
printf -- "${PARAM_DOMAIN}" > "${DOMAINS_TXT}" printf -- "${PARAM_DOMAIN}" > "${DOMAINS_TXT}"
elif [[ -e "${BASEDIR}/domains.txt" ]]; then elif [[ -e "${BASEDIR}/domains.txt" ]]; then
DOMAINS_TXT="${BASEDIR}/domains.txt" DOMAINS_TXT="${BASEDIR}/domains.txt"