@coffre/conformance 0.1.1 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +11 -14
- package/package.json +3 -3
- package/src/checks/checkpoints.ts +3 -2
- package/src/fixtures.ts +5 -4
- package/src/harness.ts +7 -9
package/dist/main.js
CHANGED
|
@@ -824,10 +824,9 @@ async function using(open, use) {
|
|
|
824
824
|
//#endregion
|
|
825
825
|
//#region src/fixtures.ts
|
|
826
826
|
const KEYS = {
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
AUDIT_CHAIN_KEY: "Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI="
|
|
827
|
+
VAULT_KEY_ID: "vault-conformance-1",
|
|
828
|
+
VAULT_KEY: "Y29mZnJlLWxvY2FsLWRldi1rZWstMzItYnl0ZXMhISE=",
|
|
829
|
+
APP_KEY: "Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI="
|
|
831
830
|
};
|
|
832
831
|
//#endregion
|
|
833
832
|
//#region src/harness.ts
|
|
@@ -965,10 +964,9 @@ async function boot(kind, at, options) {
|
|
|
965
964
|
PUBLIC_URL: origin,
|
|
966
965
|
GITHUB_CLIENT_ID: github.GITHUB_CLIENT_ID,
|
|
967
966
|
GITHUB_CLIENT_SECRET: github.GITHUB_CLIENT_SECRET,
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
SIGNING_KEY: KEYS.SIGNING_KEY,
|
|
967
|
+
APP_KEY: KEYS.APP_KEY,
|
|
968
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
969
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
972
970
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
973
971
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE: runtime,
|
|
974
972
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_VAULT_HYPERDRIVE: vaultRuntime,
|
|
@@ -999,9 +997,8 @@ async function boot(kind, at, options) {
|
|
|
999
997
|
start("vault", process.execPath, ["src/vault.ts"], {
|
|
1000
998
|
VAULT_SOCKET: socket,
|
|
1001
999
|
DATABASE_URL: `file:${database}`,
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
SIGNING_KEY: KEYS.SIGNING_KEY,
|
|
1000
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
1001
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
1005
1002
|
ROOT_ADMINS: ROOT_ADMIN
|
|
1006
1003
|
});
|
|
1007
1004
|
await until("the vault socket", async () => existsSync(socket), 30, alive);
|
|
@@ -1010,7 +1007,7 @@ async function boot(kind, at, options) {
|
|
|
1010
1007
|
PUBLIC_URL: origin,
|
|
1011
1008
|
DATABASE_URL: `file:${database}`,
|
|
1012
1009
|
VAULT_SOCKET: socket,
|
|
1013
|
-
|
|
1010
|
+
APP_KEY: KEYS.APP_KEY,
|
|
1014
1011
|
...github
|
|
1015
1012
|
});
|
|
1016
1013
|
let server = startServer();
|
|
@@ -2092,14 +2089,14 @@ async function earlierCheckpoint(deployment, { admin }) {
|
|
|
2092
2089
|
const signed = rows.filter((row) => row.author === "vault" && row.action === "audit.checkpoint" && row.decision === "allow");
|
|
2093
2090
|
expect(signed.length >= 2, "two checkpoints are needed");
|
|
2094
2091
|
const [head] = await sql.query("SELECT * FROM audit_chain_head");
|
|
2095
|
-
const seed = Buffer.from(KEYS.
|
|
2092
|
+
const seed = Buffer.from(hkdfSync("sha256", Buffer.from(KEYS.VAULT_KEY, "base64"), Buffer.alloc(0), "coffre.vault.signing-key.v1", 32));
|
|
2096
2093
|
const signingKey = createPrivateKey({
|
|
2097
2094
|
key: Buffer.concat([Buffer.from("302e020100300506032b657004220420", "hex"), seed]),
|
|
2098
2095
|
format: "der",
|
|
2099
2096
|
type: "pkcs8"
|
|
2100
2097
|
});
|
|
2101
2098
|
const keys = {
|
|
2102
|
-
app: Buffer.from(hkdfSync("sha256", Buffer.from(KEYS.
|
|
2099
|
+
app: Buffer.from(hkdfSync("sha256", Buffer.from(KEYS.APP_KEY, "base64"), Buffer.alloc(0), "coffre.audit.app.v2", 32)),
|
|
2103
2100
|
vault: Buffer.from(hkdfSync("sha256", seed, Buffer.alloc(0), "coffre.audit.vault.v2", 32))
|
|
2104
2101
|
};
|
|
2105
2102
|
const hashes = /* @__PURE__ */ new Map();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coffre/conformance",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.3",
|
|
4
4
|
"description": "Checks a coffre deployment from outside: what it must never do, whatever code it runs.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"jose": "6.2.3",
|
|
33
33
|
"pg": "8.16.3",
|
|
34
|
-
"@coffre/db": "0.1.
|
|
34
|
+
"@coffre/db": "0.1.3"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@types/node": "26.1.1",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"oauth4webapi": "3.8.8",
|
|
40
40
|
"tsdown": "0.23.0",
|
|
41
41
|
"typescript": "5.9.3",
|
|
42
|
-
"@coffre/client": "0.1.
|
|
42
|
+
"@coffre/client": "0.1.3"
|
|
43
43
|
},
|
|
44
44
|
"scripts": {
|
|
45
45
|
"build": "tsdown",
|
|
@@ -17,10 +17,11 @@ export async function earlierCheckpoint(deployment: Deployment, { admin }: Peopl
|
|
|
17
17
|
const signed = rows.filter((row) => row.author === 'vault' && row.action === 'audit.checkpoint' && row.decision === 'allow');
|
|
18
18
|
expect(signed.length >= 2, 'two checkpoints are needed');
|
|
19
19
|
const [head] = await sql.query('SELECT * FROM audit_chain_head');
|
|
20
|
-
|
|
20
|
+
// The vault's signing key, which it derives from its KEK: HKDF-SHA-256 under the vault's label.
|
|
21
|
+
const seed = Buffer.from(hkdfSync('sha256', Buffer.from(KEYS.VAULT_KEY, 'base64'), Buffer.alloc(0), 'coffre.vault.signing-key.v1', 32));
|
|
21
22
|
const signingKey = createPrivateKey({ key: Buffer.concat([Buffer.from('302e020100300506032b657004220420', 'hex'), seed]), format: 'der', type: 'pkcs8' });
|
|
22
23
|
const keys = {
|
|
23
|
-
app: Buffer.from(hkdfSync('sha256', Buffer.from(KEYS.
|
|
24
|
+
app: Buffer.from(hkdfSync('sha256', Buffer.from(KEYS.APP_KEY, 'base64'), Buffer.alloc(0), 'coffre.audit.app.v2', 32)),
|
|
24
25
|
vault: Buffer.from(hkdfSync('sha256', seed, Buffer.alloc(0), 'coffre.audit.vault.v2', 32)),
|
|
25
26
|
};
|
|
26
27
|
const hashes = new Map<bigint, string>();
|
package/src/fixtures.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// Local fixtures, as in .env.dev: none of them is a secret anywhere else.
|
|
2
|
+
// The vault derives its signing key from the KEK, as every deployment with
|
|
3
|
+
// a local KEK does.
|
|
2
4
|
export const KEYS = {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
AUDIT_CHAIN_KEY: 'Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI=',
|
|
5
|
+
VAULT_KEY_ID: 'vault-conformance-1',
|
|
6
|
+
VAULT_KEY: 'Y29mZnJlLWxvY2FsLWRldi1rZWstMzItYnl0ZXMhISE=',
|
|
7
|
+
APP_KEY: 'Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI=',
|
|
7
8
|
};
|
package/src/harness.ts
CHANGED
|
@@ -187,14 +187,13 @@ export async function boot(kind: Kind, at: string, options: HarnessOptions): Pro
|
|
|
187
187
|
...['--var', `GITHUB_URL:${github.GITHUB_URL}`, '--var', `GITHUB_API_URL:${github.GITHUB_API_URL}`],
|
|
188
188
|
], {
|
|
189
189
|
// Wrangler hands each Worker the vars and secrets its own
|
|
190
|
-
// wrangler.jsonc declares, from here: the app never sees
|
|
190
|
+
// wrangler.jsonc declares, from here: the app never sees the vault key.
|
|
191
191
|
PUBLIC_URL: origin,
|
|
192
192
|
GITHUB_CLIENT_ID: github.GITHUB_CLIENT_ID,
|
|
193
193
|
GITHUB_CLIENT_SECRET: github.GITHUB_CLIENT_SECRET,
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
SIGNING_KEY: KEYS.SIGNING_KEY,
|
|
194
|
+
APP_KEY: KEYS.APP_KEY,
|
|
195
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
196
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
198
197
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
199
198
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE: runtime,
|
|
200
199
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_VAULT_HYPERDRIVE: vaultRuntime,
|
|
@@ -226,9 +225,8 @@ export async function boot(kind: Kind, at: string, options: HarnessOptions): Pro
|
|
|
226
225
|
start('vault', process.execPath, ['src/vault.ts'], {
|
|
227
226
|
VAULT_SOCKET: socket,
|
|
228
227
|
DATABASE_URL: `file:${database}`,
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
SIGNING_KEY: KEYS.SIGNING_KEY,
|
|
228
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
229
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
232
230
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
233
231
|
});
|
|
234
232
|
await until('the vault socket', async () => existsSync(socket), 30, alive);
|
|
@@ -238,7 +236,7 @@ export async function boot(kind: Kind, at: string, options: HarnessOptions): Pro
|
|
|
238
236
|
PUBLIC_URL: origin,
|
|
239
237
|
DATABASE_URL: `file:${database}`,
|
|
240
238
|
VAULT_SOCKET: socket,
|
|
241
|
-
|
|
239
|
+
APP_KEY: KEYS.APP_KEY,
|
|
242
240
|
...github,
|
|
243
241
|
});
|
|
244
242
|
let server = startServer();
|