Add an option for using starttls to probe ssl-expiration

Original code from Denis Fondras
This commit is contained in:
Solene Rapenne 2018-10-21 21:39:30 +02:00
parent 64185e6f15
commit 8b2407ed4b
1 changed files with 14 additions and 12 deletions

View File

@ -53,10 +53,10 @@
(defun system-load(time)
(read-from-string
(let ((command (concatenate 'string
"uptime | awk '{ print $(NF-"
(princ-to-string time)
") }'")))
(let ((command (strcat
"uptime | awk '{ print $(NF-"
(princ-to-string time)
") }'")))
(uiop:run-program command :output :string))))
(create-probe
@ -124,11 +124,13 @@
(create-probe
ssl-expiration
(command-return-code
(concatenate 'string
"echo | openssl s_client -showcerts -servername "
(getf params :host) " -connect "
(getf params :host) ":" (princ-to-string
(getf params :port 443))
" 2>/dev/null | openssl x509 -inform pem -noout -checkend "
(princ-to-string
(getf params :seconds)))))
(let ((host (getf params :host))
(port (princ-to-string (getf params :port 443)))
(seconds (princ-to-string (getf params :seconds)))
(starttls (getf params :starttls)))
(strcat
"echo | openssl s_client -showcerts -servername " host
" -connect " host ":" port " 2>/dev/null |"
"openssl x509 -inform pem -noout "
(when starttls (strcat " -starttls " starttls))
" -checkend " seconds))))