Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2025-11-14 00:31:25 +10:00
Code Issues Packages Projects Releases Wiki Activity

migrate to new droplet ca system

Browse Source
This commit is contained in:
DecDuck
2024-10-08 21:45:44 +11:00
parent 2b4382d013
commit c4d81135a2
4 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/internal/clients/ca.ts
View File

@ -4,7 +4,6 @@ import { CertificateStore } from "./store";
export type CertificateBundle = {
priv: string;
pub: string;
cert: string;
};
@ -24,8 +23,8 @@ export class CertificateAuthority {
static async new(store: CertificateStore) {
const root = await store.fetch("ca");
if (root === undefined) {
const [priv, pub, cert] = droplet.generateRootCa();
const bundle: CertificateBundle = { priv, pub, cert };
const [cert, priv] = droplet.generateRootCa();
const bundle: CertificateBundle = { priv, cert };
await store.store("ca", bundle);
return new CertificateAuthority(store, bundle);
}
@ -36,7 +35,7 @@ export class CertificateAuthority {
const caCertificate = await this.certificateStore.fetch("ca");
if (!caCertificate)
throw new Error("Certificate authority not initialised");
const [priv, pub, cert] = droplet.generateClientCertificate(
const [cert, priv] = droplet.generateClientCertificate(
clientId,
clientName,
caCertificate.cert,
@ -44,7 +43,6 @@ export class CertificateAuthority {
);
const certBundle: CertificateBundle = {
priv,
pub,
cert,
};
return certBundle;