@zintrust/core 0.4.29 → 0.4.31
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/package.json +1 -1
- package/src/cli/commands/D1ProxyCommand.d.ts.map +1 -1
- package/src/cli/commands/D1ProxyCommand.js +3 -2
- package/src/cli/commands/KvProxyCommand.d.ts.map +1 -1
- package/src/cli/commands/KvProxyCommand.js +3 -2
- package/src/index.js +3 -3
- package/src/proxy/d1/ZintrustD1Proxy.d.ts +46 -1
- package/src/proxy/d1/ZintrustD1Proxy.d.ts.map +1 -1
- package/src/proxy/d1/ZintrustD1Proxy.js +356 -31
- package/src/proxy/kv/ZintrustKvProxy.d.ts +42 -1
- package/src/proxy/kv/ZintrustKvProxy.d.ts.map +1 -1
- package/src/proxy/kv/ZintrustKvProxy.js +297 -34
- package/src/zintrust.plugins.js +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"D1ProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/D1ProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA6PrE,eAAO,MAAM,cAAc;cACf,YAAY;EAwCtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
|
|
@@ -14,6 +14,7 @@ const DEFAULT_DATABASE_NAME = 'd1-proxy-db';
|
|
|
14
14
|
const DEFAULT_DATABASE_ID = '<your-d1-database-id>';
|
|
15
15
|
const DEFAULT_MIGRATIONS_DIR = 'database/migrations/d1';
|
|
16
16
|
const DEFAULT_ENTRY_FILE = 'src/proxy/d1/ZintrustD1Proxy.ts';
|
|
17
|
+
const CORE_PROXY_MODULE = ['@zintrust', 'core', 'proxy'].join('/');
|
|
17
18
|
const trimOption = (value) => {
|
|
18
19
|
if (!isNonEmptyString(value))
|
|
19
20
|
return undefined;
|
|
@@ -135,8 +136,8 @@ const ensureProxyEntrypoint = (cwd) => {
|
|
|
135
136
|
}
|
|
136
137
|
mkdirSync(join(cwd, 'src/proxy/d1'), { recursive: true });
|
|
137
138
|
writeFileSync(entryFilePath, [
|
|
138
|
-
|
|
139
|
-
|
|
139
|
+
`export { ZintrustD1Proxy } from '${CORE_PROXY_MODULE}';`,
|
|
140
|
+
`export { ZintrustD1Proxy as default } from '${CORE_PROXY_MODULE}';`,
|
|
140
141
|
'',
|
|
141
142
|
].join('\n'), 'utf-8');
|
|
142
143
|
return { created: true, entryFilePath };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KvProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/KvProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"KvProxyCommand.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/KvProxyCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA0OrE,eAAO,MAAM,cAAc;cACf,YAAY;EAwCtB,CAAC;AAEH,eAAe,cAAc,CAAC"}
|
|
@@ -12,6 +12,7 @@ const DEFAULT_COMPATIBILITY_DATE = '2026-03-12';
|
|
|
12
12
|
const DEFAULT_BINDING = 'ZIN_KV';
|
|
13
13
|
const DEFAULT_NAMESPACE_ID = '<your-kv-namespace-id>';
|
|
14
14
|
const DEFAULT_ENTRY_FILE = 'src/proxy/kv/ZintrustKvProxy.ts';
|
|
15
|
+
const CORE_PROXY_MODULE = ['@zintrust', 'core', 'proxy'].join('/');
|
|
15
16
|
const trimOption = (value) => {
|
|
16
17
|
if (!isNonEmptyString(value))
|
|
17
18
|
return undefined;
|
|
@@ -124,8 +125,8 @@ const ensureProxyEntrypoint = (cwd) => {
|
|
|
124
125
|
}
|
|
125
126
|
mkdirSync(join(cwd, 'src/proxy/kv'), { recursive: true });
|
|
126
127
|
writeFileSync(entryFilePath, [
|
|
127
|
-
|
|
128
|
-
|
|
128
|
+
`export { ZintrustKvProxy } from '${CORE_PROXY_MODULE}';`,
|
|
129
|
+
`export { ZintrustKvProxy as default } from '${CORE_PROXY_MODULE}';`,
|
|
129
130
|
'',
|
|
130
131
|
].join('\n'), 'utf-8');
|
|
131
132
|
return { created: true, entryFilePath };
|
package/src/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @zintrust/core v0.4.
|
|
2
|
+
* @zintrust/core v0.4.31
|
|
3
3
|
*
|
|
4
4
|
* ZinTrust Framework - Production-Grade TypeScript Backend
|
|
5
5
|
* Built for performance, type safety, and exceptional developer experience
|
|
6
6
|
*
|
|
7
7
|
* Build Information:
|
|
8
|
-
* Built: 2026-03-29T12:
|
|
8
|
+
* Built: 2026-03-29T12:34:52.815Z
|
|
9
9
|
* Node: >=20.0.0
|
|
10
10
|
* License: MIT
|
|
11
11
|
*
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
* Available at runtime for debugging and health checks
|
|
22
22
|
*/
|
|
23
23
|
export const ZINTRUST_VERSION = '0.1.41';
|
|
24
|
-
export const ZINTRUST_BUILD_DATE = '2026-03-29T12:
|
|
24
|
+
export const ZINTRUST_BUILD_DATE = '2026-03-29T12:34:52.781Z'; // Replaced during build
|
|
25
25
|
export { Application } from './boot/Application.js';
|
|
26
26
|
export { AwsSigV4 } from './common/index.js';
|
|
27
27
|
export { SignedRequest } from './security/SignedRequest.js';
|
|
@@ -1,3 +1,48 @@
|
|
|
1
|
-
|
|
1
|
+
type KvGetType = 'text' | 'json' | 'arrayBuffer';
|
|
2
|
+
type KVNamespacePutOptions = {
|
|
3
|
+
expirationTtl?: number;
|
|
4
|
+
};
|
|
5
|
+
type KVNamespace = {
|
|
6
|
+
get: {
|
|
7
|
+
(key: string): Promise<string | null>;
|
|
8
|
+
(key: string, type: 'json'): Promise<Record<string, unknown> | null>;
|
|
9
|
+
(key: string, type: 'arrayBuffer'): Promise<ArrayBuffer | null>;
|
|
10
|
+
(key: string, type: KvGetType): Promise<Record<string, unknown> | ArrayBuffer | string | null>;
|
|
11
|
+
};
|
|
12
|
+
put: (key: string, value: string, options?: KVNamespacePutOptions) => Promise<void>;
|
|
13
|
+
};
|
|
14
|
+
type D1AllResult<T> = {
|
|
15
|
+
results?: T[];
|
|
16
|
+
};
|
|
17
|
+
type D1RunResult = {
|
|
18
|
+
meta?: unknown;
|
|
19
|
+
};
|
|
20
|
+
type D1PreparedStatement = {
|
|
21
|
+
bind: (...values: unknown[]) => D1PreparedStatement;
|
|
22
|
+
all: <T = unknown>() => Promise<D1AllResult<T>>;
|
|
23
|
+
first: <T = unknown>() => Promise<T | null>;
|
|
24
|
+
run: () => Promise<D1RunResult>;
|
|
25
|
+
};
|
|
26
|
+
type D1Database = {
|
|
27
|
+
prepare: (sql: string) => D1PreparedStatement;
|
|
28
|
+
};
|
|
29
|
+
type D1Env = {
|
|
30
|
+
DB?: D1Database;
|
|
31
|
+
D1_BINDING?: string;
|
|
32
|
+
APP_KEY?: string;
|
|
33
|
+
D1_REMOTE_SECRET?: string;
|
|
34
|
+
ZT_PROXY_SIGNING_WINDOW_MS?: string;
|
|
35
|
+
ZT_NONCES?: KVNamespace;
|
|
36
|
+
ZT_PROXY_DEBUG?: string;
|
|
37
|
+
ZT_MAX_BODY_BYTES?: string;
|
|
38
|
+
ZT_MAX_SQL_BYTES?: string;
|
|
39
|
+
ZT_MAX_PARAMS?: string;
|
|
40
|
+
ZT_D1_STATEMENTS_JSON?: string;
|
|
41
|
+
};
|
|
42
|
+
export declare const ZintrustD1Proxy: Readonly<{
|
|
43
|
+
_ZINTRUST_CLOUDFLARE_D1_PROXY_VERSION: "0.1.15";
|
|
44
|
+
_ZINTRUST_CLOUDFLARE_D1_PROXY_BUILD_DATE: "__BUILD_DATE__";
|
|
45
|
+
fetch(request: Request, env: D1Env): Promise<Response>;
|
|
46
|
+
}>;
|
|
2
47
|
export default ZintrustD1Proxy;
|
|
3
48
|
//# sourceMappingURL=ZintrustD1Proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZintrustD1Proxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/d1/ZintrustD1Proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ZintrustD1Proxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/d1/ZintrustD1Proxy.ts"],"names":[],"mappings":"AAMA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAChE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;KAChG,CAAC;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;CACf,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,KAAK,mBAAmB,CAAC;IACpD,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,CAAC,CAAC,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,GAAG,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,mBAAmB,CAAC;CAC/C,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAkZF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}
|
|
@@ -1,39 +1,364 @@
|
|
|
1
|
-
import { isUndefinedOrNull } from '../../helper/index.js';
|
|
2
1
|
import { Logger } from '../../config/logger.js';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
import { isArray, isObject, isString } from '../../helper/index.js';
|
|
3
|
+
import { ErrorHandler } from '../ErrorHandler.js';
|
|
4
|
+
import { RequestValidator } from '../RequestValidator.js';
|
|
5
|
+
import { SigningService } from '../SigningService.js';
|
|
6
|
+
const DEFAULT_SIGNING_WINDOW_MS = 60_000;
|
|
7
|
+
const DEFAULT_MAX_BODY_BYTES = 128 * 1024;
|
|
8
|
+
const DEFAULT_MAX_SQL_BYTES = 32 * 1024;
|
|
9
|
+
const DEFAULT_MAX_PARAMS = 256;
|
|
10
|
+
const json = (status, body) => new Response(JSON.stringify(body), {
|
|
11
|
+
status,
|
|
12
|
+
headers: {
|
|
13
|
+
'Content-Type': 'application/json; charset=utf-8',
|
|
14
|
+
'Cache-Control': 'no-store',
|
|
15
|
+
},
|
|
16
|
+
});
|
|
17
|
+
const toErrorResponse = (status, code, message) => {
|
|
18
|
+
const error = ErrorHandler.toProxyError(status, code, message);
|
|
19
|
+
return json(error.status, error.body);
|
|
20
|
+
};
|
|
21
|
+
const getEnvInt = (env, name, fallback) => {
|
|
22
|
+
const raw = env[name];
|
|
23
|
+
if (!isString(raw))
|
|
24
|
+
return fallback;
|
|
25
|
+
const parsed = Number.parseInt(raw, 10);
|
|
26
|
+
return Number.isFinite(parsed) ? parsed : fallback;
|
|
27
|
+
};
|
|
28
|
+
const isDebugEnabled = (env) => {
|
|
29
|
+
const raw = env.ZT_PROXY_DEBUG;
|
|
30
|
+
if (!isString(raw))
|
|
31
|
+
return false;
|
|
32
|
+
const normalized = raw.trim().toLowerCase();
|
|
33
|
+
return normalized === 'true' || normalized === '1' || normalized === 'yes';
|
|
34
|
+
};
|
|
35
|
+
const safeErrorMessage = (error) => {
|
|
36
|
+
if (error instanceof Error)
|
|
37
|
+
return error.message;
|
|
38
|
+
if (isString(error))
|
|
39
|
+
return error;
|
|
40
|
+
try {
|
|
41
|
+
return JSON.stringify(error);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
return 'Unknown D1 error';
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
const logProxyError = (env, context, error) => {
|
|
48
|
+
if (!isDebugEnabled(env))
|
|
49
|
+
return;
|
|
50
|
+
Logger.error('[ZintrustD1Proxy] error', {
|
|
51
|
+
...context,
|
|
52
|
+
message: safeErrorMessage(error).slice(0, 800),
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
const normalizeBindingName = (value) => {
|
|
56
|
+
if (!isString(value))
|
|
57
|
+
return null;
|
|
58
|
+
const trimmed = value.trim();
|
|
59
|
+
return trimmed === '' ? null : trimmed;
|
|
60
|
+
};
|
|
61
|
+
const resolveD1Binding = (env) => {
|
|
62
|
+
const candidates = ['DB', 'zintrust_db', normalizeBindingName(env.D1_BINDING)].filter((value, index, values) => isString(value) && value.trim() !== '' && values.indexOf(value) === index);
|
|
63
|
+
const record = env;
|
|
64
|
+
for (const name of candidates) {
|
|
65
|
+
const binding = record[name];
|
|
66
|
+
if (binding !== undefined && binding !== null && typeof binding.prepare === 'function') {
|
|
67
|
+
return binding;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return null;
|
|
71
|
+
};
|
|
72
|
+
const readBodyBytes = async (request, maxBytes) => {
|
|
73
|
+
const buf = await request.arrayBuffer();
|
|
74
|
+
if (buf.byteLength > maxBytes) {
|
|
75
|
+
return {
|
|
76
|
+
ok: false,
|
|
77
|
+
response: toErrorResponse(413, 'PAYLOAD_TOO_LARGE', 'Body too large'),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
const bytes = new Uint8Array(buf);
|
|
81
|
+
const text = new TextDecoder().decode(bytes);
|
|
82
|
+
return { ok: true, bytes, text };
|
|
83
|
+
};
|
|
84
|
+
const parseOptionalJson = (text) => {
|
|
85
|
+
if (text.trim() === '')
|
|
86
|
+
return { ok: true, payload: null };
|
|
87
|
+
const parsed = RequestValidator.parseJson(text);
|
|
88
|
+
if (!parsed.ok) {
|
|
89
|
+
let message = parsed.error.message;
|
|
90
|
+
if (parsed.error.code === 'INVALID_JSON') {
|
|
91
|
+
message = 'Invalid JSON body';
|
|
92
|
+
}
|
|
93
|
+
else if (parsed.error.code === 'VALIDATION_ERROR') {
|
|
94
|
+
message = 'Invalid body';
|
|
95
|
+
}
|
|
96
|
+
return { ok: false, response: toErrorResponse(400, parsed.error.code, message) };
|
|
97
|
+
}
|
|
98
|
+
return { ok: true, payload: parsed.value };
|
|
99
|
+
};
|
|
100
|
+
const loadSigningSecret = (env) => {
|
|
101
|
+
const direct = isString(env.D1_REMOTE_SECRET) ? env.D1_REMOTE_SECRET.trim() : '';
|
|
102
|
+
if (direct !== '')
|
|
103
|
+
return direct;
|
|
104
|
+
const fallback = isString(env.APP_KEY) ? env.APP_KEY.trim() : '';
|
|
105
|
+
if (fallback !== '')
|
|
106
|
+
return fallback;
|
|
107
|
+
return null;
|
|
108
|
+
};
|
|
109
|
+
const loadStatements = (env) => {
|
|
110
|
+
const raw = env.ZT_D1_STATEMENTS_JSON;
|
|
111
|
+
if (!isString(raw) || raw.trim() === '')
|
|
112
|
+
return null;
|
|
7
113
|
try {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return
|
|
114
|
+
const parsed = JSON.parse(raw);
|
|
115
|
+
if (!isObject(parsed))
|
|
116
|
+
return null;
|
|
117
|
+
return parsed;
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return null;
|
|
121
|
+
}
|
|
122
|
+
};
|
|
123
|
+
const isMutatingSql = (sql) => {
|
|
124
|
+
const normalized = sql.trimStart().toLowerCase();
|
|
125
|
+
return (normalized.startsWith('insert') ||
|
|
126
|
+
normalized.startsWith('update') ||
|
|
127
|
+
normalized.startsWith('delete') ||
|
|
128
|
+
normalized.startsWith('create') ||
|
|
129
|
+
normalized.startsWith('drop') ||
|
|
130
|
+
normalized.startsWith('alter') ||
|
|
131
|
+
normalized.startsWith('replace'));
|
|
132
|
+
};
|
|
133
|
+
const verifyNonceKv = async (kv, keyId, nonce, ttlMs) => {
|
|
134
|
+
const ttlSeconds = Math.max(1, Math.ceil(ttlMs / 1000));
|
|
135
|
+
const storageKey = `nonce:${keyId}:${nonce}`;
|
|
136
|
+
const existing = await kv.get(storageKey);
|
|
137
|
+
if (existing !== null)
|
|
138
|
+
return false;
|
|
139
|
+
await kv.put(storageKey, '1', { expirationTtl: ttlSeconds });
|
|
140
|
+
return true;
|
|
141
|
+
};
|
|
142
|
+
const verifySignedRequest = async (request, env, bodyBytes) => {
|
|
143
|
+
const secret = loadSigningSecret(env);
|
|
144
|
+
if (secret === null) {
|
|
145
|
+
return toErrorResponse(401, 'CONFIG_ERROR', 'Missing signing secret (D1_REMOTE_SECRET or APP_KEY)');
|
|
146
|
+
}
|
|
147
|
+
const windowMs = getEnvInt(env, 'ZT_PROXY_SIGNING_WINDOW_MS', DEFAULT_SIGNING_WINDOW_MS);
|
|
148
|
+
const verifyResult = await SigningService.verifyWithKeyProvider({
|
|
149
|
+
method: request.method,
|
|
150
|
+
url: request.url,
|
|
151
|
+
body: bodyBytes,
|
|
152
|
+
headers: request.headers,
|
|
153
|
+
windowMs,
|
|
154
|
+
getSecretForKeyId: (_keyId) => secret,
|
|
155
|
+
verifyNonce: env.ZT_NONCES === undefined
|
|
156
|
+
? undefined
|
|
157
|
+
: async (keyId, nonce, ttlMs) => verifyNonceKv(env.ZT_NONCES, keyId, nonce, ttlMs),
|
|
158
|
+
});
|
|
159
|
+
if (!verifyResult.ok) {
|
|
160
|
+
return toErrorResponse(verifyResult.status, verifyResult.code, verifyResult.message);
|
|
161
|
+
}
|
|
162
|
+
return { ok: true };
|
|
163
|
+
};
|
|
164
|
+
const requireDb = (env) => {
|
|
165
|
+
const db = resolveD1Binding(env);
|
|
166
|
+
if (db === null) {
|
|
167
|
+
return toErrorResponse(400, 'CONFIG_ERROR', 'Missing D1 binding (DB) or binding name via D1_BINDING');
|
|
168
|
+
}
|
|
169
|
+
return db;
|
|
170
|
+
};
|
|
171
|
+
const toD1ExceptionResponse = (error) => {
|
|
172
|
+
const message = safeErrorMessage(error);
|
|
173
|
+
return toErrorResponse(500, 'D1_ERROR', message);
|
|
174
|
+
};
|
|
175
|
+
const parseSqlPayload = (payload) => {
|
|
176
|
+
if (!isObject(payload)) {
|
|
177
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
178
|
+
}
|
|
179
|
+
const sql = payload['sql'];
|
|
180
|
+
const params = payload['params'];
|
|
181
|
+
if (!isString(sql)) {
|
|
182
|
+
return {
|
|
183
|
+
ok: false,
|
|
184
|
+
response: toErrorResponse(400, 'VALIDATION_ERROR', 'sql must be a string'),
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
return { ok: true, sql, params: isArray(params) ? params : [] };
|
|
188
|
+
};
|
|
189
|
+
const enforceSqlLimits = (env, sql, params) => {
|
|
190
|
+
const maxSqlBytes = getEnvInt(env, 'ZT_MAX_SQL_BYTES', DEFAULT_MAX_SQL_BYTES);
|
|
191
|
+
const maxParams = getEnvInt(env, 'ZT_MAX_PARAMS', DEFAULT_MAX_PARAMS);
|
|
192
|
+
if (new TextEncoder().encode(sql).byteLength > maxSqlBytes) {
|
|
193
|
+
return toErrorResponse(413, 'PAYLOAD_TOO_LARGE', 'SQL too large');
|
|
194
|
+
}
|
|
195
|
+
if (params.length > maxParams) {
|
|
196
|
+
return toErrorResponse(400, 'VALIDATION_ERROR', 'Too many params');
|
|
197
|
+
}
|
|
198
|
+
return null;
|
|
199
|
+
};
|
|
200
|
+
const readAndVerifyJson = async (request, env) => {
|
|
201
|
+
const maxBodyBytes = getEnvInt(env, 'ZT_MAX_BODY_BYTES', DEFAULT_MAX_BODY_BYTES);
|
|
202
|
+
const bodyResult = await readBodyBytes(request, maxBodyBytes);
|
|
203
|
+
if (!bodyResult.ok)
|
|
204
|
+
return { ok: false, response: bodyResult.response };
|
|
205
|
+
const auth = await verifySignedRequest(request, env, bodyResult.bytes);
|
|
206
|
+
if (auth instanceof Response)
|
|
207
|
+
return { ok: false, response: auth };
|
|
208
|
+
const parsed = parseOptionalJson(bodyResult.text);
|
|
209
|
+
if (!parsed.ok)
|
|
210
|
+
return { ok: false, response: parsed.response };
|
|
211
|
+
return { ok: true, payload: parsed.payload, bodyBytes: bodyResult.bytes };
|
|
212
|
+
};
|
|
213
|
+
const handleQuery = async (request, env) => {
|
|
214
|
+
try {
|
|
215
|
+
const check = await readAndVerifyJson(request, env);
|
|
216
|
+
if (!check.ok)
|
|
217
|
+
return check.response;
|
|
218
|
+
const db = requireDb(env);
|
|
219
|
+
if (db instanceof Response)
|
|
220
|
+
return db;
|
|
221
|
+
const parsed = parseSqlPayload(check.payload);
|
|
222
|
+
if (!parsed.ok)
|
|
223
|
+
return parsed.response;
|
|
224
|
+
const limit = enforceSqlLimits(env, parsed.sql, parsed.params);
|
|
225
|
+
if (limit !== null)
|
|
226
|
+
return limit;
|
|
227
|
+
const result = await db
|
|
228
|
+
.prepare(parsed.sql)
|
|
229
|
+
.bind(...parsed.params)
|
|
230
|
+
.all();
|
|
231
|
+
const rows = result.results ?? [];
|
|
232
|
+
return json(200, { rows, rowCount: rows.length });
|
|
12
233
|
}
|
|
13
234
|
catch (error) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
};
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (
|
|
22
|
-
return
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
235
|
+
logProxyError(env, { op: 'query', path: '/zin/d1/query' }, error);
|
|
236
|
+
return toD1ExceptionResponse(error);
|
|
237
|
+
}
|
|
238
|
+
};
|
|
239
|
+
const handleQueryOne = async (request, env) => {
|
|
240
|
+
try {
|
|
241
|
+
const check = await readAndVerifyJson(request, env);
|
|
242
|
+
if (!check.ok)
|
|
243
|
+
return check.response;
|
|
244
|
+
const db = requireDb(env);
|
|
245
|
+
if (db instanceof Response)
|
|
246
|
+
return db;
|
|
247
|
+
const parsed = parseSqlPayload(check.payload);
|
|
248
|
+
if (!parsed.ok)
|
|
249
|
+
return parsed.response;
|
|
250
|
+
const limit = enforceSqlLimits(env, parsed.sql, parsed.params);
|
|
251
|
+
if (limit !== null)
|
|
252
|
+
return limit;
|
|
253
|
+
const row = await db
|
|
254
|
+
.prepare(parsed.sql)
|
|
255
|
+
.bind(...parsed.params)
|
|
256
|
+
.first();
|
|
257
|
+
return json(200, { row: row ?? null });
|
|
258
|
+
}
|
|
259
|
+
catch (error) {
|
|
260
|
+
logProxyError(env, { op: 'queryOne', path: '/zin/d1/queryOne' }, error);
|
|
261
|
+
return toD1ExceptionResponse(error);
|
|
262
|
+
}
|
|
263
|
+
};
|
|
264
|
+
const handleExec = async (request, env) => {
|
|
265
|
+
try {
|
|
266
|
+
const check = await readAndVerifyJson(request, env);
|
|
267
|
+
if (!check.ok)
|
|
268
|
+
return check.response;
|
|
269
|
+
const db = requireDb(env);
|
|
270
|
+
if (db instanceof Response)
|
|
271
|
+
return db;
|
|
272
|
+
const parsed = parseSqlPayload(check.payload);
|
|
273
|
+
if (!parsed.ok)
|
|
274
|
+
return parsed.response;
|
|
275
|
+
const limit = enforceSqlLimits(env, parsed.sql, parsed.params);
|
|
276
|
+
if (limit !== null)
|
|
277
|
+
return limit;
|
|
278
|
+
const out = await db
|
|
279
|
+
.prepare(parsed.sql)
|
|
280
|
+
.bind(...parsed.params)
|
|
281
|
+
.run();
|
|
282
|
+
return json(200, { ok: true, meta: out.meta });
|
|
283
|
+
}
|
|
284
|
+
catch (error) {
|
|
285
|
+
logProxyError(env, { op: 'exec', path: '/zin/d1/exec' }, error);
|
|
286
|
+
return toD1ExceptionResponse(error);
|
|
287
|
+
}
|
|
288
|
+
};
|
|
289
|
+
const parseStatementPayload = (payload) => {
|
|
290
|
+
if (!isObject(payload)) {
|
|
291
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
292
|
+
}
|
|
293
|
+
const statementId = payload['statementId'];
|
|
294
|
+
const params = payload['params'];
|
|
295
|
+
if (!isString(statementId) || statementId.trim() === '') {
|
|
296
|
+
return {
|
|
297
|
+
ok: false,
|
|
298
|
+
response: toErrorResponse(400, 'VALIDATION_ERROR', 'statementId must be a string'),
|
|
36
299
|
};
|
|
300
|
+
}
|
|
301
|
+
return { ok: true, statementId, params: isArray(params) ? params : [] };
|
|
302
|
+
};
|
|
303
|
+
const handleStatement = async (request, env) => {
|
|
304
|
+
try {
|
|
305
|
+
const check = await readAndVerifyJson(request, env);
|
|
306
|
+
if (!check.ok)
|
|
307
|
+
return check.response;
|
|
308
|
+
const db = requireDb(env);
|
|
309
|
+
if (db instanceof Response)
|
|
310
|
+
return db;
|
|
311
|
+
const statements = loadStatements(env);
|
|
312
|
+
if (statements === null) {
|
|
313
|
+
return toErrorResponse(400, 'CONFIG_ERROR', 'Missing or invalid ZT_D1_STATEMENTS_JSON');
|
|
314
|
+
}
|
|
315
|
+
const parsed = parseStatementPayload(check.payload);
|
|
316
|
+
if (!parsed.ok)
|
|
317
|
+
return parsed.response;
|
|
318
|
+
const sql = statements[parsed.statementId];
|
|
319
|
+
if (!isString(sql) || sql.trim() === '') {
|
|
320
|
+
return toErrorResponse(404, 'NOT_FOUND', 'Unknown statementId');
|
|
321
|
+
}
|
|
322
|
+
if (isMutatingSql(sql)) {
|
|
323
|
+
const out = await db
|
|
324
|
+
.prepare(sql)
|
|
325
|
+
.bind(...parsed.params)
|
|
326
|
+
.run();
|
|
327
|
+
return json(200, { ok: true, meta: out.meta });
|
|
328
|
+
}
|
|
329
|
+
const out = await db
|
|
330
|
+
.prepare(sql)
|
|
331
|
+
.bind(...parsed.params)
|
|
332
|
+
.all();
|
|
333
|
+
const rows = out.results ?? [];
|
|
334
|
+
return json(200, { rows, rowCount: rows.length });
|
|
335
|
+
}
|
|
336
|
+
catch (error) {
|
|
337
|
+
logProxyError(env, { op: 'statement', path: '/zin/d1/statement' }, error);
|
|
338
|
+
return toD1ExceptionResponse(error);
|
|
339
|
+
}
|
|
340
|
+
};
|
|
341
|
+
export const ZintrustD1Proxy = Object.freeze({
|
|
342
|
+
_ZINTRUST_CLOUDFLARE_D1_PROXY_VERSION: '0.1.15',
|
|
343
|
+
_ZINTRUST_CLOUDFLARE_D1_PROXY_BUILD_DATE: '__BUILD_DATE__',
|
|
344
|
+
async fetch(request, env) {
|
|
345
|
+
const url = new URL(request.url);
|
|
346
|
+
const methodError = RequestValidator.requirePost(request.method);
|
|
347
|
+
if (methodError !== null) {
|
|
348
|
+
return toErrorResponse(405, methodError.code, 'Method not allowed');
|
|
349
|
+
}
|
|
350
|
+
switch (url.pathname) {
|
|
351
|
+
case '/zin/d1/query':
|
|
352
|
+
return handleQuery(request, env);
|
|
353
|
+
case '/zin/d1/queryOne':
|
|
354
|
+
return handleQueryOne(request, env);
|
|
355
|
+
case '/zin/d1/exec':
|
|
356
|
+
return handleExec(request, env);
|
|
357
|
+
case '/zin/d1/statement':
|
|
358
|
+
return handleStatement(request, env);
|
|
359
|
+
default:
|
|
360
|
+
return toErrorResponse(404, 'NOT_FOUND', 'Not found');
|
|
361
|
+
}
|
|
37
362
|
},
|
|
38
363
|
});
|
|
39
364
|
export default ZintrustD1Proxy;
|
|
@@ -1,3 +1,44 @@
|
|
|
1
|
-
|
|
1
|
+
type KVNamespacePutOptions = {
|
|
2
|
+
expirationTtl?: number;
|
|
3
|
+
};
|
|
4
|
+
type KvGetType = 'text' | 'json' | 'arrayBuffer';
|
|
5
|
+
type KVListResult = {
|
|
6
|
+
keys: Array<{
|
|
7
|
+
name: string;
|
|
8
|
+
}>;
|
|
9
|
+
cursor: string;
|
|
10
|
+
list_complete: boolean;
|
|
11
|
+
};
|
|
12
|
+
type KVNamespace = {
|
|
13
|
+
get: {
|
|
14
|
+
(key: string): Promise<string | null>;
|
|
15
|
+
(key: string, type: 'json'): Promise<Record<string, unknown> | null>;
|
|
16
|
+
(key: string, type: 'arrayBuffer'): Promise<ArrayBuffer | null>;
|
|
17
|
+
(key: string, type: KvGetType): Promise<Record<string, unknown> | ArrayBuffer | string | null>;
|
|
18
|
+
};
|
|
19
|
+
put: (key: string, value: string, options?: KVNamespacePutOptions) => Promise<void>;
|
|
20
|
+
delete: (key: string) => Promise<void>;
|
|
21
|
+
list: (options: {
|
|
22
|
+
prefix?: string;
|
|
23
|
+
limit?: number;
|
|
24
|
+
cursor?: string;
|
|
25
|
+
}) => Promise<KVListResult>;
|
|
26
|
+
};
|
|
27
|
+
type KvEnv = {
|
|
28
|
+
CACHE?: KVNamespace;
|
|
29
|
+
KV_NAMESPACE?: string;
|
|
30
|
+
APP_KEY?: string;
|
|
31
|
+
KV_REMOTE_SECRET?: string;
|
|
32
|
+
ZT_PROXY_SIGNING_WINDOW_MS?: string;
|
|
33
|
+
ZT_NONCES?: KVNamespace;
|
|
34
|
+
ZT_MAX_BODY_BYTES?: string;
|
|
35
|
+
ZT_KV_PREFIX?: string;
|
|
36
|
+
ZT_KV_LIST_LIMIT?: string;
|
|
37
|
+
};
|
|
38
|
+
export declare const ZintrustKvProxy: Readonly<{
|
|
39
|
+
_ZINTRUST_CLOUDFLARE_KV_PROXY_VERSION: "0.1.15";
|
|
40
|
+
_ZINTRUST_CLOUDFLARE_KV_PROXY_BUILD_DATE: "__BUILD_DATE__";
|
|
41
|
+
fetch(request: Request, env: KvEnv): Promise<Response>;
|
|
42
|
+
}>;
|
|
2
43
|
export default ZintrustKvProxy;
|
|
3
44
|
//# sourceMappingURL=ZintrustKvProxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZintrustKvProxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/kv/ZintrustKvProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ZintrustKvProxy.d.ts","sourceRoot":"","sources":["../../../../src/proxy/kv/ZintrustKvProxy.ts"],"names":[],"mappings":"AAKA,KAAK,qBAAqB,GAAG;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,aAAa,CAAC;AAEjD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE;QACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAChE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;KAChG,CAAC;IACF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;CAChG,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA0WF,eAAO,MAAM,eAAe;;;mBAGL,OAAO,OAAO,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;EAqB5D,CAAC;AAEH,eAAe,eAAe,CAAC"}
|
|
@@ -1,38 +1,301 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
1
|
+
import { isObject, isString } from '../../helper/index.js';
|
|
2
|
+
import { ErrorHandler } from '../ErrorHandler.js';
|
|
3
|
+
import { RequestValidator } from '../RequestValidator.js';
|
|
4
|
+
import { SigningService } from '../SigningService.js';
|
|
5
|
+
const DEFAULT_SIGNING_WINDOW_MS = 60_000;
|
|
6
|
+
const DEFAULT_MAX_BODY_BYTES = 128 * 1024;
|
|
7
|
+
const DEFAULT_LIST_LIMIT = 100;
|
|
8
|
+
const json = (status, body) => {
|
|
9
|
+
return new Response(JSON.stringify(body), {
|
|
10
|
+
status,
|
|
11
|
+
headers: {
|
|
12
|
+
'Content-Type': 'application/json; charset=utf-8',
|
|
13
|
+
'Cache-Control': 'no-store',
|
|
14
|
+
},
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
const toErrorResponse = (status, code, message) => {
|
|
18
|
+
const error = ErrorHandler.toProxyError(status, code, message);
|
|
19
|
+
return json(error.status, error.body);
|
|
20
|
+
};
|
|
21
|
+
const getEnvInt = (env, name, fallback) => {
|
|
22
|
+
const raw = env[name];
|
|
23
|
+
if (!isString(raw))
|
|
24
|
+
return fallback;
|
|
25
|
+
const parsed = Number.parseInt(raw, 10);
|
|
26
|
+
return Number.isFinite(parsed) ? parsed : fallback;
|
|
27
|
+
};
|
|
28
|
+
const normalizeBindingName = (value) => {
|
|
29
|
+
if (!isString(value))
|
|
30
|
+
return null;
|
|
31
|
+
const trimmed = value.trim();
|
|
32
|
+
return trimmed === '' ? null : trimmed;
|
|
33
|
+
};
|
|
34
|
+
const readBodyBytes = async (request, maxBytes) => {
|
|
35
|
+
const buf = await request.arrayBuffer();
|
|
36
|
+
if (buf.byteLength > maxBytes) {
|
|
37
|
+
return {
|
|
38
|
+
ok: false,
|
|
39
|
+
response: toErrorResponse(413, 'PAYLOAD_TOO_LARGE', 'Body too large'),
|
|
35
40
|
};
|
|
41
|
+
}
|
|
42
|
+
const bytes = new Uint8Array(buf);
|
|
43
|
+
const text = new TextDecoder().decode(bytes);
|
|
44
|
+
return { ok: true, bytes, text };
|
|
45
|
+
};
|
|
46
|
+
const parseOptionalJson = (text) => {
|
|
47
|
+
if (text.trim() === '')
|
|
48
|
+
return { ok: true, payload: null };
|
|
49
|
+
const parsed = RequestValidator.parseJson(text);
|
|
50
|
+
if (!parsed.ok) {
|
|
51
|
+
let message = parsed.error.message;
|
|
52
|
+
if (parsed.error.code === 'INVALID_JSON') {
|
|
53
|
+
message = 'Invalid JSON body';
|
|
54
|
+
}
|
|
55
|
+
else if (parsed.error.code === 'VALIDATION_ERROR') {
|
|
56
|
+
message = 'Invalid body';
|
|
57
|
+
}
|
|
58
|
+
return { ok: false, response: toErrorResponse(400, parsed.error.code, message) };
|
|
59
|
+
}
|
|
60
|
+
return { ok: true, payload: parsed.value };
|
|
61
|
+
};
|
|
62
|
+
const loadSigningSecret = (env) => {
|
|
63
|
+
const direct = isString(env.KV_REMOTE_SECRET) ? env.KV_REMOTE_SECRET.trim() : '';
|
|
64
|
+
if (direct !== '')
|
|
65
|
+
return direct;
|
|
66
|
+
const fallback = isString(env.APP_KEY) ? env.APP_KEY.trim() : '';
|
|
67
|
+
if (fallback !== '')
|
|
68
|
+
return fallback;
|
|
69
|
+
return null;
|
|
70
|
+
};
|
|
71
|
+
const verifyNonceKv = async (kv, keyId, nonce, ttlMs) => {
|
|
72
|
+
const ttlSeconds = Math.max(1, Math.ceil(ttlMs / 1000));
|
|
73
|
+
const storageKey = `nonce:${keyId}:${nonce}`;
|
|
74
|
+
const existing = await kv.get(storageKey);
|
|
75
|
+
if (existing !== null)
|
|
76
|
+
return false;
|
|
77
|
+
await kv.put(storageKey, '1', { expirationTtl: ttlSeconds });
|
|
78
|
+
return true;
|
|
79
|
+
};
|
|
80
|
+
const verifySignedRequest = async (request, env, bodyBytes) => {
|
|
81
|
+
const secret = loadSigningSecret(env);
|
|
82
|
+
if (secret === null) {
|
|
83
|
+
return toErrorResponse(500, 'CONFIG_ERROR', 'Missing signing secret (KV_REMOTE_SECRET or APP_KEY)');
|
|
84
|
+
}
|
|
85
|
+
const windowMs = getEnvInt(env, 'ZT_PROXY_SIGNING_WINDOW_MS', DEFAULT_SIGNING_WINDOW_MS);
|
|
86
|
+
const verifyResult = await SigningService.verifyWithKeyProvider({
|
|
87
|
+
method: request.method,
|
|
88
|
+
url: request.url,
|
|
89
|
+
body: bodyBytes,
|
|
90
|
+
headers: request.headers,
|
|
91
|
+
windowMs,
|
|
92
|
+
getSecretForKeyId: async (_keyId) => secret,
|
|
93
|
+
verifyNonce: env.ZT_NONCES === undefined
|
|
94
|
+
? undefined
|
|
95
|
+
: async (keyId, nonce, ttlMs) => verifyNonceKv(env.ZT_NONCES, keyId, nonce, ttlMs),
|
|
96
|
+
});
|
|
97
|
+
if (!verifyResult.ok) {
|
|
98
|
+
return toErrorResponse(verifyResult.status, verifyResult.code, verifyResult.message);
|
|
99
|
+
}
|
|
100
|
+
return { ok: true };
|
|
101
|
+
};
|
|
102
|
+
const requireCache = (env) => {
|
|
103
|
+
if (env.CACHE !== undefined && env.CACHE !== null)
|
|
104
|
+
return env.CACHE;
|
|
105
|
+
const bindingName = normalizeBindingName(env.KV_NAMESPACE);
|
|
106
|
+
if (bindingName !== null) {
|
|
107
|
+
const record = env;
|
|
108
|
+
const kv = record[bindingName];
|
|
109
|
+
if (kv !== undefined && kv !== null)
|
|
110
|
+
return kv;
|
|
111
|
+
}
|
|
112
|
+
return toErrorResponse(500, 'CONFIG_ERROR', 'Missing KV binding (CACHE)');
|
|
113
|
+
};
|
|
114
|
+
const normalizeNamespace = (value) => {
|
|
115
|
+
if (!isString(value))
|
|
116
|
+
return undefined;
|
|
117
|
+
const trimmed = value.trim();
|
|
118
|
+
return trimmed === '' ? undefined : trimmed;
|
|
119
|
+
};
|
|
120
|
+
const buildStorageKey = (env, params) => {
|
|
121
|
+
const prefix = isString(env.ZT_KV_PREFIX) ? env.ZT_KV_PREFIX : '';
|
|
122
|
+
const namespace = normalizeNamespace(params.namespace);
|
|
123
|
+
const parts = [];
|
|
124
|
+
if (prefix.trim() !== '')
|
|
125
|
+
parts.push(prefix.trim());
|
|
126
|
+
if (namespace !== undefined)
|
|
127
|
+
parts.push(namespace);
|
|
128
|
+
parts.push(params.key);
|
|
129
|
+
return parts.join(':');
|
|
130
|
+
};
|
|
131
|
+
const readAndVerifyJson = async (request, env) => {
|
|
132
|
+
const maxBodyBytes = getEnvInt(env, 'ZT_MAX_BODY_BYTES', DEFAULT_MAX_BODY_BYTES);
|
|
133
|
+
const bodyResult = await readBodyBytes(request, maxBodyBytes);
|
|
134
|
+
if (!bodyResult.ok)
|
|
135
|
+
return { ok: false, response: bodyResult.response };
|
|
136
|
+
const auth = await verifySignedRequest(request, env, bodyResult.bytes);
|
|
137
|
+
if (auth instanceof Response)
|
|
138
|
+
return { ok: false, response: auth };
|
|
139
|
+
const parsed = parseOptionalJson(bodyResult.text);
|
|
140
|
+
if (!parsed.ok)
|
|
141
|
+
return { ok: false, response: parsed.response };
|
|
142
|
+
return { ok: true, payload: parsed.payload, bodyBytes: bodyResult.bytes };
|
|
143
|
+
};
|
|
144
|
+
const parseGetPayload = (payload) => {
|
|
145
|
+
if (!isObject(payload)) {
|
|
146
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
147
|
+
}
|
|
148
|
+
const key = payload['key'];
|
|
149
|
+
const type = payload['type'];
|
|
150
|
+
if (!isString(key) || key.trim() === '') {
|
|
151
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'key is required') };
|
|
152
|
+
}
|
|
153
|
+
const typeValue = type === 'text' || type === 'arrayBuffer' || type === 'json' ? type : 'text';
|
|
154
|
+
return { ok: true, namespace: normalizeNamespace(payload['namespace']), key, type: typeValue };
|
|
155
|
+
};
|
|
156
|
+
const handleGet = async (request, env) => {
|
|
157
|
+
const check = await readAndVerifyJson(request, env);
|
|
158
|
+
if (!check.ok)
|
|
159
|
+
return check.response;
|
|
160
|
+
const cache = requireCache(env);
|
|
161
|
+
if (cache instanceof Response)
|
|
162
|
+
return cache;
|
|
163
|
+
const parsed = parseGetPayload(check.payload);
|
|
164
|
+
if (!parsed.ok)
|
|
165
|
+
return parsed.response;
|
|
166
|
+
const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
|
|
167
|
+
if (parsed.type === 'json') {
|
|
168
|
+
const value = await cache.get(storageKey, 'json');
|
|
169
|
+
return json(200, { value: value ?? null });
|
|
170
|
+
}
|
|
171
|
+
if (parsed.type === 'arrayBuffer') {
|
|
172
|
+
const value = await cache.get(storageKey, 'arrayBuffer');
|
|
173
|
+
return json(200, { value: value ?? null });
|
|
174
|
+
}
|
|
175
|
+
const value = await cache.get(storageKey);
|
|
176
|
+
return json(200, { value: value ?? null });
|
|
177
|
+
};
|
|
178
|
+
const parsePutPayload = (payload) => {
|
|
179
|
+
if (!isObject(payload)) {
|
|
180
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
181
|
+
}
|
|
182
|
+
const key = payload['key'];
|
|
183
|
+
if (!isString(key) || key.trim() === '') {
|
|
184
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'key is required') };
|
|
185
|
+
}
|
|
186
|
+
const ttlSeconds = payload['ttlSeconds'];
|
|
187
|
+
const ttl = typeof ttlSeconds === 'number' && Number.isFinite(ttlSeconds) && ttlSeconds > 0
|
|
188
|
+
? ttlSeconds
|
|
189
|
+
: undefined;
|
|
190
|
+
return {
|
|
191
|
+
ok: true,
|
|
192
|
+
namespace: normalizeNamespace(payload['namespace']),
|
|
193
|
+
key,
|
|
194
|
+
value: payload['value'],
|
|
195
|
+
ttlSeconds: ttl,
|
|
196
|
+
};
|
|
197
|
+
};
|
|
198
|
+
const handlePut = async (request, env) => {
|
|
199
|
+
const check = await readAndVerifyJson(request, env);
|
|
200
|
+
if (!check.ok)
|
|
201
|
+
return check.response;
|
|
202
|
+
const cache = requireCache(env);
|
|
203
|
+
if (cache instanceof Response)
|
|
204
|
+
return cache;
|
|
205
|
+
const parsed = parsePutPayload(check.payload);
|
|
206
|
+
if (!parsed.ok)
|
|
207
|
+
return parsed.response;
|
|
208
|
+
const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
|
|
209
|
+
const value = JSON.stringify(parsed.value);
|
|
210
|
+
const options = {};
|
|
211
|
+
if (parsed.ttlSeconds !== undefined) {
|
|
212
|
+
options.expirationTtl = Math.floor(parsed.ttlSeconds);
|
|
213
|
+
}
|
|
214
|
+
await cache.put(storageKey, value, options);
|
|
215
|
+
return json(200, { ok: true });
|
|
216
|
+
};
|
|
217
|
+
const parseDeletePayload = (payload) => {
|
|
218
|
+
if (!isObject(payload)) {
|
|
219
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
220
|
+
}
|
|
221
|
+
const key = payload['key'];
|
|
222
|
+
if (!isString(key) || key.trim() === '') {
|
|
223
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'key is required') };
|
|
224
|
+
}
|
|
225
|
+
return { ok: true, namespace: normalizeNamespace(payload['namespace']), key };
|
|
226
|
+
};
|
|
227
|
+
const handleDelete = async (request, env) => {
|
|
228
|
+
const check = await readAndVerifyJson(request, env);
|
|
229
|
+
if (!check.ok)
|
|
230
|
+
return check.response;
|
|
231
|
+
const cache = requireCache(env);
|
|
232
|
+
if (cache instanceof Response)
|
|
233
|
+
return cache;
|
|
234
|
+
const parsed = parseDeletePayload(check.payload);
|
|
235
|
+
if (!parsed.ok)
|
|
236
|
+
return parsed.response;
|
|
237
|
+
const storageKey = buildStorageKey(env, { namespace: parsed.namespace, key: parsed.key });
|
|
238
|
+
await cache.delete(storageKey);
|
|
239
|
+
return json(200, { ok: true });
|
|
240
|
+
};
|
|
241
|
+
const parseListPayload = (payload) => {
|
|
242
|
+
if (payload === null)
|
|
243
|
+
return { ok: true, params: {} };
|
|
244
|
+
if (!isObject(payload)) {
|
|
245
|
+
return { ok: false, response: toErrorResponse(400, 'VALIDATION_ERROR', 'Invalid body') };
|
|
246
|
+
}
|
|
247
|
+
const namespace = normalizeNamespace(payload['namespace']);
|
|
248
|
+
const prefix = isString(payload['prefix']) ? payload['prefix'] : undefined;
|
|
249
|
+
const cursor = isString(payload['cursor']) ? payload['cursor'] : undefined;
|
|
250
|
+
const limitRaw = payload['limit'];
|
|
251
|
+
const limitParsed = typeof limitRaw === 'number' && Number.isFinite(limitRaw) ? Math.floor(limitRaw) : undefined;
|
|
252
|
+
return { ok: true, params: { namespace, prefix, cursor, limit: limitParsed } };
|
|
253
|
+
};
|
|
254
|
+
const handleList = async (request, env) => {
|
|
255
|
+
const check = await readAndVerifyJson(request, env);
|
|
256
|
+
if (!check.ok)
|
|
257
|
+
return check.response;
|
|
258
|
+
const cache = requireCache(env);
|
|
259
|
+
if (cache instanceof Response)
|
|
260
|
+
return cache;
|
|
261
|
+
const parsed = parseListPayload(check.payload);
|
|
262
|
+
if (!parsed.ok)
|
|
263
|
+
return parsed.response;
|
|
264
|
+
const envLimit = getEnvInt(env, 'ZT_KV_LIST_LIMIT', DEFAULT_LIST_LIMIT);
|
|
265
|
+
const requested = parsed.params.limit ?? envLimit;
|
|
266
|
+
const limit = Math.max(1, Math.min(requested, envLimit));
|
|
267
|
+
const prefixKey = parsed.params.prefix;
|
|
268
|
+
const namespacePrefix = normalizeNamespace(parsed.params.namespace);
|
|
269
|
+
const basePrefix = buildStorageKey(env, { namespace: namespacePrefix, key: '' });
|
|
270
|
+
const fullPrefix = prefixKey === undefined ? basePrefix : `${basePrefix}${prefixKey}`;
|
|
271
|
+
const out = await cache.list({ prefix: fullPrefix, limit, cursor: parsed.params.cursor });
|
|
272
|
+
return json(200, {
|
|
273
|
+
keys: out.keys.map((key) => key.name),
|
|
274
|
+
cursor: out.cursor,
|
|
275
|
+
listComplete: out.list_complete,
|
|
276
|
+
});
|
|
277
|
+
};
|
|
278
|
+
export const ZintrustKvProxy = Object.freeze({
|
|
279
|
+
_ZINTRUST_CLOUDFLARE_KV_PROXY_VERSION: '0.1.15',
|
|
280
|
+
_ZINTRUST_CLOUDFLARE_KV_PROXY_BUILD_DATE: '__BUILD_DATE__',
|
|
281
|
+
async fetch(request, env) {
|
|
282
|
+
const url = new URL(request.url);
|
|
283
|
+
const methodError = RequestValidator.requirePost(request.method);
|
|
284
|
+
if (methodError !== null) {
|
|
285
|
+
return toErrorResponse(405, methodError.code, 'Method not allowed');
|
|
286
|
+
}
|
|
287
|
+
switch (url.pathname) {
|
|
288
|
+
case '/zin/kv/get':
|
|
289
|
+
return handleGet(request, env);
|
|
290
|
+
case '/zin/kv/put':
|
|
291
|
+
return handlePut(request, env);
|
|
292
|
+
case '/zin/kv/delete':
|
|
293
|
+
return handleDelete(request, env);
|
|
294
|
+
case '/zin/kv/list':
|
|
295
|
+
return handleList(request, env);
|
|
296
|
+
default:
|
|
297
|
+
return toErrorResponse(404, 'NOT_FOUND', 'Not found');
|
|
298
|
+
}
|
|
36
299
|
},
|
|
37
300
|
});
|
|
38
301
|
export default ZintrustKvProxy;
|
package/src/zintrust.plugins.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
// Uncomment and adapt to your project as needed.
|
|
11
11
|
//
|
|
12
12
|
// import { ZinTrustProcessor } from '../app/Workers/AdvancEmailWorker';
|
|
13
|
-
// import { WorkerFactory, type WorkerFactoryConfig } from '
|
|
13
|
+
// import { WorkerFactory, type WorkerFactoryConfig } from '../packages/workers/src/index.js';
|
|
14
14
|
//
|
|
15
15
|
// type PreRegisteredProcessorSpec = {
|
|
16
16
|
// processorSpec: string;
|