ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-03-06 09:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feat: Add warning for cert. hostname mismatch

Browse source
This commit is contained in:
Nelson Chan 2023-10-26 10:30:10 +08:00
parent 87b2e45fbf
commit d33b9d68d6
No known key found for this signature in database
4 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/model/monitor.js
View file

@ -22,6 +22,7 @@ const Gamedig = require("gamedig");
const jsonata = require("jsonata"); const jsonata = require("jsonata");
const jwt = require("jsonwebtoken"); const jwt = require("jsonwebtoken");
const { UptimeCalculator } = require("../uptime-calculator"); const { UptimeCalculator } = require("../uptime-calculator");
const { X509Certificate } = require("node:crypto");
/** /**
* status: * status:
@ -507,6 +508,12 @@ class Monitor extends BeanModel {
log.debug("monitor", `[${this.name}] Check cert`); log.debug("monitor", `[${this.name}] Check cert`);
try { try {
let tlsInfoObject = checkCertificate(res); let tlsInfoObject = checkCertificate(res);
// Check if the certificate obtained matches the hostname set for the monitor (if redirected)
let certObject = new X509Certificate(tlsInfoObject.certInfo.raw);
let hostnameMatch = certObject.checkHost(this.getUrl()?.hostname) !== undefined;
tlsInfoObject.hostnameMatchMonitorUrl = hostnameMatch;
tlsInfo = await this.updateTlsInfo(tlsInfoObject); tlsInfo = await this.updateTlsInfo(tlsInfoObject);
if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) { if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {

2
src/icon.js
View file

@ -10,6 +10,7 @@ import {
faArrowAltCircleUp, faArrowAltCircleUp,
faCog, faCog,
faEdit, faEdit,
faExclamationTriangle,
faEye, faEye,
faEyeSlash, faEyeSlash,
faList, faList,
@ -56,6 +57,7 @@ library.add(
faArrowAltCircleUp, faArrowAltCircleUp,
faCog, faCog,
faEdit, faEdit,
faExclamationTriangle,
faEye, faEye,
faEyeSlash, faEyeSlash,
faList, faList,

1
src/lang/en.json
View file

@ -380,6 +380,7 @@
"Query": "Query", "Query": "Query",
"settingsCertificateExpiry": "TLS Certificate Expiry", "settingsCertificateExpiry": "TLS Certificate Expiry",
"certificationExpiryDescription": "HTTPS Monitors trigger notification when TLS certificate expires in:", "certificationExpiryDescription": "HTTPS Monitors trigger notification when TLS certificate expires in:",
"certHostnameMismatch": "Certificate hostname is not valid for this monitor url.",
"Setup Docker Host": "Setup Docker Host", "Setup Docker Host": "Setup Docker Host",
"Connection Type": "Connection Type", "Connection Type": "Connection Type",
"Docker Daemon": "Docker Daemon", "Docker Daemon": "Docker Daemon",

10
src/pages/Details.vue
View file

@ -156,6 +156,7 @@
<p class="col-4 col-sm-12 mb-0 mb-sm-2">(<Datetime :value="tlsInfo.certInfo.validTo" date-only />)</p> <p class="col-4 col-sm-12 mb-0 mb-sm-2">(<Datetime :value="tlsInfo.certInfo.validTo" date-only />)</p>
<span class="col-4 col-sm-12 num"> <span class="col-4 col-sm-12 num">
<a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ tlsInfo.certInfo.daysRemaining }} {{ $tc("day", tlsInfo.certInfo.daysRemaining) }}</a> <a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ tlsInfo.certInfo.daysRemaining }} {{ $tc("day", tlsInfo.certInfo.daysRemaining) }}</a>
<font-awesome-icon v-if="tlsInfo.hostnameMatchMonitorUrl === false" class="cert-info-warn" icon="exclamation-triangle" :title="$t('certHostnameMismatch')" />
</span> </span>
</div> </div>
</div> </div>
@ -791,4 +792,13 @@ table {
margin-left: 0 !important; margin-left: 0 !important;
} }
.cert-info-warn {
margin-left: 4px;
opacity: 0.5;
.dark & {
opacity: 0.7;
}
}
</style> </style>