Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2025-11-14 16:51:15 +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

4
package.json
View File

@ -10,8 +10,8 @@
"postinstall": "nuxt prepare" "postinstall": "nuxt prepare"
}, },
"dependencies": { "dependencies": {
"@drop/droplet": "^0.2.0", "@drop/droplet": "0.3.0",
"@drop/droplet-linux-x64-gnu": "^0.2.0", "@drop/droplet-linux-x64-gnu": "0.3.0",
"@headlessui/vue": "^1.7.23", "@headlessui/vue": "^1.7.23",
"@heroicons/vue": "^2.1.5", "@heroicons/vue": "^2.1.5",
"@prisma/client": "5.20.0", "@prisma/client": "5.20.0",

1
server/api/v1/client/handshake.post.ts
View File

@ -39,7 +39,6 @@ export default defineEventHandler(async (h3) => {
return { return {
private: bundle.priv, private: bundle.priv,
public: bundle.pub,
certificate: bundle.cert, certificate: bundle.cert,
id: client.id, id: client.id,
}; };

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

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

24
yarn.lock
View File

@ -296,23 +296,17 @@
dependencies: dependencies:
mime "^3.0.0" mime "^3.0.0"
"@drop/droplet-linux-x64-gnu@0.2.0", "@drop/droplet-linux-x64-gnu@^0.2.0": "@drop/droplet-linux-x64-gnu@0.3.0":
version "0.2.0" version "0.3.0"
resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet-linux-x64-gnu/-/@drop/droplet-linux-x64-gnu-0.2.0.tgz#e1c0133abc38cf63cc8beaf5826db1946beb1165" resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet-linux-x64-gnu/-/@drop/droplet-linux-x64-gnu-0.3.0.tgz#ad9e8e27b44fb74e2121e00a31c4c7a450a77630"
integrity sha1-4cATOrw4z2PMi+r1gm2xlGvrEWU= integrity sha1-rZ6OJ7RPt04hIeAKMcTHpFCndjA=
"@drop/droplet-win32-x64-msvc@0.2.0": "@drop/droplet@0.3.0":
version "0.2.0" version "0.3.0"
resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet-win32-x64-msvc/-/@drop/droplet-win32-x64-msvc-0.2.0.tgz#0531e51e225530c277afcc7ac4230c8d99c8365e" resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet/-/@drop/droplet-0.3.0.tgz#8e7b0596cc7265948f528bbc50c7d4889e3b9769"
integrity sha1-BTHlHiJVMMJ3r8x6xCMMjZnINl4= integrity sha1-jnsFlsxyZZSPUou8UMfUiJ47l2k=
"@drop/droplet@^0.2.0":
version "0.2.0"
resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet/-/@drop/droplet-0.2.0.tgz#e4b6d2cf2bd5c0416fd3452ffa5b7c34267e160a"
integrity sha1-5LbSzyvVwEFv00Uv+lt8NCZ+Fgo=
optionalDependencies: optionalDependencies:
"@drop/droplet-linux-x64-gnu" "0.2.0" "@drop/droplet-linux-x64-gnu" "0.3.0"
"@drop/droplet-win32-x64-msvc" "0.2.0"
"@esbuild/aix-ppc64@0.20.2": "@esbuild/aix-ppc64@0.20.2":
version "0.20.2" version "0.20.2"