github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

delete certs

Browse Source
This commit is contained in:
Simon Larsen
2022-12-14 08:27:34 +00:00
parent 6bf2d312d4
commit 25daf863d3
8 changed files with 43 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Certs/StatusPageCerts/status.genosyn.com.crt
View File

@@ -1,30 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIFKTCCBBGgAwIBAgISBI+ZMOTLreLlsVt7PF9qX1u2MA0GCSqGSIb3DQEBCwUA
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
EwJSMzAeFw0yMjEyMTAxMjA2MTJaFw0yMzAzMTAxMjA2MTFaMB0xGzAZBgNVBAMT
EnN0YXR1cy5nZW5vc3luLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBAMgb7+Qhe/f9YCIATTMF7kVGO4Zwd2nJ167vEczBOsHkNspiVD9UPdL0KpFV
L37sqiclcVbUds5QO0h81ckBMNwsRiqSeEj5V5FcRII1PdduROBB7mVfgtuwG2jQ
NtU2IEDAIuxQVTOep3ciZBK4iiwgYttOKbvw5EtjlYKMk2+ZJy2eUjvEstNGkm5b
iekNEvt5ZTInYfWoyCaD9gsjMEaB/ueL21M7jbgJ049n64CYv2robhU9JEQW5p8h
B849YvO+nzhGdCuWRU4FPXzI4aDPs6ONceodg0IIeEbEZMntc1AKXyL7TJp3+kLI
eBpmtwXqQvNuCeqV7QXMK7X7QEsCAwEAAaOCAkwwggJIMA4GA1UdDwEB/wQEAwIF
oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd
BgNVHQ4EFgQUvnstsk3lPsOYn1nKiQGwdeXVGscwHwYDVR0jBBgwFoAUFC6zF7dY
VsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRw
Oi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNy
Lm9yZy8wHQYDVR0RBBYwFIISc3RhdHVzLmdlbm9zeW4uY29tMEwGA1UdIARFMEMw
CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAtz77
JN+cTbp18jnFulj0bF38Qs96nzXEnh0JgSXttJkAAAGE/CSqhwAABAMARzBFAiAm
PBXbjWWdkehEstdTQ5LoAS1omXJQNnuo1nt2YsoL3gIhAJSewh6nfHL+lXhckXtk
pSkI2qNdq2otCyq3Z9W/Z4YpAHUArfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWG
NOvcgooAAAGE/CSqvQAABAMARjBEAiAwAB2istEPxzNrMuw04guD5NyOt/RKDX5l
0y71+H9ekQIgaBg24zPbRNw01G5Y7WUsS9/vBgAEpEtfqpMcedNVwXAwDQYJKoZI
hvcNAQELBQADggEBALU11dZ+HIWxGUz0Q4IqVLfN9dP4cTVdee5GOX8KNh2rmIBv
7YZtuGJVVbILW+D5w/r+3l3z3MFg1ocEHUtfDCtmZes4WyBHXntaJe9JuqY6/ArN
VUIR1r0S6iKmZ17S0/FjruyHOyOw5Zhxix1Q5dMCpuCIfOtOaG8cAf8Qi1re3br9
6dwDpgW5mUQBLA9DGnnXYKvkd/EcEUnf39o2UaDCfFSeQgSu46/98GcOQQ0SpN6c
OqEJ4Dnc6NP/Trmb1nDQbIMx4c5y/q7miDb8URdK3H+EGdmmBie7M46se3i11oGC
u7agSvvW32dShImvoC8pJFAS0cEaAPdODHgg5U0=
-----END CERTIFICATE-----

27
Certs/StatusPageCerts/status.genosyn.com.key
View File

