Skip to content

Some server file fixes #134

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
hgraeber wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some server file fixes #134

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99df020
Make the HOST case the last one after server file, cert file and cert…
hgraeber Jun 1, 2024
7e94925
Do not check for server file existence
hgraeber Jun 1, 2024
4670071
Make reading the server file more white space insensitive
hgraeber Jun 1, 2024
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
37 changes: 22 additions & 15 deletions ssl-cert-check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ PROGRAMVERSION=4.14
#
# Revision History:
#
# Unreleased
# - Fix '-f', '-c', und '-d' options without '-s', but HOST environment
# variable defined - Herbert Graeber
# - Allow process substitution for '-s' option -- Herbert Graeber
# - Relax with space handling in server files -- Herbert Graeber
#
# Version 4.14
# - Fixed HOST / PORT discovery @mhow2
#
Expand Down Expand Up @@ -903,44 +909,45 @@ else
exit 1
fi

### If a HOST was passed on the cmdline, use that value
if [ "${HOST}" != "" ]; then
print_heading
check_server_status "${HOST}" "${PORT:=443}"
print_summary
### If a file is passed to the "-f" option on the command line, check
### each certificate or server / port combination in the file to see if
### they are about to expire
elif [ -f "${SERVERFILE}" ]; then
if [ -n "${SERVERFILE}" ]; then
print_heading

IFS=$'\n'
for LINE in $(grep -E -v '(^#|^$)' "${SERVERFILE}")
grep -E -v '(^#|^[[:space:]]*$)' "${SERVERFILE}" | while read HOST PORT
do
HOST=${LINE%% *}
PORT=${LINE##* }
IFS=" "
if [ "$PORT" = "FILE" ]; then
check_file_status "${HOST}" "FILE" "${HOST}"
else
check_server_status "${HOST}" "${PORT}"
fi
done
IFS="${OLDIFS}"
print_summary
if [ ${PIPESTATUS[0]} != 0 ]
then
echo "Error opening ${SERVERFILE}"
else
print_summary
fi

### Check to see if the certificate in CERTFILE is about to expire
elif [ "${CERTFILE}" != "" ]; then
elif [ -n "${CERTFILE}" ]; then
print_heading
check_file_status "${CERTFILE}" "FILE" "${CERTFILE}"
print_summary

### Check to see if the certificates in CERTDIRECTORY are about to expire
elif [ "${CERTDIRECTORY}" != "" ] && ("${FIND}" -L "${CERTDIRECTORY}" -type f > /dev/null 2>&1); then
elif [ -n "${CERTDIRECTORY}" ] && ("${FIND}" -L "${CERTDIRECTORY}" -type f > /dev/null 2>&1); then
print_heading
for FILE in $("${FIND}" -L "${CERTDIRECTORY}" -type f); do
check_file_status "${FILE}" "FILE" "${FILE}"
done
print_summary
### If a HOST was passed on the cmdline, use that value
elif [ -n "${HOST}" ]; then
print_heading
check_server_status "${HOST}" "${PORT:=443}"
print_summary
### There was an error, so print a detailed usage message and exit
else
usage
Expand Down