mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-21 22:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SSL to SSLCertificate in MonitorType

Browse Source
This commit is contained in:
Simon Larsen 2024-04-03 20:52:40 +01:00
parent 7ed0d55479
commit 9bfcc4f0c8
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
11 changed files with 93 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.vscode/launch.json vendored
View File

@ -139,34 +139,6 @@
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/Ingestor",
"name": "Probe API: Debug with Docker",
"port": 9251,
"remoteRoot": "/usr/src/app",
"request": "attach",
"skipFiles": [
"<node_internals>/**"
],
"type": "node",
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/Identity",
"name": "File: Debug with Docker",
"port": 9012,
"remoteRoot": "/usr/src/app",
"request": "attach",
"skipFiles": [
"<node_internals>/**"
],
"type": "node",
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/HttpTestServer",

4
Common/Types/Monitor/MonitorCriteriaInstance.ts
View File

@ -79,7 +79,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
return monitorCriteriaInstance;
}
if (arg.monitorType === MonitorType.SSL) {
if (arg.monitorType === MonitorType.SSLCertificate) {
const monitorCriteriaInstance: MonitorCriteriaInstance =
new MonitorCriteriaInstance();
@ -282,7 +282,7 @@ export default class MonitorCriteriaInstance extends DatabaseProperty {
};
}
if (arg.monitorType === MonitorType.SSL) {
if (arg.monitorType === MonitorType.SSLCertificate) {
monitorCriteriaInstance.data = {
id: ObjectID.generate().toString(),
monitorStatusId: arg.monitorStatusId,

2
Common/Types/Monitor/MonitorStep.ts
View File

@ -136,7 +136,7 @@ export default class MonitorStep extends DatabaseProperty {
monitorType === MonitorType.Ping ||
monitorType === MonitorType.Website ||
monitorType === MonitorType.IP ||
monitorType === MonitorType.SSL)
monitorType === MonitorType.SSLCertificate)
) {
return 'Monitor Destination is required';
}

6
Common/Types/Monitor/MonitorType.ts
View File

@ -10,7 +10,7 @@ enum MonitorType {
IncomingRequest = 'Incoming Request',
Port = 'Port',
Server = 'Server',
SSL = 'SSL',
SSLCertificate = 'SSL Certificate',
}
export default MonitorType;
@ -79,8 +79,8 @@ export class MonitorTypeHelper {
'This monitor types lets you monitor any server, VM, or any machine.',
},
{
monitorType: MonitorType.SSL,
title: 'SSL',
monitorType: MonitorType.SSLCertificate,
title: 'SSL Certificate',
description:
'This monitor types lets you monitor SSL certificates of any domain.',
},

2
CommonServer/Services/MonitorService.ts
View File

@ -161,7 +161,7 @@ export class Service extends DatabaseService<Model> {
createdItem.monitorType === MonitorType.Ping ||
createdItem.monitorType === MonitorType.IP ||
createdItem.monitorType === MonitorType.Port ||
createdItem.monitorType === MonitorType.SSL)
createdItem.monitorType === MonitorType.SSLCertificate)
) {
await this.addDefaultProbesToMonitor(
createdItem.projectId,

4
CommonServer/Utils/Probe/Criteria/SSLMonitorCriteria.ts
View File

@ -14,10 +14,6 @@ export default class ServerMonitorCriteria {
dataToProcess: DataToProcess;
criteriaFilter: CriteriaFilter;
}): Promise<string | null> {
// Server Monitoring Checks
debugger;
let threshold: number | string | undefined | null =
input.criteriaFilter.value;

4
CommonServer/Utils/Probe/ProbeMonitorResponse.ts
View File

@ -124,7 +124,7 @@ export default class ProbeMonitorResponseService {
monitor.monitorType === MonitorType.IP ||
monitor.monitorType === MonitorType.Ping ||
monitor.monitorType === MonitorType.Website ||
monitor.monitorType === MonitorType.SSL
monitor.monitorType === MonitorType.SSLCertificate
) {
dataToProcess = dataToProcess as ProbeMonitorResponse;
if ((dataToProcess as ProbeMonitorResponse).probeId) {
@ -1077,7 +1077,7 @@ export default class ProbeMonitorResponseService {
}
}
if (input.monitor.monitorType === MonitorType.SSL) {
if (input.monitor.monitorType === MonitorType.SSLCertificate) {
// check server monitor
const sslMonitorResult: string | null =
await SSLMonitorCriteria.isMonitorInstanceCriteriaFilterMet({

2
Dashboard/src/Components/Form/Monitor/MonitorStep.tsx
View File

@ -188,7 +188,7 @@ const MonitorStepElement: FunctionComponent<ComponentProps> = (
destination = URL.fromString(value);
} else if (
props.monitorType ===
MonitorType.SSL
MonitorType.SSLCertificate
) {
destination = URL.fromString(value);
}

2
Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts
View File

@ -183,7 +183,7 @@ export default class CriteriaFilterUtil {
});
}
if (monitorType === MonitorType.SSL) {
if (monitorType === MonitorType.SSLCertificate) {
options = options.filter((i: DropdownOption) => {
return (
i.value === CheckOn.IsValidCertificate ||

2
Probe/Utils/Monitors/Monitor.ts
View File

@ -198,7 +198,7 @@ export default class MonitorUtil {
result.failureCause = response.failureCause;
}
if (monitor.monitorType === MonitorType.SSL) {
if (monitor.monitorType === MonitorType.SSLCertificate) {
if (!monitorStep.data?.monitorDestination) {
result.isOnline = false;
result.responseTimeInMs = 0;

107
Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts
View File

@ -10,7 +10,7 @@ import https, { RequestOptions } from 'https';
import ObjectUtil from 'Common/Utils/ObjectUtil';
import BadDataException from 'Common/Types/Exception/BadDataException';
import OneUptimeDate from 'Common/Types/Date';
import { IncomingMessage } from 'http';
import { ClientRequest, IncomingMessage } from 'http';
export interface SslResponse extends SSLMonitorReponse {
isOnline: boolean;
@ -114,18 +114,86 @@ export default class SSLMonitor {
host: string,
port = 443
): Promise<SslResponse> {
debugger;
let isSelfSigned = false;
let certificate: tls.PeerCertificate | null = null;
const sslPromise = new Promise(
try {
certificate = await this.getCertificate({
host,
port,
rejectUnauthorized: true,
});
} catch (err) {
try {
certificate = await this.getCertificate({
host,
port,
rejectUnauthorized: false,
});
isSelfSigned = true;
} catch (err) {
return {
isOnline: false,
failureCause: (err as any).toString(),
};
}
}
if (!certificate) {
return {
isOnline: false,
failureCause: 'No certificate found',
};
}
const res: SslResponse = {
isOnline: true,
isSelfSigned: isSelfSigned,
createdAt: OneUptimeDate.fromString(certificate.valid_from),
expiresAt: OneUptimeDate.fromString(certificate.valid_to),
commonName: certificate.subject.CN,
organizationalUnit: certificate.subject.OU,
organization: certificate.subject.O,
locality: certificate.subject.L,
state: certificate.subject.ST,
country: certificate.subject.C,
serialNumber: certificate.serialNumber,
fingerprint: certificate.fingerprint,
fingerprint256: certificate.fingerprint256,
failureCause: '',
};
return res;
}
public static async getCertificate(data: {
host: string;
port: number;
rejectUnauthorized: boolean;
}): Promise<tls.PeerCertificate> {
const { host, rejectUnauthorized } = data;
let { port } = data;
if (!port) {
port = 443;
}
const sslPromise: Promise<tls.PeerCertificate> = new Promise(
(
resolve: (value: tls.PeerCertificate) => void,
reject: (err: Error) => void
) => {
const requestOptions = this.getOptions(host, port);
const requestOptions: https.RequestOptions = this.getOptions(
host,
port,
rejectUnauthorized
);
let isResolvedOrRejected = false;
let isResolvedOrRejected: boolean = false;
const req = https.get(
const req: ClientRequest = https.get(
requestOptions,
(res: IncomingMessage) => {
const certificate: tls.PeerCertificate = (
@ -158,31 +226,18 @@ export default class SSLMonitor {
const certificate: tls.PeerCertificate = await sslPromise;
const res: SslResponse = {
isOnline: true,
isSelfSigned: certificate.issuer.CN === certificate.subject.CN,
createdAt: OneUptimeDate.fromString(certificate.valid_from),
expiresAt: OneUptimeDate.fromString(certificate.valid_to),
commonName: certificate.subject.CN,
organizationalUnit: certificate.subject.OU,
organization: certificate.subject.O,
locality: certificate.subject.L,
state: certificate.subject.ST,
country: certificate.subject.C,
serialNumber: certificate.serialNumber,
fingerprint: certificate.fingerprint,
fingerprint256: certificate.fingerprint256,
failureCause: '',
};
return res;
return certificate;
}
private static getOptions(url: string, port: number): RequestOptions {
private static getOptions(
url: string,
port: number,
rejectUnauthorized: boolean
): RequestOptions {
return {
hostname: url,
agent: false,
rejectUnauthorized: false,
rejectUnauthorized: rejectUnauthorized,
ciphers: 'ALL',
port,
protocol: 'https:',