Skip to content

cherry-pick acc3290 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ubscale wants to merge 1 commit into
base: cloudscale/stable-3.1
Choose a base branch
from
Open

cherry-pick acc3290 #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 10 additions & 41 deletions ansible/roles/pki/files/usr/local/lib/pki/pki-realm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,56 +1115,25 @@ request_acme_tiny_certificate () {
fi

if [ -r acme/cert.pem.tmp ] && [ -s acme/cert.pem.tmp ] ; then

# Let's Encrypt provides certificates with attached
# intermediates but we don't want that, PKI realms handle the
# intermediates themselves. Extract the first certificate from
# the generated file and swap it in, so the rest of the script
# works.
openssl x509 -in acme/cert.pem.tmp -out acme/first-cert.pem.tmp
mv acme/first-cert.pem.tmp acme/cert.pem.tmp

if [ -r acme/cert.pem ] ; then
mv acme/cert.pem acme/cert.pem.old
csplit -s -z -f acme/temp_cert_ acme/cert.pem.tmp '/-----BEGIN CERTIFICATE-----/' '{*}'
if [ ! -r acme/temp_cert_00 ] ; then
echo "no certificates found in acme/certm.pem.tmp"
exit 1
fi
mv acme/cert.pem.tmp acme/cert.pem

local acme_intermediate_uri
acme_intermediate_uri="$(openssl x509 -in acme/cert.pem -text -noout -certopt ca_default,no_validity,no_serial | grep -E '^\s+CA\s+Issuers\s+-\s+URI:' | awk '{print $4}' | sed -e 's/^URI://')"

if [ ! -r acme/intermediate.pem ] ; then

if [ -n "${acme_intermediate_uri}" ] ; then
curl -s -L -o acme/intermediate.pem.tmp "${acme_intermediate_uri}"
convert_der_to_pem acme/intermediate.pem.tmp
mv acme/intermediate.pem.tmp acme/intermediate.pem
if [ ! -r acme/intermediate_uri.txt ] ; then
echo "${acme_intermediate_uri}" > acme/intermediate_uri.txt
fi
fi

elif [ -r acme/intermediate.pem ] ; then

if [ -n "${acme_intermediate_uri}" ] && [ -r acme/intermediate_uri.txt ] ; then
if [ "${acme_intermediate_uri}" != "$(<acme/intermediate_uri.txt)" ] ; then
curl -s -L -o acme/intermediate.pem.tmp "${acme_intermediate_uri}"
if ! diff -q -N acme/intermediate.pem acme/intermediate.pem.tmp > /dev/null ; then
rm -f acme/intermediate.pem acme/intermediate_uri.txt
convert_der_to_pem acme/intermediate.pem.tmp
mv acme/intermediate.pem.tmp acme/intermediate.pem
if [ ! -r acme/intermediate_uri.txt ] ; then
echo "${acme_intermediate_uri}" > acme/intermediate_uri.txt
fi
else
rm -f acme/intermediate.pem.tmp acme/intermediate_uri.txt
if [ ! -r acme/intermediate_uri.txt ] ; then
echo "${acme_intermediate_uri}" > acme/intermediate_uri.txt
fi
fi
fi
fi

if [ -r acme/cert.pem ] ; then
mv acme/cert.pem acme/cert.pem.old
fi
mv acme/temp_cert_00 acme/cert.pem
cat acme/temp_cert_* > acme/intermediate.pem
rm -f acme/temp_cert_*
rm -f acme/cert.pem.tmp

if [ ! -r acme/root.pem ] ; then
if [ -n "${config['acme_root_ca_path']}" ] && [ -n "${config['acme_root_ca_file']}" ] ; then
Expand Down
Loading