Skip to content

Updated tls_expiry description to better reflect when host is different to the sni name #1922

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

Merged
jamesoff merged 1 commit into from
May 30, 2026
Merged

Updated tls_expiry description to better reflect when host is different to the sni name #1922

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
17 changes: 11 additions & 6 deletions simplemonitor/Monitors/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,21 +503,26 @@ def run_test(self) -> bool:
expiry = datetime.datetime.strptime(not_after, r"%b %d %H:%M:%S %Y %Z")
delta = expiry - datetime.datetime.utcnow()
days_left = delta.days
sni = (
self.sni + " "
if (self.sni and self.sni.casefold() != self.host.casefold())
else ""
)
if days_left < self.min_days:
if days_left < 0:
return self.record_fail(
"Certificate at {}:{} expired {} days ago".format(
self.host, self.port, abs(days_left)
"Certificate {}at {}:{} expired {} days ago".format(
sni, self.host, self.port, abs(days_left)
)
)
return self.record_fail(
"Certificate at {}:{} expires in {} days".format(
self.host, self.port, days_left
"Certificate {}at {}:{} expires in {} days".format(
sni, self.host, self.port, days_left
)
)
return self.record_success(
"Certificate at {}:{} has {} days left to expiry".format(
self.host, self.port, days_left
"Certificate {}at {}:{} has {} days left to expiry".format(
sni, self.host, self.port, days_left
)
)

Expand Down
Loading