Skip to content

Add long arguments and emailSubjectPrefix #74

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
davidbartonau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add long arguments and emailSubjectPrefix #74

Show file tree
Hide file tree
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
18 changes: 13 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ Usage: ./ssl-cert-check [ -e email address ] [ -E sender email address ] [ -x da

-a : Send a warning message through E-mail
-b : Will not print header
-c cert file : Print the expiration date for the PEM or PKCS12 formatted certificate in cert file
-c, --certificate cert file
: Print the expiration date for the PEM or PKCS12 formatted certificate in cert file
-d cert directory : Print the expiration date for the PEM or PKCS12 formatted certificates in cert directory
-e E-mail address : E-mail address to send expiration notices
-E E-mail address : Sender E-mail address
-e, --emailFrom E-mail address
: E-mail address to send expiration notices
-E ---emailTo E-mail sender
: E-mail address of the sender
--emailSubjectPrefix 'Subject Prefix '
: Prefixes the email subject. Ensure proper quoting and probaby a trailing space.
: E-mail address of the sender
-f cert file : File with a list of FQDNs and ports
-h : Print this screen
-i : Print the issuer of the certificate
Expand All @@ -22,11 +28,13 @@ Usage: ./ssl-cert-check [ -e email address ] [ -E sender email address ] [ -x da
-N : Run as a Nagios plugin and output one line summary (implies -n, requires -f or -d)
-p port : Port to connect to (interactive mode)
-s commmon name : Server to connect to (interactive mode)
-S : Print validation information
-t type : Specify the certificate type
-q : Don't print anything on the console
-v : Specify a specific protocol version to use (tls, ssl2, ssl3)
-V : Only print validation data
-x days : Certificate expiration interval (eg. if cert_date < days)
-V : Print version information
-x, --expiryDays days
: Certificate expiration interval (eg. if cert_date < days)
</pre>

# Examples:
Expand Down
96 changes: 67 additions & 29 deletions ssl-cert-check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ ADMIN="root"
# Email sender address for alarm notifications
SENDER=""

# Prefix to the subject e.g. [SSL EXPIRY]
EMAIL_SUBJECT_PREFIX=""

# Number of days in the warning threshhold (cmdline: -x)
WARNDAYS=30

Expand Down Expand Up @@ -387,13 +390,13 @@ send_mail() {

case "${MAILMODE}" in
"mail")
echo "$MSG" | "${MAIL}" -r "$FROM" -s "$SUBJECT" "$TO"
echo "$MSG" | "${MAIL}" -r "$FROM" -s "${EMAIL_SUBJECT_PREFIX}$SUBJECT" "$TO"
;;
"mailx")
echo "$MSG" | "${MAIL}" -s "$SUBJECT" "$TO"
echo "$MSG" | "${MAIL}" -s "${EMAIL_SUBJECT_PREFIX}$SUBJECT" "$TO"
;;
"sendmail")
(echo "Subject:$SUBJECT" && echo "TO:$TO" && echo "FROM:$FROM" && echo "$MSG") | "${MAIL}" "$TO"
(echo "Subject:${EMAIL_SUBJECT_PREFIX}$SUBJECT" && echo "TO:$TO" && echo "FROM:$FROM" && echo "$MSG") | "${MAIL}" "$TO"
;;
"*")
echo "ERROR: You enabled automated alerts, but the mail binary could not be found."
Expand Down Expand Up @@ -612,10 +615,16 @@ usage()
echo ""
echo " -a : Send a warning message through E-mail"
echo " -b : Will not print header"
echo " -c cert file : Print the expiration date for the PEM or PKCS12 formatted certificate in cert file"
echo " -c, --certificate cert file "
echo " : Print the expiration date for the PEM or PKCS12 formatted certificate in cert file"
echo " -d cert directory : Print the expiration date for the PEM or PKCS12 formatted certificates in cert directory"
echo " -e E-mail address : E-mail address to send expiration notices"
echo " -E E-mail sender : E-mail address of the sender"
echo " -e, --emailFrom E-mail address "
echo " : E-mail address to send expiration notices"
echo " -E ---emailTo E-mail sender "
echo " : E-mail address of the sender"
echo " --emailSubjectPrefix 'Subject Prefix '"
echo " : Prefixes the email subject. Ensure proper quoting and probaby a trailing space."
echo " : E-mail address of the sender"
echo " -f cert file : File with a list of FQDNs and ports"
echo " -h : Print this screen"
echo " -i : Print the issuer of the certificate"
Expand All @@ -629,7 +638,8 @@ usage()
echo " -q : Don't print anything on the console"
echo " -v : Specify a specific protocol version to use (tls, ssl2, ssl3)"
echo " -V : Print version information"
echo " -x days : Certificate expiration interval (eg. if cert_date < days)"
echo " -x, --expiryDays days "
echo " : Certificate expiration interval (eg. if cert_date < days)"
echo ""
}

Expand Down Expand Up @@ -793,36 +803,64 @@ check_file_status() {
#################################
### Start of main program
#################################
while getopts abinNv:e:E:f:c:d:hk:p:s:S:t:qx:V option
options=$(getopt -l "certificate:,emailTo:,emailFrom:,emailSubjectPrefix:,expiryDays:" -o "abinNv:e:E:f:c:d:hk:p:s:S:t:qx:V" -a -- "$@")

eval set -- "$options"
echo $options

while true
do
case "${option}" in
a) ALARM="TRUE";;
b) NOHEADER="TRUE";;
c) CERTFILE=${OPTARG};;
d) CERTDIRECTORY=${OPTARG};;
e) ADMIN=${OPTARG};;
E) SENDER=${OPTARG};;
f) SERVERFILE=$OPTARG;;
h) usage
case "$1" in
-a) ALARM="TRUE";;
-b) NOHEADER="TRUE";;
-c|--certificate)
shift
CERTFILE=$1;;
-d)
shift
CERTDIRECTORY=$1;;
-e|--emailTo)
shift
ADMIN=$1;;
-E|--emailFrom)
shift
SENDER=$1;;
--emailSubjectPrefix)
shift
EMAIL_SUBJECT_PREFIX="$1";;
-f) shift
SERVERFILE=$1;;
-h) usage
exit 1;;
i) ISSUER="TRUE";;
k) PKCSDBPASSWD=${OPTARG};;
n) NAGIOS="TRUE";;
N) NAGIOS="TRUE"
-i) ISSUER="TRUE";;
-k) shift
PKCSDBPASSWD=$1;;
-n) NAGIOS="TRUE";;
-N) NAGIOS="TRUE"
NAGIOSSUMMARY="TRUE";;
p) PORT=$OPTARG;;
s) HOST=$OPTARG;;
S) VALIDATION="TRUE";;
t) CERTTYPE=$OPTARG;;
q) QUIET="TRUE";;
v) VERSION=$OPTARG;;
V) echo "${PROGRAMVERSION}"
-p) shift
PORT=$1;;
-s) shift
HOST=$1;;
-S) VALIDATION="TRUE";;
-t) shift
CERTTYPE=$1;;
-q) QUIET="TRUE";;
-v) shift
VERSION=$1;;
-V) echo "${PROGRAMVERSION}"
exit 0
;;
x) WARNDAYS=$OPTARG;;
-x|--expiryDays) shift
WARNDAYS=$1;;
\?) usage
exit 1;;
--)
shift
break;;
esac

shift
done

### Check to make sure a openssl utility is available
Expand Down