emo/make-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump to version 0.6.

Browse Source 
Really check revision before downloading.
This commit is contained in:
DJ Lucas 2017-10-13 23:43:57 -05:00
parent ad038d1a46
commit 73bfc6b792
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
make-ca
View File

@ -8,7 +8,7 @@
# Authors: DJ Lucas # Authors: DJ Lucas
# Bruce Dubbs # Bruce Dubbs
VERSION="0.5" VERSION="0.6"
# Get/set defaults # Get/set defaults
if test -f /etc/make-ca.conf; then if test -f /etc/make-ca.conf; then
@ -415,7 +415,26 @@ if test "${GET}" == "1"; then
echo GET ${_url} | \ echo GET ${_url} | \
${OPENSSL} s_client -ign_eof -connect ${HOST}:443 2>/dev/null > "${TEMPDIR}/certdata.txt.log" ${OPENSSL} s_client -ign_eof -connect ${HOST}:443 2>/dev/null > "${TEMPDIR}/certdata.txt.log"
unset _url unset _url
# Error out here if we couldn't get the file
grep -m1 "<i>" "${TEMPDIR}/certdata.txt.log" 2>&1>/dev/null
if test "$?" -gt 0; then
echo "Unable to get revision from server! Exiting."
exit 1
fi
# See if we need to update before downloading the file
REVISION=$(grep -m1 "<i>" "${TEMPDIR}/certdata.txt.log" | cut -d "<" -f 1) REVISION=$(grep -m1 "<i>" "${TEMPDIR}/certdata.txt.log" | cut -d "<" -f 1)
if test -e "${DESTDIR}${SSLDIR}/certdata.txt"; then
OLDVERSION=$(grep "^# Revision:" "${DESTDIR}${SSLDIR}/certdata.txt" | \
cut -d ":" -f 2)
if test "${OLDVERSION}x" == "${REVISION}x" -a "${FORCE}" == "0"; then
echo "No update required! Use --force to update anyway."
exit 0
fi
fi
# Download the new file
echo GET ${URL} | \ echo GET ${URL} | \
${OPENSSL} s_client -ign_eof -connect ${HOST}:443 2>/dev/null >> "${CERTDATA}" ${OPENSSL} s_client -ign_eof -connect ${HOST}:443 2>/dev/null >> "${CERTDATA}"
_line=$(( $(grep -n "certdata.txt" "${CERTDATA}" | cut -d ":" -f 1) - 1)) _line=$(( $(grep -n "certdata.txt" "${CERTDATA}" | cut -d ":" -f 1) - 1))
@ -442,7 +461,6 @@ if test "${REVISION}x" == "x"; then
sleep 2 sleep 2
REVISION="$(date -u +%Y%m%d-%H%M)" REVISION="$(date -u +%Y%m%d-%H%M)"
echo "# Revision:${REVISION}" > "${WORKDIR}/certdata.txt" echo "# Revision:${REVISION}" > "${WORKDIR}/certdata.txt"
else else
if test "${FORCE}" == "1"; then if test "${FORCE}" == "1"; then
echo "Output forced. Will run conversion unconditionally." echo "Output forced. Will run conversion unconditionally."
@ -450,12 +468,11 @@ else
elif test "${DESTDIR}x" == "x"; then elif test "${DESTDIR}x" == "x"; then
test -f "${CABUNDLE}" && test -f "${CABUNDLE}" &&
OLDVERSION=$(grep "^# Revision:" "${CABUNDLE}" | cut -d ":" -f 2) OLDVERSION=$(grep "^# Revision:" "${CABUNDLE}" | cut -d ":" -f 2)
fi if test "${OLDVERSION}x" == "${REVISION}x"; then
fi
if test "${OLDVERSION}x" == "${REVISION}x"; then
echo "No update required! Use --force to update anyway." echo "No update required! Use --force to update anyway."
exit 0 exit 0
fi
fi
fi fi
cat "${CERTDATA}" >> "${WORKDIR}/certdata.txt" cat "${CERTDATA}" >> "${WORKDIR}/certdata.txt"