@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpQIBAAKCAQEAyBvv5CF79/1gIgBNMwXuRUY7hnB3acnXru8RzME6weQ2ymJU
P1Q90vQqkVUvfuyqJyVxVtR2zlA7SHzVyQEw3CxGKpJ4SPlXkVxEgjU9125E4EHu
ZV+C27AbaNA21TYgQMAi7FBVM56ndyJkEriKLCBi204pu/DkS2OVgoyTb5knLZ5S
O8Sy00aSbluJ6Q0S+3llMidh9ajIJoP2CyMwRoH+54vbUzuNuAnTj2frgJi/auhu
FT0kRBbmnyEHzj1i876fOEZ0K5ZFTgU9fMjhoM+zo41x6h2DQgh4RsRkye1zUApf
IvtMmnf6Qsh4Gma3BepC824J6pXtBcwrtftASwIDAQABAoIBABmBohq4f+Y0uCet
VSm/REc1NAonVLk5vpGwLFsmeBhVv/wc+3MVCEpW0AQ1UPgDL48M0T0JmNkkVeIf
81oLGlC+HfV4NPfMPHKtSZg1NBw9FG9nR/1I5tOcx2mdPJgBravDMdBgTvPk8aCY
VBwkxIvqVt9wP5aSlm7bkyeQRoyvRYP+cWnLo1sR6sIEO4SyjtoFzKtp/CrP8MBs
67mVyLPurEqCB0wVDCAr/G2SkJhCUXGvqSzfDU0oGEVGWmb95PQGsOe1KjqegY7A
BTFKMNjbOyncYau4EkZcPAKpv/9Qgo+52bYDKekSxk/ZHitE0TmW4WlC73UMkIQK
yG+Si+kCgYEA8R7+roCHqaxT30bNlJe+FCkVQuXsBJp3TAPUxBSnZZCp0mifEhQc
WGvvG9AOSVmoCPDMGw1xUo+zsUNkxmi+FcLUeAM5hdiV68D1QfjhUlrPidEv74l9
0WlW3+z1tJVbN2WYdXD1JHg5nyq/hEMg4Q/FLEAMj6daIK1PFc+INuMCgYEA1HUS
6q89LzFMSGrGxksxQIoT4cgg1pUA3QLWijEnnT2YDk3Z5iB7F+a1jYQFH1SXBYMx
pIwiHM+qXsumcg0upLPj+ulqGKMt0qPkJTb4w1rGr73BKygDdmFbym3jQxbAqpIY
gW1ZvuOBgR8hstBc0gLUOsgl5TeSel1h/swzpXkCgYEA4ZsmoRAR32gmcdtFr6rr
ZuGpyxZmZ0hAJxfOlEje9+ELhJvvenLmsrUK3PMm6urAltz3nLhPN/jNISb1u891
S9coBcK+p8WnQRciY8AC05O0bDcWqwHyf2YYqxyEKZs15fdhV0GBncX/5DWTTKWi
tfKTgnvLRP5JDhoazUWJJhECgYEAwJaf3z2bKPx3Oe4Q4g+nRenku/a+TcYkUjQQ
ZpTIZDFBdTX9IC6xZqksSmwyeIQlokma5p5hDdzxg5z39MseTQ8Eyp5sHolNMHSA
i3uZZP0Uvpo0UPqkqNr4ajfSmy402Go27JxDjlaNPo8J7R4UBguqdt6X+4C0t1eP
TXmuF4ECgYEAzK8INorcqp4a+rHrtIrBqS6I6q/NtBydZ6QC03qOL/6/6ITdf894
6+S5cksZZqr8HC86f/FOxjGvtLFuuuWoHLTgEra2Blm9lAwrSXIRIgbTDI19rQGq
WaNnUaRke0jQMkNXndToTlU2j7OBI1vGMA5UwrXAD8LWAMrkgzPeKUc=
-----END RSA PRIVATE KEY-----

5
CommonServer/API/StatusPageAPI.ts
View File

