@coffre/conformance 0.1.2 → 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 -11
- package/package.json +3 -3
- package/src/checks/checkpoints.ts +2 -2
- package/src/fixtures.ts +3 -3
- package/src/harness.ts +7 -7
package/dist/main.js
CHANGED
|
@@ -824,9 +824,9 @@ async function using(open, use) {
|
|
|
824
824
|
//#endregion
|
|
825
825
|
//#region src/fixtures.ts
|
|
826
826
|
const KEYS = {
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
827
|
+
VAULT_KEY_ID: "vault-conformance-1",
|
|
828
|
+
VAULT_KEY: "Y29mZnJlLWxvY2FsLWRldi1rZWstMzItYnl0ZXMhISE=",
|
|
829
|
+
APP_KEY: "Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI="
|
|
830
830
|
};
|
|
831
831
|
//#endregion
|
|
832
832
|
//#region src/harness.ts
|
|
@@ -964,9 +964,9 @@ async function boot(kind, at, options) {
|
|
|
964
964
|
PUBLIC_URL: origin,
|
|
965
965
|
GITHUB_CLIENT_ID: github.GITHUB_CLIENT_ID,
|
|
966
966
|
GITHUB_CLIENT_SECRET: github.GITHUB_CLIENT_SECRET,
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
967
|
+
APP_KEY: KEYS.APP_KEY,
|
|
968
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
969
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
970
970
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
971
971
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE: runtime,
|
|
972
972
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_VAULT_HYPERDRIVE: vaultRuntime,
|
|
@@ -997,8 +997,8 @@ async function boot(kind, at, options) {
|
|
|
997
997
|
start("vault", process.execPath, ["src/vault.ts"], {
|
|
998
998
|
VAULT_SOCKET: socket,
|
|
999
999
|
DATABASE_URL: `file:${database}`,
|
|
1000
|
-
|
|
1001
|
-
|
|
1000
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
1001
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
1002
1002
|
ROOT_ADMINS: ROOT_ADMIN
|
|
1003
1003
|
});
|
|
1004
1004
|
await until("the vault socket", async () => existsSync(socket), 30, alive);
|
|
@@ -1007,7 +1007,7 @@ async function boot(kind, at, options) {
|
|
|
1007
1007
|
PUBLIC_URL: origin,
|
|
1008
1008
|
DATABASE_URL: `file:${database}`,
|
|
1009
1009
|
VAULT_SOCKET: socket,
|
|
1010
|
-
|
|
1010
|
+
APP_KEY: KEYS.APP_KEY,
|
|
1011
1011
|
...github
|
|
1012
1012
|
});
|
|
1013
1013
|
let server = startServer();
|
|
@@ -2089,14 +2089,14 @@ async function earlierCheckpoint(deployment, { admin }) {
|
|
|
2089
2089
|
const signed = rows.filter((row) => row.author === "vault" && row.action === "audit.checkpoint" && row.decision === "allow");
|
|
2090
2090
|
expect(signed.length >= 2, "two checkpoints are needed");
|
|
2091
2091
|
const [head] = await sql.query("SELECT * FROM audit_chain_head");
|
|
2092
|
-
const seed = Buffer.from(hkdfSync("sha256", 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));
|
|
2093
2093
|
const signingKey = createPrivateKey({
|
|
2094
2094
|
key: Buffer.concat([Buffer.from("302e020100300506032b657004220420", "hex"), seed]),
|
|
2095
2095
|
format: "der",
|
|
2096
2096
|
type: "pkcs8"
|
|
2097
2097
|
});
|
|
2098
2098
|
const keys = {
|
|
2099
|
-
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)),
|
|
2100
2100
|
vault: Buffer.from(hkdfSync("sha256", seed, Buffer.alloc(0), "coffre.audit.vault.v2", 32))
|
|
2101
2101
|
};
|
|
2102
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",
|
|
@@ -18,10 +18,10 @@ export async function earlierCheckpoint(deployment: Deployment, { admin }: Peopl
|
|
|
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.
|
|
21
|
+
const seed = Buffer.from(hkdfSync('sha256', Buffer.from(KEYS.VAULT_KEY, 'base64'), Buffer.alloc(0), 'coffre.vault.signing-key.v1', 32));
|
|
22
22
|
const signingKey = createPrivateKey({ key: Buffer.concat([Buffer.from('302e020100300506032b657004220420', 'hex'), seed]), format: 'der', type: 'pkcs8' });
|
|
23
23
|
const keys = {
|
|
24
|
-
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)),
|
|
25
25
|
vault: Buffer.from(hkdfSync('sha256', seed, Buffer.alloc(0), 'coffre.audit.vault.v2', 32)),
|
|
26
26
|
};
|
|
27
27
|
const hashes = new Map<bigint, string>();
|
package/src/fixtures.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// The vault derives its signing key from the KEK, as every deployment with
|
|
3
3
|
// a local KEK does.
|
|
4
4
|
export const KEYS = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
VAULT_KEY_ID: 'vault-conformance-1',
|
|
6
|
+
VAULT_KEY: 'Y29mZnJlLWxvY2FsLWRldi1rZWstMzItYnl0ZXMhISE=',
|
|
7
|
+
APP_KEY: 'Y29mZnJlLWxvY2FsLWF1ZGl0LWNoYWluLWtleS0zMmI=',
|
|
8
8
|
};
|
package/src/harness.ts
CHANGED
|
@@ -187,13 +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
|
-
|
|
194
|
+
APP_KEY: KEYS.APP_KEY,
|
|
195
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
196
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
197
197
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
198
198
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE: runtime,
|
|
199
199
|
CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_VAULT_HYPERDRIVE: vaultRuntime,
|
|
@@ -225,8 +225,8 @@ export async function boot(kind: Kind, at: string, options: HarnessOptions): Pro
|
|
|
225
225
|
start('vault', process.execPath, ['src/vault.ts'], {
|
|
226
226
|
VAULT_SOCKET: socket,
|
|
227
227
|
DATABASE_URL: `file:${database}`,
|
|
228
|
-
|
|
229
|
-
|
|
228
|
+
VAULT_KEY_ID: KEYS.VAULT_KEY_ID,
|
|
229
|
+
VAULT_KEY: KEYS.VAULT_KEY,
|
|
230
230
|
ROOT_ADMINS: ROOT_ADMIN,
|
|
231
231
|
});
|
|
232
232
|
await until('the vault socket', async () => existsSync(socket), 30, alive);
|
|
@@ -236,7 +236,7 @@ export async function boot(kind: Kind, at: string, options: HarnessOptions): Pro
|
|
|
236
236
|
PUBLIC_URL: origin,
|
|
237
237
|
DATABASE_URL: `file:${database}`,
|
|
238
238
|
VAULT_SOCKET: socket,
|
|
239
|
-
|
|
239
|
+
APP_KEY: KEYS.APP_KEY,
|
|
240
240
|
...github,
|
|
241
241
|
});
|
|
242
242
|
let server = startServer();
|