diff --git a/package.json b/package.json index 906ec72..6a71e66 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "postinstall": "nuxt prepare" }, "dependencies": { - "@drop/droplet": "^0.2.0", - "@drop/droplet-linux-x64-gnu": "^0.2.0", + "@drop/droplet": "0.3.0", + "@drop/droplet-linux-x64-gnu": "0.3.0", "@headlessui/vue": "^1.7.23", "@heroicons/vue": "^2.1.5", "@prisma/client": "5.20.0", diff --git a/server/api/v1/client/handshake.post.ts b/server/api/v1/client/handshake.post.ts index 96b06d9..53abcb9 100644 --- a/server/api/v1/client/handshake.post.ts +++ b/server/api/v1/client/handshake.post.ts @@ -39,7 +39,6 @@ export default defineEventHandler(async (h3) => { return { private: bundle.priv, - public: bundle.pub, certificate: bundle.cert, id: client.id, }; diff --git a/server/internal/clients/ca.ts b/server/internal/clients/ca.ts index 85ba57f..5e5b1d1 100644 --- a/server/internal/clients/ca.ts +++ b/server/internal/clients/ca.ts @@ -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; diff --git a/yarn.lock b/yarn.lock index f00a47b..aa80c87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -296,23 +296,17 @@ dependencies: mime "^3.0.0" -"@drop/droplet-linux-x64-gnu@0.2.0", "@drop/droplet-linux-x64-gnu@^0.2.0": - version "0.2.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" - integrity sha1-4cATOrw4z2PMi+r1gm2xlGvrEWU= +"@drop/droplet-linux-x64-gnu@0.3.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.3.0.tgz#ad9e8e27b44fb74e2121e00a31c4c7a450a77630" + integrity sha1-rZ6OJ7RPt04hIeAKMcTHpFCndjA= -"@drop/droplet-win32-x64-msvc@0.2.0": - version "0.2.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" - integrity sha1-BTHlHiJVMMJ3r8x6xCMMjZnINl4= - -"@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= +"@drop/droplet@0.3.0": + version "0.3.0" + resolved "https://lab.deepcore.dev/api/v4/projects/57/packages/npm/@drop/droplet/-/@drop/droplet-0.3.0.tgz#8e7b0596cc7265948f528bbc50c7d4889e3b9769" + integrity sha1-jnsFlsxyZZSPUou8UMfUiJ47l2k= optionalDependencies: - "@drop/droplet-linux-x64-gnu" "0.2.0" - "@drop/droplet-win32-x64-msvc" "0.2.0" + "@drop/droplet-linux-x64-gnu" "0.3.0" "@esbuild/aix-ppc64@0.20.2": version "0.20.2"