@oneuptime/common 7.0.2990 → 7.0.3010
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/AnalyticsModels/ExceptionInstance.ts +488 -0
- package/Models/AnalyticsModels/Index.ts +2 -0
- package/Models/AnalyticsModels/Span.ts +2 -2
- package/Models/DatabaseModels/Index.ts +4 -0
- package/Models/DatabaseModels/TelemetryException.ts +978 -0
- package/Server/API/StatusAPI.ts +63 -51
- package/Server/EnvironmentConfig.ts +3 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1724610006927-MigrationName.ts +93 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1724613666632-MigrationName.ts +60 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1724659071843-MigrationName.ts +17 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +6 -0
- package/Server/Infrastructure/Queue.ts +36 -1
- package/Server/Infrastructure/QueueWorker.ts +2 -2
- package/Server/Services/DatabaseService.ts +4 -5
- package/Server/Services/ExceptionInstanceService.ts +11 -0
- package/Server/Services/Index.ts +5 -0
- package/Server/Services/StatusPageDomainService.ts +118 -59
- package/Server/Services/TelemetryExceptionService.ts +10 -0
- package/Server/Types/Database/Permissions/Index.ts +1 -1
- package/Server/Types/Database/UpdateByID.ts +1 -1
- package/Server/Utils/Greenlock/Greenlock.ts +331 -204
- package/Server/Utils/Logger.ts +8 -2
- package/Server/Utils/Telemetry.ts +109 -25
- package/Types/Code/CodeType.ts +1 -0
- package/Types/Database/PartialEntity.ts +14 -1
- package/Types/Date.ts +9 -1
- package/Types/Icon/IconProp.ts +2 -0
- package/Types/Permission.ts +39 -0
- package/UI/Components/ActionCard/ActionCard.tsx +66 -0
- package/UI/Components/Alerts/Alert.tsx +69 -60
- package/UI/Components/Card/Card.tsx +1 -0
- package/UI/Components/Charts/ChartGroup/ChartGroup.tsx +4 -17
- package/UI/Components/Charts/ChartLibrary/LineChart/LineChart.tsx +1005 -0
- package/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.ts +3 -0
- package/UI/Components/Charts/ChartLibrary/Utils/ChartColors.ts +117 -0
- package/UI/Components/Charts/ChartLibrary/Utils/Cx.ts +8 -0
- package/UI/Components/Charts/ChartLibrary/Utils/GetYAxisDomain.ts +15 -0
- package/UI/Components/Charts/ChartLibrary/Utils/HasOnlyOneValueForKey.ts +19 -0
- package/UI/Components/Charts/ChartLibrary/Utils/UseWindowOnResize.ts +17 -0
- package/UI/Components/Charts/Line/LineChart.tsx +58 -225
- package/UI/Components/Charts/Types/ChartCurve.ts +7 -0
- package/UI/Components/Charts/Types/DataPoint.ts +7 -0
- package/UI/Components/Charts/Types/SeriesPoint.ts +7 -0
- package/UI/Components/Charts/Types/SeriesPoints.ts +6 -0
- package/UI/Components/Charts/Types/XAxis/XAxis.ts +21 -0
- package/UI/Components/Charts/Types/XAxis/XAxisMaxMin.ts +3 -0
- package/UI/Components/Charts/Types/XAxis/XAxisPrecision.ts +26 -0
- package/UI/Components/Charts/Types/XAxis/XAxisType.ts +6 -0
- package/UI/Components/Charts/Types/XValue.ts +3 -0
- package/UI/Components/Charts/Types/YAxis/YAxis.ts +22 -0
- package/UI/Components/Charts/Types/YAxis/YAxisMaxMin.ts +3 -0
- package/UI/Components/Charts/Types/YAxis/YAxisType.ts +5 -0
- package/UI/Components/Charts/Types/YValue.ts +3 -0
- package/UI/Components/Charts/Utils/DataPoint.ts +188 -0
- package/UI/Components/Charts/Utils/XAxis.ts +267 -0
- package/UI/Components/Detail/Detail.tsx +6 -1
- package/UI/Components/GanttChart/Row/Row.tsx +4 -2
- package/UI/Components/GanttChart/Row/RowLabel.tsx +7 -3
- package/UI/Components/Icon/Icon.tsx +16 -0
- package/UI/Components/LogsViewer/LogsViewer.tsx +1 -1
- package/UI/Components/Types/FieldType.ts +1 -0
- package/UI/Config.ts +2 -0
- package/UI/Utils/Telemetry.ts +7 -2
- package/Utils/Crypto.ts +11 -0
- package/build/dist/Models/AnalyticsModels/ExceptionInstance.js +445 -0
- package/build/dist/Models/AnalyticsModels/ExceptionInstance.js.map +1 -0
- package/build/dist/Models/AnalyticsModels/Index.js +2 -0
- package/build/dist/Models/AnalyticsModels/Index.js.map +1 -1
- package/build/dist/Models/AnalyticsModels/Span.js +2 -2
- package/build/dist/Models/DatabaseModels/Index.js +2 -0
- package/build/dist/Models/DatabaseModels/Index.js.map +1 -1
- package/build/dist/Models/DatabaseModels/TelemetryException.js +1010 -0
- package/build/dist/Models/DatabaseModels/TelemetryException.js.map +1 -0
- package/build/dist/Server/API/StatusAPI.js +52 -44
- package/build/dist/Server/API/StatusAPI.js.map +1 -1
- package/build/dist/Server/EnvironmentConfig.js +1 -0
- package/build/dist/Server/EnvironmentConfig.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724610006927-MigrationName.js +38 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724610006927-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724613666632-MigrationName.js +26 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724613666632-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724659071843-MigrationName.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1724659071843-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +6 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Infrastructure/Queue.js +20 -1
- package/build/dist/Server/Infrastructure/Queue.js.map +1 -1
- package/build/dist/Server/Infrastructure/QueueWorker.js +2 -2
- package/build/dist/Server/Infrastructure/QueueWorker.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/ExceptionInstanceService.js +9 -0
- package/build/dist/Server/Services/ExceptionInstanceService.js.map +1 -0
- package/build/dist/Server/Services/Index.js +4 -0
- package/build/dist/Server/Services/Index.js.map +1 -1
- package/build/dist/Server/Services/StatusPageDomainService.js +101 -53
- package/build/dist/Server/Services/StatusPageDomainService.js.map +1 -1
- package/build/dist/Server/Services/TelemetryExceptionService.js +9 -0
- package/build/dist/Server/Services/TelemetryExceptionService.js.map +1 -0
- package/build/dist/Server/Types/Database/Permissions/Index.js.map +1 -1
- package/build/dist/Server/Utils/Greenlock/Greenlock.js +234 -157
- package/build/dist/Server/Utils/Greenlock/Greenlock.js.map +1 -1
- package/build/dist/Server/Utils/Logger.js +5 -1
- package/build/dist/Server/Utils/Logger.js.map +1 -1
- package/build/dist/Server/Utils/Telemetry.js +63 -22
- package/build/dist/Server/Utils/Telemetry.js.map +1 -1
- package/build/dist/Types/Code/CodeType.js +1 -0
- package/build/dist/Types/Code/CodeType.js.map +1 -1
- package/build/dist/Types/Database/PartialEntity.js +3 -0
- package/build/dist/Types/Database/PartialEntity.js.map +1 -1
- package/build/dist/Types/Date.js +7 -1
- package/build/dist/Types/Date.js.map +1 -1
- package/build/dist/Types/Icon/IconProp.js +2 -0
- package/build/dist/Types/Icon/IconProp.js.map +1 -1
- package/build/dist/Types/Permission.js +33 -0
- package/build/dist/Types/Permission.js.map +1 -1
- package/build/dist/UI/Components/ActionCard/ActionCard.js +27 -0
- package/build/dist/UI/Components/ActionCard/ActionCard.js.map +1 -0
- package/build/dist/UI/Components/Alerts/Alert.js +36 -45
- package/build/dist/UI/Components/Alerts/Alert.js.map +1 -1
- package/build/dist/UI/Components/Card/Card.js +1 -1
- package/build/dist/UI/Components/Card/Card.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js +4 -9
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartLibrary/LineChart/LineChart.js +388 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/LineChart/LineChart.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.js +2 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/ChartDataPoint.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/ChartColors.js +88 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/ChartColors.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/Cx.js +7 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/Cx.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/GetYAxisDomain.js +7 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/GetYAxisDomain.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/HasOnlyOneValueForKey.js +14 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/HasOnlyOneValueForKey.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/UseWindowOnResize.js +14 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Utils/UseWindowOnResize.js.map +1 -0
- package/build/dist/UI/Components/Charts/Line/LineChart.js +30 -136
- package/build/dist/UI/Components/Charts/Line/LineChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/Types/ChartCurve.js +8 -0
- package/build/dist/UI/Components/Charts/Types/ChartCurve.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/DataPoint.js +2 -0
- package/build/dist/UI/Components/Charts/Types/DataPoint.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/SeriesPoint.js +2 -0
- package/build/dist/UI/Components/Charts/Types/SeriesPoint.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/SeriesPoints.js +2 -0
- package/build/dist/UI/Components/Charts/Types/SeriesPoints.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxis.js +8 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxis.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisMaxMin.js +2 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisMaxMin.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisPrecision.js +27 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisPrecision.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisType.js +7 -0
- package/build/dist/UI/Components/Charts/Types/XAxis/XAxisType.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/XValue.js +2 -0
- package/build/dist/UI/Components/Charts/Types/XValue.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxis.js +8 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxis.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxisMaxMin.js +2 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxisMaxMin.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxisType.js +6 -0
- package/build/dist/UI/Components/Charts/Types/YAxis/YAxisType.js.map +1 -0
- package/build/dist/UI/Components/Charts/Types/YValue.js +2 -0
- package/build/dist/UI/Components/Charts/Types/YValue.js.map +1 -0
- package/build/dist/UI/Components/Charts/Utils/DataPoint.js +109 -0
- package/build/dist/UI/Components/Charts/Utils/DataPoint.js.map +1 -0
- package/build/dist/UI/Components/Charts/Utils/XAxis.js +241 -0
- package/build/dist/UI/Components/Charts/Utils/XAxis.js.map +1 -0
- package/build/dist/UI/Components/Detail/Detail.js +5 -1
- package/build/dist/UI/Components/Detail/Detail.js.map +1 -1
- package/build/dist/UI/Components/GanttChart/Row/Row.js +2 -2
- package/build/dist/UI/Components/GanttChart/Row/Row.js.map +1 -1
- package/build/dist/UI/Components/GanttChart/Row/RowLabel.js +3 -3
- package/build/dist/UI/Components/GanttChart/Row/RowLabel.js.map +1 -1
- package/build/dist/UI/Components/Icon/Icon.js +6 -0
- package/build/dist/UI/Components/Icon/Icon.js.map +1 -1
- package/build/dist/UI/Components/LogsViewer/LogsViewer.js +1 -1
- package/build/dist/UI/Components/LogsViewer/LogsViewer.js.map +1 -1
- package/build/dist/UI/Components/Types/FieldType.js +1 -0
- package/build/dist/UI/Components/Types/FieldType.js.map +1 -1
- package/build/dist/UI/Config.js +1 -0
- package/build/dist/UI/Config.js.map +1 -1
- package/build/dist/UI/Utils/Telemetry.js +6 -3
- package/build/dist/UI/Utils/Telemetry.js.map +1 -1
- package/build/dist/Utils/Crypto.js +10 -0
- package/build/dist/Utils/Crypto.js.map +1 -0
- package/package.json +15 -13
- package/UI/Components/Charts/Bar/Bar.tsx +0 -0
- package/UI/Components/Charts/Base/BaseChart.tsx +0 -0
- package/UI/Components/Charts/Tooltip/Tooltip.tsx +0 -84
- package/build/dist/UI/Components/Charts/Bar/Bar.js +0 -2
- package/build/dist/UI/Components/Charts/Bar/Bar.js.map +0 -1
- package/build/dist/UI/Components/Charts/Base/BaseChart.js +0 -2
- package/build/dist/UI/Components/Charts/Base/BaseChart.js.map +0 -1
- package/build/dist/UI/Components/Charts/Tooltip/Tooltip.js +0 -34
- package/build/dist/UI/Components/Charts/Tooltip/Tooltip.js.map +0 -1
|
@@ -13,185 +13,262 @@ import Text from "Common/Types/Text";
|
|
|
13
13
|
import AcmeCertificate from "Common/Models/DatabaseModels/AcmeCertificate";
|
|
14
14
|
import AcmeChallenge from "Common/Models/DatabaseModels/AcmeChallenge";
|
|
15
15
|
import acme from "acme-client";
|
|
16
|
+
import Telemetry from "../Telemetry";
|
|
16
17
|
export default class GreenlockUtil {
|
|
17
18
|
static async renewAllCertsWhichAreExpiringSoon(data) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
19
|
+
return await Telemetry.startActiveSpan({
|
|
20
|
+
name: "GreenlockUtil.renewAllCertsWhichAreExpiringSoon",
|
|
21
|
+
fn: async (span) => {
|
|
22
|
+
try {
|
|
23
|
+
logger.debug("Renewing all certificates");
|
|
24
|
+
// get all certificates which are expiring soon
|
|
25
|
+
const certificates = await AcmeCertificateService.findBy({
|
|
26
|
+
query: {
|
|
27
|
+
expiresAt: QueryHelper.lessThanEqualTo(OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), 40)),
|
|
28
|
+
},
|
|
29
|
+
limit: LIMIT_MAX,
|
|
30
|
+
skip: 0,
|
|
31
|
+
select: {
|
|
32
|
+
domain: true,
|
|
33
|
+
},
|
|
34
|
+
sort: {
|
|
35
|
+
expiresAt: SortOrder.Ascending,
|
|
36
|
+
},
|
|
37
|
+
props: {
|
|
38
|
+
isRoot: true,
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
logger.debug(`Found ${certificates.length} certificates which are expiring soon`);
|
|
42
|
+
// order certificate for each domain
|
|
43
|
+
for (const certificate of certificates) {
|
|
44
|
+
if (!certificate.domain) {
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
logger.debug(`Renewing certificate for domain: ${certificate.domain}`);
|
|
48
|
+
try {
|
|
49
|
+
//validate cname
|
|
50
|
+
const isValidCname = await data.validateCname(certificate.domain);
|
|
51
|
+
if (!isValidCname) {
|
|
52
|
+
logger.debug(`CNAME is not valid for domain: ${certificate.domain}`);
|
|
53
|
+
// if cname is not valid then remove the domain
|
|
54
|
+
await GreenlockUtil.removeDomain(certificate.domain);
|
|
55
|
+
await data.notifyDomainRemoved(certificate.domain);
|
|
56
|
+
logger.error(`Cname is not valid for domain: ${certificate.domain}`);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
logger.debug(`CNAME is valid for domain: ${certificate.domain}`);
|
|
60
|
+
await GreenlockUtil.orderCert({
|
|
61
|
+
domain: certificate.domain,
|
|
62
|
+
validateCname: data.validateCname,
|
|
63
|
+
});
|
|
64
|
+
logger.debug(`Certificate renewed for domain: ${certificate.domain}`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
logger.error(`Error renewing certificate for domain: ${certificate.domain}`);
|
|
69
|
+
logger.error(e);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
Telemetry.endSpan(span);
|
|
48
73
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
74
|
+
catch (e) {
|
|
75
|
+
logger.error("Error renewing all certificates");
|
|
76
|
+
logger.error(e);
|
|
77
|
+
// record exception
|
|
78
|
+
Telemetry.recordExceptionMarkSpanAsErrorAndEndSpan({
|
|
79
|
+
span,
|
|
80
|
+
exception: e,
|
|
53
81
|
});
|
|
82
|
+
throw e;
|
|
54
83
|
}
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
logger.error(`Error renewing certificate for domain: ${certificate.domain}`);
|
|
58
|
-
logger.error(e);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
84
|
+
},
|
|
85
|
+
});
|
|
61
86
|
}
|
|
62
87
|
static async removeDomain(domain) {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
88
|
+
return await Telemetry.startActiveSpan({
|
|
89
|
+
name: "GreenlockUtil.orderCert",
|
|
90
|
+
options: {
|
|
91
|
+
attributes: {
|
|
92
|
+
domain: domain,
|
|
93
|
+
},
|
|
67
94
|
},
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
95
|
+
fn: async (span) => {
|
|
96
|
+
try {
|
|
97
|
+
// remove certificate for this domain.
|
|
98
|
+
await AcmeCertificateService.deleteBy({
|
|
99
|
+
query: {
|
|
100
|
+
domain: domain,
|
|
101
|
+
},
|
|
102
|
+
limit: 1,
|
|
103
|
+
skip: 0,
|
|
104
|
+
props: {
|
|
105
|
+
isRoot: true,
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
Telemetry.endSpan(span);
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
logger.error(`Error removing domain: ${domain}`);
|
|
112
|
+
Telemetry.recordExceptionMarkSpanAsErrorAndEndSpan({
|
|
113
|
+
span,
|
|
114
|
+
exception: err,
|
|
115
|
+
});
|
|
116
|
+
throw err;
|
|
117
|
+
}
|
|
72
118
|
},
|
|
73
119
|
});
|
|
74
120
|
}
|
|
75
121
|
static async orderCert(data) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
throw new ServerException("No lets encrypt account key found in environment variables. Please add one.");
|
|
82
|
-
}
|
|
83
|
-
let acmeAccountKey = Buffer.from(acmeAccountKeyInBase64, "base64").toString();
|
|
84
|
-
acmeAccountKey = Text.replaceAll(acmeAccountKey, "\\n", "\n");
|
|
85
|
-
//validate cname
|
|
86
|
-
const isValidCname = await data.validateCname(domain);
|
|
87
|
-
if (!isValidCname) {
|
|
88
|
-
await GreenlockUtil.removeDomain(domain);
|
|
89
|
-
logger.error(`Cname is not valid for domain: ${domain}`);
|
|
90
|
-
throw new BadDataException("Cname is not valid for domain " + domain);
|
|
91
|
-
}
|
|
92
|
-
const client = new acme.Client({
|
|
93
|
-
directoryUrl: acme.directory.letsencrypt.production,
|
|
94
|
-
accountKey: acmeAccountKey,
|
|
95
|
-
});
|
|
96
|
-
const [certificateKey, certificateRequest] = await acme.crypto.createCsr({
|
|
97
|
-
commonName: domain,
|
|
98
|
-
});
|
|
99
|
-
const certificate = await client.auto({
|
|
100
|
-
csr: certificateRequest,
|
|
101
|
-
email: LetsEncryptNotificationEmail.toString(),
|
|
102
|
-
termsOfServiceAgreed: true,
|
|
103
|
-
challengePriority: ["http-01"], // only http-01 challenge is supported by oneuptime
|
|
104
|
-
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
105
|
-
// Satisfy challenge here
|
|
106
|
-
/* http-01 */
|
|
107
|
-
if (challenge.type === "http-01") {
|
|
108
|
-
const acmeChallenge = new AcmeChallenge();
|
|
109
|
-
acmeChallenge.challenge = keyAuthorization;
|
|
110
|
-
acmeChallenge.token = challenge.token;
|
|
111
|
-
acmeChallenge.domain = authz.identifier.value;
|
|
112
|
-
await AcmeChallengeService.create({
|
|
113
|
-
data: acmeChallenge,
|
|
114
|
-
props: {
|
|
115
|
-
isRoot: true,
|
|
116
|
-
},
|
|
117
|
-
});
|
|
118
|
-
}
|
|
122
|
+
return await Telemetry.startActiveSpan({
|
|
123
|
+
name: "GreenlockUtil.orderCert",
|
|
124
|
+
options: {
|
|
125
|
+
attributes: {
|
|
126
|
+
domain: data.domain,
|
|
119
127
|
},
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
128
|
+
},
|
|
129
|
+
fn: async (span) => {
|
|
130
|
+
try {
|
|
131
|
+
logger.debug(`GreenlockUtil - Ordering certificate for domain: ${data.domain}`);
|
|
132
|
+
let { domain } = data;
|
|
133
|
+
domain = domain.trim().toLowerCase();
|
|
134
|
+
const acmeAccountKeyInBase64 = LetsEncryptAccountKey;
|
|
135
|
+
if (!acmeAccountKeyInBase64) {
|
|
136
|
+
throw new ServerException("No lets encrypt account key found in environment variables. Please add one.");
|
|
137
|
+
}
|
|
138
|
+
let acmeAccountKey = Buffer.from(acmeAccountKeyInBase64, "base64").toString();
|
|
139
|
+
acmeAccountKey = Text.replaceAll(acmeAccountKey, "\\n", "\n");
|
|
140
|
+
//validate cname
|
|
141
|
+
logger.debug(`Validating cname for domain: ${domain}`);
|
|
142
|
+
const isValidCname = await data.validateCname(domain);
|
|
143
|
+
if (!isValidCname) {
|
|
144
|
+
logger.debug(`CNAME is not valid for domain: ${domain}`);
|
|
145
|
+
logger.debug(`Removing domain: ${domain}`);
|
|
146
|
+
await GreenlockUtil.removeDomain(domain);
|
|
147
|
+
logger.error(`Cname is not valid for domain: ${domain}`);
|
|
148
|
+
throw new BadDataException("Cname is not valid for domain " + domain);
|
|
149
|
+
}
|
|
150
|
+
logger.debug(`Cname is valid for domain: ${domain}`);
|
|
151
|
+
const client = new acme.Client({
|
|
152
|
+
directoryUrl: acme.directory.letsencrypt.production,
|
|
153
|
+
accountKey: acmeAccountKey,
|
|
154
|
+
});
|
|
155
|
+
const [certificateKey, certificateRequest] = await acme.crypto.createCsr({
|
|
156
|
+
commonName: domain,
|
|
157
|
+
});
|
|
158
|
+
logger.debug(`Ordering certificate for domain: ${domain}`);
|
|
159
|
+
const certificate = await client.auto({
|
|
160
|
+
csr: certificateRequest,
|
|
161
|
+
email: LetsEncryptNotificationEmail.toString(),
|
|
162
|
+
termsOfServiceAgreed: true,
|
|
163
|
+
challengePriority: ["http-01"], // only http-01 challenge is supported by oneuptime
|
|
164
|
+
challengeCreateFn: async (authz, challenge, keyAuthorization) => {
|
|
165
|
+
// Satisfy challenge here
|
|
166
|
+
/* http-01 */
|
|
167
|
+
if (challenge.type === "http-01") {
|
|
168
|
+
logger.debug(`Creating challenge for domain: ${authz.identifier.value}`);
|
|
169
|
+
const acmeChallenge = new AcmeChallenge();
|
|
170
|
+
acmeChallenge.challenge = keyAuthorization;
|
|
171
|
+
acmeChallenge.token = challenge.token;
|
|
172
|
+
acmeChallenge.domain = authz.identifier.value;
|
|
173
|
+
await AcmeChallengeService.create({
|
|
174
|
+
data: acmeChallenge,
|
|
175
|
+
props: {
|
|
176
|
+
isRoot: true,
|
|
177
|
+
},
|
|
178
|
+
});
|
|
179
|
+
logger.debug(`Challenge created for domain: ${authz.identifier.value}`);
|
|
180
|
+
}
|
|
181
|
+
},
|
|
182
|
+
challengeRemoveFn: async (authz, challenge) => {
|
|
183
|
+
// Clean up challenge here
|
|
184
|
+
logger.debug(`Removing challenge for domain: ${authz.identifier.value}`);
|
|
185
|
+
if (challenge.type === "http-01") {
|
|
186
|
+
await AcmeChallengeService.deleteBy({
|
|
187
|
+
query: {
|
|
188
|
+
domain: authz.identifier.value,
|
|
189
|
+
},
|
|
190
|
+
limit: 1,
|
|
191
|
+
skip: 0,
|
|
192
|
+
props: {
|
|
193
|
+
isRoot: true,
|
|
194
|
+
},
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
logger.debug(`Challenge removed for domain: ${authz.identifier.value}`);
|
|
198
|
+
},
|
|
199
|
+
});
|
|
200
|
+
logger.debug(`Certificate ordered for domain: ${domain}`);
|
|
201
|
+
// get expires at date from certificate
|
|
202
|
+
const cert = acme.crypto.readCertificateInfo(certificate);
|
|
203
|
+
const issuedAt = cert.notBefore;
|
|
204
|
+
const expiresAt = cert.notAfter;
|
|
205
|
+
logger.debug(`Certificate expires at: ${expiresAt}`);
|
|
206
|
+
logger.debug(`Certificate issued at: ${issuedAt}`);
|
|
207
|
+
// check if the certificate is already in the database.
|
|
208
|
+
const existingCertificate = await AcmeCertificateService.findOneBy({
|
|
209
|
+
query: {
|
|
210
|
+
domain: domain,
|
|
211
|
+
},
|
|
212
|
+
select: {
|
|
213
|
+
_id: true,
|
|
214
|
+
},
|
|
215
|
+
props: {
|
|
216
|
+
isRoot: true,
|
|
217
|
+
},
|
|
218
|
+
});
|
|
219
|
+
if (existingCertificate) {
|
|
220
|
+
logger.debug(`Updating certificate for domain: ${domain}`);
|
|
221
|
+
// update the certificate
|
|
222
|
+
await AcmeCertificateService.updateBy({
|
|
124
223
|
query: {
|
|
125
|
-
domain:
|
|
224
|
+
domain: domain,
|
|
126
225
|
},
|
|
127
226
|
limit: 1,
|
|
128
227
|
skip: 0,
|
|
228
|
+
data: {
|
|
229
|
+
certificate: certificate.toString(),
|
|
230
|
+
certificateKey: certificateKey.toString(),
|
|
231
|
+
issuedAt: issuedAt,
|
|
232
|
+
expiresAt: expiresAt,
|
|
233
|
+
},
|
|
129
234
|
props: {
|
|
130
235
|
isRoot: true,
|
|
131
236
|
},
|
|
132
237
|
});
|
|
238
|
+
logger.debug(`Certificate updated for domain: ${domain}`);
|
|
133
239
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
props: {
|
|
167
|
-
isRoot: true,
|
|
168
|
-
},
|
|
169
|
-
});
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
172
|
-
// create the certificate
|
|
173
|
-
const acmeCertificate = new AcmeCertificate();
|
|
174
|
-
acmeCertificate.domain = domain;
|
|
175
|
-
acmeCertificate.certificate = certificate.toString();
|
|
176
|
-
acmeCertificate.certificateKey = certificateKey.toString();
|
|
177
|
-
acmeCertificate.issuedAt = issuedAt;
|
|
178
|
-
acmeCertificate.expiresAt = expiresAt;
|
|
179
|
-
await AcmeCertificateService.create({
|
|
180
|
-
data: acmeCertificate,
|
|
181
|
-
props: {
|
|
182
|
-
isRoot: true,
|
|
183
|
-
},
|
|
184
|
-
});
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
catch (e) {
|
|
188
|
-
logger.error(`Error ordering certificate for domain: ${data.domain}`);
|
|
189
|
-
logger.error(e);
|
|
190
|
-
if (e instanceof Exception) {
|
|
191
|
-
throw e;
|
|
192
|
-
}
|
|
193
|
-
throw new ServerException(`Unable to order certificate for ${data.domain}. Please contact support at support@oneuptime.com for more information.`);
|
|
194
|
-
}
|
|
240
|
+
else {
|
|
241
|
+
logger.debug(`Creating certificate for domain: ${domain}`);
|
|
242
|
+
// create the certificate
|
|
243
|
+
const acmeCertificate = new AcmeCertificate();
|
|
244
|
+
acmeCertificate.domain = domain;
|
|
245
|
+
acmeCertificate.certificate = certificate.toString();
|
|
246
|
+
acmeCertificate.certificateKey = certificateKey.toString();
|
|
247
|
+
acmeCertificate.issuedAt = issuedAt;
|
|
248
|
+
acmeCertificate.expiresAt = expiresAt;
|
|
249
|
+
await AcmeCertificateService.create({
|
|
250
|
+
data: acmeCertificate,
|
|
251
|
+
props: {
|
|
252
|
+
isRoot: true,
|
|
253
|
+
},
|
|
254
|
+
});
|
|
255
|
+
logger.debug(`Certificate created for domain: ${domain}`);
|
|
256
|
+
}
|
|
257
|
+
Telemetry.endSpan(span);
|
|
258
|
+
}
|
|
259
|
+
catch (e) {
|
|
260
|
+
logger.error(`Error ordering certificate for domain: ${data.domain}`);
|
|
261
|
+
Telemetry.recordExceptionMarkSpanAsErrorAndEndSpan({
|
|
262
|
+
span,
|
|
263
|
+
exception: e,
|
|
264
|
+
});
|
|
265
|
+
if (e instanceof Exception) {
|
|
266
|
+
throw e;
|
|
267
|
+
}
|
|
268
|
+
throw new ServerException(`Unable to order certificate for ${data.domain}. Please contact support at support@oneuptime.com for more information.`);
|
|
269
|
+
}
|
|
270
|
+
},
|
|
271
|
+
});
|
|
195
272
|
}
|
|
196
273
|
}
|
|
197
274
|
//# sourceMappingURL=Greenlock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AACvE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,SAAS,MAAM,qCAAqC,CAAC;AAC5D,OAAO,SAAS,MAAM,gCAAgC,CAAC;AACvD,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,kCAAkC,CAAC;AACzD,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,aAAa,MAAM,4CAA4C,CAAC;AACvE,OAAO,IAAI,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AACvE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,SAAS,MAAM,qCAAqC,CAAC;AAC5D,OAAO,SAAS,MAAM,gCAAgC,CAAC;AACvD,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,kCAAkC,CAAC;AACzD,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,aAAa,MAAM,4CAA4C,CAAC;AACvE,OAAO,IAAI,MAAM,aAAa,CAAC;AAE/B,OAAO,SAAmB,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,aAAa;IACzB,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,IAGrD;QACC,OAAO,MAAM,SAAS,CAAC,eAAe,CAAgB;YACpD,IAAI,EAAE,iDAAiD;YACvD,EAAE,EAAE,KAAK,EAAE,IAAU,EAAiB,EAAE;gBACtC,IAAI,CAAC;oBACH,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBAE1C,+CAA+C;oBAE/C,MAAM,YAAY,GAChB,MAAM,sBAAsB,CAAC,MAAM,CAAC;wBAClC,KAAK,EAAE;4BACL,SAAS,EAAE,WAAW,CAAC,eAAe,CACpC,aAAa,CAAC,aAAa,CACzB,aAAa,CAAC,cAAc,EAAE,EAC9B,EAAE,CACH,CACF;yBACF;wBACD,KAAK,EAAE,SAAS;wBAChB,IAAI,EAAE,CAAC;wBACP,MAAM,EAAE;4BACN,MAAM,EAAE,IAAI;yBACb;wBACD,IAAI,EAAE;4BACJ,SAAS,EAAE,SAAS,CAAC,SAAS;yBAC/B;wBACD,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;yBACb;qBACF,CAAC,CAAC;oBAEL,MAAM,CAAC,KAAK,CACV,SAAS,YAAY,CAAC,MAAM,uCAAuC,CACpE,CAAC;oBAEF,oCAAoC;oBAEpC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;wBACvC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;4BACxB,SAAS;wBACX,CAAC;wBAED,MAAM,CAAC,KAAK,CACV,oCAAoC,WAAW,CAAC,MAAM,EAAE,CACzD,CAAC;wBAEF,IAAI,CAAC;4BACH,gBAAgB;4BAChB,MAAM,YAAY,GAAY,MAAM,IAAI,CAAC,aAAa,CACpD,WAAW,CAAC,MAAM,CACnB,CAAC;4BAEF,IAAI,CAAC,YAAY,EAAE,CAAC;gCAClB,MAAM,CAAC,KAAK,CACV,kCAAkC,WAAW,CAAC,MAAM,EAAE,CACvD,CAAC;gCAEF,+CAA+C;gCAC/C,MAAM,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gCACrD,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gCAEnD,MAAM,CAAC,KAAK,CACV,kCAAkC,WAAW,CAAC,MAAM,EAAE,CACvD,CAAC;4BACJ,CAAC;iCAAM,CAAC;gCACN,MAAM,CAAC,KAAK,CACV,8BAA8B,WAAW,CAAC,MAAM,EAAE,CACnD,CAAC;gCAEF,MAAM,aAAa,CAAC,SAAS,CAAC;oCAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;oCAC1B,aAAa,EAAE,IAAI,CAAC,aAAa;iCAClC,CAAC,CAAC;gCAEH,MAAM,CAAC,KAAK,CACV,mCAAmC,WAAW,CAAC,MAAM,EAAE,CACxD,CAAC;4BACJ,CAAC;wBACH,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,MAAM,CAAC,KAAK,CACV,0CAA0C,WAAW,CAAC,MAAM,EAAE,CAC/D,CAAC;4BACF,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAClB,CAAC;oBACH,CAAC;oBAED,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBAChD,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAEhB,mBAAmB;oBACnB,SAAS,CAAC,wCAAwC,CAAC;wBACjD,IAAI;wBACJ,SAAS,EAAE,CAAC;qBACb,CAAC,CAAC;oBAEH,MAAM,CAAC,CAAC;gBACV,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAc;QAC7C,OAAO,MAAM,SAAS,CAAC,eAAe,CAAgB;YACpD,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE;gBACP,UAAU,EAAE;oBACV,MAAM,EAAE,MAAM;iBACf;aACF;YACD,EAAE,EAAE,KAAK,EAAE,IAAU,EAAiB,EAAE;gBACtC,IAAI,CAAC;oBACH,sCAAsC;oBACtC,MAAM,sBAAsB,CAAC,QAAQ,CAAC;wBACpC,KAAK,EAAE;4BACL,MAAM,EAAE,MAAM;yBACf;wBACD,KAAK,EAAE,CAAC;wBACR,IAAI,EAAE,CAAC;wBACP,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;yBACb;qBACF,CAAC,CAAC;oBAEH,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;oBAEjD,SAAS,CAAC,wCAAwC,CAAC;wBACjD,IAAI;wBACJ,SAAS,EAAE,GAAG;qBACf,CAAC,CAAC;oBAEH,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAG7B;QACC,OAAO,MAAM,SAAS,CAAC,eAAe,CAAgB;YACpD,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE;gBACP,UAAU,EAAE;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB;aACF;YACD,EAAE,EAAE,KAAK,EAAE,IAAU,EAAiB,EAAE;gBACtC,IAAI,CAAC;oBACH,MAAM,CAAC,KAAK,CACV,oDAAoD,IAAI,CAAC,MAAM,EAAE,CAClE,CAAC;oBAEF,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;oBAEtB,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBAErC,MAAM,sBAAsB,GAAW,qBAAqB,CAAC;oBAE7D,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBAC5B,MAAM,IAAI,eAAe,CACvB,6EAA6E,CAC9E,CAAC;oBACJ,CAAC;oBAED,IAAI,cAAc,GAAW,MAAM,CAAC,IAAI,CACtC,sBAAsB,EACtB,QAAQ,CACT,CAAC,QAAQ,EAAE,CAAC;oBAEb,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAE9D,gBAAgB;oBAEhB,MAAM,CAAC,KAAK,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;oBAEvD,MAAM,YAAY,GAAY,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAE/D,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,MAAM,CAAC,KAAK,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;wBACzD,MAAM,CAAC,KAAK,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;wBAE3C,MAAM,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;wBACzC,MAAM,CAAC,KAAK,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;wBACzD,MAAM,IAAI,gBAAgB,CACxB,gCAAgC,GAAG,MAAM,CAC1C,CAAC;oBACJ,CAAC;oBAED,MAAM,CAAC,KAAK,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;oBAErD,MAAM,MAAM,GAAgB,IAAI,IAAI,CAAC,MAAM,CAAC;wBAC1C,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU;wBACnD,UAAU,EAAE,cAAc;qBAC3B,CAAC,CAAC;oBAEH,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,GACxC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;wBAC1B,UAAU,EAAE,MAAM;qBACnB,CAAC,CAAC;oBAEL,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;oBAE3D,MAAM,WAAW,GAAW,MAAM,MAAM,CAAC,IAAI,CAAC;wBAC5C,GAAG,EAAE,kBAAkB;wBACvB,KAAK,EAAE,4BAA4B,CAAC,QAAQ,EAAE;wBAC9C,oBAAoB,EAAE,IAAI;wBAC1B,iBAAiB,EAAE,CAAC,SAAS,CAAC,EAAE,mDAAmD;wBACnF,iBAAiB,EAAE,KAAK,EACtB,KAAyB,EACzB,SAAoB,EACpB,gBAAwB,EACxB,EAAE;4BACF,yBAAyB;4BACzB,aAAa;4BACb,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gCACjC,MAAM,CAAC,KAAK,CACV,kCAAkC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAC3D,CAAC;gCAEF,MAAM,aAAa,GAAkB,IAAI,aAAa,EAAE,CAAC;gCACzD,aAAa,CAAC,SAAS,GAAG,gBAAgB,CAAC;gCAC3C,aAAa,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;gCACtC,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;gCAE9C,MAAM,oBAAoB,CAAC,MAAM,CAAC;oCAChC,IAAI,EAAE,aAAa;oCACnB,KAAK,EAAE;wCACL,MAAM,EAAE,IAAI;qCACb;iCACF,CAAC,CAAC;gCAEH,MAAM,CAAC,KAAK,CACV,iCAAiC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAC1D,CAAC;4BACJ,CAAC;wBACH,CAAC;wBACD,iBAAiB,EAAE,KAAK,EACtB,KAAyB,EACzB,SAAoB,EACpB,EAAE;4BACF,0BAA0B;4BAE1B,MAAM,CAAC,KAAK,CACV,kCAAkC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAC3D,CAAC;4BAEF,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gCACjC,MAAM,oBAAoB,CAAC,QAAQ,CAAC;oCAClC,KAAK,EAAE;wCACL,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK;qCAC/B;oCACD,KAAK,EAAE,CAAC;oCACR,IAAI,EAAE,CAAC;oCACP,KAAK,EAAE;wCACL,MAAM,EAAE,IAAI;qCACb;iCACF,CAAC,CAAC;4BACL,CAAC;4BAED,MAAM,CAAC,KAAK,CACV,iCAAiC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAC1D,CAAC;wBACJ,CAAC;qBACF,CAAC,CAAC;oBAEH,MAAM,CAAC,KAAK,CAAC,mCAAmC,MAAM,EAAE,CAAC,CAAC;oBAE1D,uCAAuC;oBACvC,MAAM,IAAI,GACR,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;oBAC/C,MAAM,QAAQ,GAAS,IAAI,CAAC,SAAS,CAAC;oBACtC,MAAM,SAAS,GAAS,IAAI,CAAC,QAAQ,CAAC;oBAEtC,MAAM,CAAC,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;oBACrD,MAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,EAAE,CAAC,CAAC;oBAEnD,uDAAuD;oBACvD,MAAM,mBAAmB,GACvB,MAAM,sBAAsB,CAAC,SAAS,CAAC;wBACrC,KAAK,EAAE;4BACL,MAAM,EAAE,MAAM;yBACf;wBACD,MAAM,EAAE;4BACN,GAAG,EAAE,IAAI;yBACV;wBACD,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;yBACb;qBACF,CAAC,CAAC;oBAEL,IAAI,mBAAmB,EAAE,CAAC;wBACxB,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;wBAE3D,yBAAyB;wBACzB,MAAM,sBAAsB,CAAC,QAAQ,CAAC;4BACpC,KAAK,EAAE;gCACL,MAAM,EAAE,MAAM;6BACf;4BACD,KAAK,EAAE,CAAC;4BACR,IAAI,EAAE,CAAC;4BACP,IAAI,EAAE;gCACJ,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;gCACnC,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE;gCACzC,QAAQ,EAAE,QAAQ;gCAClB,SAAS,EAAE,SAAS;6BACrB;4BACD,KAAK,EAAE;gCACL,MAAM,EAAE,IAAI;6BACb;yBACF,CAAC,CAAC;wBAEH,MAAM,CAAC,KAAK,CAAC,mCAAmC,MAAM,EAAE,CAAC,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;wBAC3D,yBAAyB;wBACzB,MAAM,eAAe,GAAoB,IAAI,eAAe,EAAE,CAAC;wBAE/D,eAAe,CAAC,MAAM,GAAG,MAAM,CAAC;wBAChC,eAAe,CAAC,WAAW,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;wBACrD,eAAe,CAAC,cAAc,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;wBAC3D,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;wBACpC,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC;wBAEtC,MAAM,sBAAsB,CAAC,MAAM,CAAC;4BAClC,IAAI,EAAE,eAAe;4BACrB,KAAK,EAAE;gCACL,MAAM,EAAE,IAAI;6BACb;yBACF,CAAC,CAAC;wBAEH,MAAM,CAAC,KAAK,CAAC,mCAAmC,MAAM,EAAE,CAAC,CAAC;oBAC5D,CAAC;oBAED,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,0CAA0C,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;oBAEtE,SAAS,CAAC,wCAAwC,CAAC;wBACjD,IAAI;wBACJ,SAAS,EAAE,CAAC;qBACb,CAAC,CAAC;oBAEH,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;wBAC3B,MAAM,CAAC,CAAC;oBACV,CAAC;oBAED,MAAM,IAAI,eAAe,CACvB,mCAAmC,IAAI,CAAC,MAAM,yEAAyE,CACxH,CAAC;gBACJ,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -68,7 +68,11 @@ export default class logger {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
static emit(data) {
|
|
71
|
-
OneUptimeTelemetry.getLogger()
|
|
71
|
+
const logger = OneUptimeTelemetry.getLogger();
|
|
72
|
+
if (logger === null) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
logger.emit({
|
|
72
76
|
body: this.serializeLogBody(data.body),
|
|
73
77
|
severityNumber: data.severityNumber,
|
|
74
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../Server/Utils/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../Server/Utils/Logger.ts"],"names":[],"mappings":"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"}
|