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

feat: normalize domain and subdomain inputs by trimming and converting to lowercase in DomainService and StatusPageDomainService

Browse Source
This commit is contained in:
Simon Larsen
2025-05-29 10:58:43 +01:00
parent 5d8d24dd58
commit 14e4949c1a
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Common/Server/Services/DomainService.ts
View File

@@ -16,6 +16,12 @@ export class Service extends DatabaseService<Model> {
protected override async onBeforeCreate(
createBy: CreateBy<Model>,
): Promise<OnCreate<Model>> {
if (createBy.data.domain) {
createBy.data.domain.domain = createBy.data.domain.domain
.trim()
.toLowerCase();
}
createBy.data.domainVerificationText =
"oneuptime-verification-" + Text.generateRandomText(20);
return Promise.resolve({ createBy, carryForward: null });

13
Common/Server/Services/StatusPageDomainService.ts
View File

@@ -48,8 +48,19 @@ export class Service extends DatabaseService<StatusPageDomain> {
);
}
if (createBy.data.subdomain) {
// trim and lowercase the subdomain.
createBy.data.subdomain = createBy.data.subdomain.trim().toLowerCase();
}
if (domain) {
createBy.data.fullDomain = createBy.data.subdomain + "." + domain.domain;
createBy.data.fullDomain = (
createBy.data.subdomain +
"." +
domain.domain?.toString()
)
.toLowerCase()
.trim();
}
createBy.data.cnameVerificationToken = ObjectID.generate().toString();

8
Nginx/Jobs/AcmeWriteCertificates.ts
View File

@@ -45,16 +45,18 @@ export default class Jobs {
// Write to disk.
await LocalFile.write(
`/etc/nginx/certs/StatusPageCerts/${cert.domain}.crt`,
`/etc/nginx/certs/StatusPageCerts/${cert.domain?.toString().trim().toLocaleLowerCase()}.crt`,
cert.certificate?.toString() || "",
);
await LocalFile.write(
`/etc/nginx/certs/StatusPageCerts/${cert.domain}.key`,
`/etc/nginx/certs/StatusPageCerts/${cert.domain?.toString().trim().toLocaleLowerCase()}.key`,
cert.certificateKey?.toString() || "",
);
logger.debug(`Wrote custom certs to disk for domain: ${cert.domain}`);
logger.debug(
`Wrote custom certs to disk for domain: ${cert.domain?.toString().trim().toLocaleLowerCase()}`,
);
}
},
});

6
Nginx/Jobs/WriteCustomCertsToDisk.ts
View File

@@ -58,17 +58,17 @@ export default class Jobs {
// Write to disk.
await LocalFile.write(
`/etc/nginx/certs/StatusPageCerts/${cert.fullDomain}.crt`,
`/etc/nginx/certs/StatusPageCerts/${cert.fullDomain?.toString().trim().toLocaleLowerCase()}.crt`,
cert.customCertificate?.toString() || "",
);
await LocalFile.write(
`/etc/nginx/certs/StatusPageCerts/${cert.fullDomain}.key`,
`/etc/nginx/certs/StatusPageCerts/${cert.fullDomain?.toString().trim().toLocaleLowerCase()}.key`,
cert.customCertificateKey?.toString() || "",
);
logger.debug(
`Wrote custom certs to disk for domain: ${cert.fullDomain}`,
`Wrote custom certs to disk for domain: ${cert.fullDomain?.toString().trim().toLocaleLowerCase()}`,
);
}
},