@@ -68,7 +68,7 @@ export default class StatusPageAPI extends BaseAPI<
next: NextFunction
) => {
try {
if (req.body['domain']) {
if (!req.body['domain']) {
throw new BadDataException(
'domain is required in request body'
);
@@ -120,6 +120,9 @@ export default class StatusPageAPI extends BaseAPI<
}
);
this.router.post(
`/${new this.entityType()
.getCrudApiPath()

2
CommonServer/package-lock.json generated
View File

@@ -80,6 +80,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",
@@ -12972,6 +12973,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",

3
CommonUI/package-lock.json generated
View File

@@ -88,6 +88,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",
@@ -21436,6 +21437,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",
@@ -27372,6 +27374,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",

6
Model/package-lock.json generated
View File

@@ -32,6 +32,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",
@@ -40,7 +41,7 @@
},
"devDependencies": {
"@faker-js/faker": "^6.3.1",
"@types/jest": "^27.4.1",
"@types/jest": "^27.5.2",
"@types/node": "^17.0.22",
"jest": "^27.5.1",
"ts-jest": "^27.1.4"
@@ -5823,7 +5824,7 @@
"requires": {
"@faker-js/faker": "^6.3.1",
"@types/crypto-js": "^4.1.1",
"@types/jest": "^27.4.1",
"@types/jest": "^27.5.2",
"@types/nanoid-dictionary": "^4.2.0",
"@types/node": "^17.0.22",
"@types/uuid": "^8.3.4",
@@ -5833,6 +5834,7 @@
"moment": "^2.29.2",
"nanoid": "^3.3.2",
"nanoid-dictionary": "^4.3.0",
"posthog-js": "^1.37.0",
"process": "^0.11.10",
"reflect-metadata": "^0.1.13",
"slugify": "^1.6.5",

19
StatusPage/src/Components/MasterPage/MasterPage.tsx
View File

@@ -22,8 +22,6 @@ import BaseModel from 'Common/Models/BaseModel';
import File from 'Model/Models/File';
import { ImageFunctions } from 'CommonUI/src/Components/Image/Image';
import HTTPResponse from 'Common/Types/API/HTTPResponse';
import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
import StatusPageDomain from 'Model/Models/StatusPageDomain';
export interface ComponentProps {
children: ReactElement | Array<ReactElement>;
@@ -53,12 +51,19 @@ const DashboardMasterPage: FunctionComponent<ComponentProps> = (
return new ObjectID(id);
} else {
// get status page id by hostname.
const result: ListResult<StatusPageDomain> = await ModelAPI.getList(StatusPageDomain, {
fullDomain: Navigation.getHostname().toString()
}, 1, 0, { _id: true }, {}, {});
const response: HTTPResponse<JSONObject> =
await BaseAPI.post<JSONObject>(
URL.fromString(DASHBOARD_API_URL.toString()).addRoute(
`/status-page/domain`
),
{
domain: Navigation.getHostname().toString()
},
{}
);
if (result.data.length > 0 && result.data[0]?._id) {
return new ObjectID(result.data[0]?._id);
if (response.data && response.data['statusPageId']) {
return new ObjectID(response.data['statusPageId'] as string);
}
}

28
Workers/Jobs/StatusPageCerts/StausPageCerts.ts
View File

@@ -363,18 +363,27 @@ RunCron(
}
const key: string = JSON.parse(cert.blob || '{}').privateKeyPem;
const crt: string = JSON.parse(certBlob.blob || '{}').cert;
let crt: string = JSON.parse(certBlob.blob || '{}').cert;
// Add chain to crt.
console.log("Lookign for chain");
console.log(JSON.parse(certBlob.blob || '{}'));
if (JSON.parse(certBlob.blob || '{}').chain) {
console.log("Chain found");
crt += '\n' +
'\n' +
JSON.parse(certBlob.blob || '{}').chain;
}
// Write to disk.
fs.writeFileSync(
`/usr/src/Certs/StatusPageCerts/${cert.key}.crt`,
crt,
{ flag: 'wx' }
);
fs.writeFileSync(
`/usr/src/Certs/StatusPageCerts/${cert.key}.key`,
key,
{ flag: 'wx' }
);
}
}
@@ -443,7 +452,6 @@ const checkCnameValidation: Function = async (
fulldomain: string,
token: string
): Promise<boolean> => {
logger.info('Check CNAMeValidation.');
try {
const agent: https.Agent = new https.Agent({
@@ -452,9 +460,9 @@ const checkCnameValidation: Function = async (
const result: AxiosResponse = await axios.get(
'https://' +
fulldomain +
'/status-page-api/cname-verification/' +
token,
fulldomain +
'/status-page-api/cname-verification/' +
token,
{ httpsAgent: agent }
);
@@ -474,9 +482,9 @@ const isSslProvisioned: Function = async (
try {
const result: AxiosResponse = await axios.get(
'https://' +
fulldomain +
'/status-page-api/cname-verification/' +
token
fulldomain +
'/status-page-api/cname-verification/' +
token
);
if (result.status === 200) {