@ya-accelerators/nextjs-framework 0.0.103 → 0.0.105
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/constants.d.ts +7 -0
- package/dist/constants.js +55 -0
- package/dist/constants.js.map +1 -1
- package/dist/env.js +2 -2
- package/dist/env.js.map +1 -1
- package/dist/hooks/uploads/index.d.ts +2 -6
- package/dist/hooks/uploads/index.js +8 -4
- package/dist/hooks/uploads/index.js.map +1 -1
- package/dist/lib/uploads/index.d.ts +1 -1
- package/dist/lib/uploads/index.js +70 -3
- package/dist/lib/uploads/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/ui/composite/form/index.jsx +13 -3
- package/dist/ui/composite/form/index.jsx.map +1 -1
- package/dist/ui/composite/index.d.ts +3 -3
- package/dist/ui/composite/input/index.d.ts +3 -3
- package/dist/uploads/index.d.ts +7 -0
- package/dist/uploads/index.js +12 -0
- package/dist/uploads/index.js.map +1 -0
- package/dist/util/index.js +8 -32
- package/dist/util/index.js.map +1 -1
- package/package.json +1 -1
package/dist/constants.d.ts
CHANGED
|
@@ -5,3 +5,10 @@ export declare const uiConstants: {
|
|
|
5
5
|
export declare const authConstants: {
|
|
6
6
|
REFRESH_LEEWAY_SEC: number;
|
|
7
7
|
};
|
|
8
|
+
export declare const uploadConstants: {
|
|
9
|
+
UPLOAD_FILENAME_MAX_LENGTH: number;
|
|
10
|
+
};
|
|
11
|
+
export declare const sanitizeConstants: {
|
|
12
|
+
SUBSTRING_KEYWORDS: readonly ['authorization', 'proxy-authorization', 'cookie', 'set-cookie', 'x-api-key', 'apikey', 'api_key', 'api-key', 'token', 'secret', 'password', 'passwd', 'signature', 'private', 'session', 'jwt', 'bearer', 'email', 'fullname', 'isikukood', 'dateofbirth', 'phone', 'wage', 'screenedname', 'familyname', 'givenname', 'middlename', 'holdername', 'namekana', 'nickname', 'fax', 'workplaceaddress', 'complainantcontact', 'affiliatedorganization', 'nationalid', 'zipcode', 'taxnumber', 'corporateid', 'useragent', 'hostcountry', 'residencycountry', 'jobtitle', 'department', 'authenticationkey'];
|
|
13
|
+
EXACT_KEYS: readonly ['ip'];
|
|
14
|
+
};
|
package/dist/constants.js
CHANGED
|
@@ -7,4 +7,59 @@ export const authConstants = {
|
|
|
7
7
|
// downstream calls never race the expiry window on long-running requests.
|
|
8
8
|
REFRESH_LEEWAY_SEC: 300,
|
|
9
9
|
};
|
|
10
|
+
export const uploadConstants = {
|
|
11
|
+
UPLOAD_FILENAME_MAX_LENGTH: 255,
|
|
12
|
+
};
|
|
13
|
+
export const sanitizeConstants = {
|
|
14
|
+
SUBSTRING_KEYWORDS: [
|
|
15
|
+
'authorization',
|
|
16
|
+
'proxy-authorization',
|
|
17
|
+
'cookie',
|
|
18
|
+
'set-cookie',
|
|
19
|
+
'x-api-key',
|
|
20
|
+
'apikey',
|
|
21
|
+
'api_key',
|
|
22
|
+
'api-key',
|
|
23
|
+
'token',
|
|
24
|
+
'secret',
|
|
25
|
+
'password',
|
|
26
|
+
'passwd',
|
|
27
|
+
'signature',
|
|
28
|
+
'private',
|
|
29
|
+
'session',
|
|
30
|
+
'jwt',
|
|
31
|
+
'bearer',
|
|
32
|
+
// PII keys — masked so a thrown error's logged input/result never emits subject data to the log stream.
|
|
33
|
+
// Only low-false-positive keys (substring match): bare 'name' (a direct identifier, db-schema.md) is
|
|
34
|
+
// redacted separately in `walk` on EXACT match — a substring entry here would mask serviceName/fileName/….
|
|
35
|
+
'email',
|
|
36
|
+
'fullname',
|
|
37
|
+
'isikukood',
|
|
38
|
+
'dateofbirth',
|
|
39
|
+
'phone',
|
|
40
|
+
'wage',
|
|
41
|
+
'screenedname',
|
|
42
|
+
'familyname',
|
|
43
|
+
'givenname',
|
|
44
|
+
'middlename',
|
|
45
|
+
'holdername',
|
|
46
|
+
'namekana',
|
|
47
|
+
'nickname',
|
|
48
|
+
'fax',
|
|
49
|
+
'workplaceaddress',
|
|
50
|
+
'complainantcontact',
|
|
51
|
+
'affiliatedorganization',
|
|
52
|
+
'nationalid',
|
|
53
|
+
'zipcode',
|
|
54
|
+
'taxnumber',
|
|
55
|
+
'corporateid',
|
|
56
|
+
'useragent',
|
|
57
|
+
'hostcountry',
|
|
58
|
+
'residencycountry',
|
|
59
|
+
'jobtitle',
|
|
60
|
+
'department',
|
|
61
|
+
'authenticationkey',
|
|
62
|
+
],
|
|
63
|
+
EXACT_KEYS: ['ip'],
|
|
64
|
+
};
|
|
10
65
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,4EAA4E;IAC5E,0EAA0E;IAC1E,kBAAkB,EAAE,GAAG;CACxB,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,IAAI;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,4EAA4E;IAC5E,0EAA0E;IAC1E,kBAAkB,EAAE,GAAG;CACxB,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,0BAA0B,EAAE,GAAG;CAChC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,kBAAkB,EAAE;QAClB,eAAe;QACf,qBAAqB;QACrB,QAAQ;QACR,YAAY;QACZ,WAAW;QACX,QAAQ;QACR,SAAS;QACT,SAAS;QACT,OAAO;QACP,QAAQ;QACR,UAAU;QACV,QAAQ;QACR,WAAW;QACX,SAAS;QACT,SAAS;QACT,KAAK;QACL,QAAQ;QACR,wGAAwG;QACxG,qGAAqG;QACrG,2GAA2G;QAC3G,OAAO;QACP,UAAU;QACV,WAAW;QACX,aAAa;QACb,OAAO;QACP,MAAM;QACN,cAAc;QACd,YAAY;QACZ,WAAW;QACX,YAAY;QACZ,YAAY;QACZ,UAAU;QACV,UAAU;QACV,KAAK;QACL,kBAAkB;QAClB,oBAAoB;QACpB,wBAAwB;QACxB,YAAY;QACZ,SAAS;QACT,WAAW;QACX,aAAa;QACb,WAAW;QACX,aAAa;QACb,kBAAkB;QAClB,UAAU;QACV,YAAY;QACZ,mBAAmB;KACX;IACV,UAAU,EAAE,CAAC,IAAI,CAAU;CAC5B,CAAA"}
|
package/dist/env.js
CHANGED
|
@@ -5,7 +5,7 @@ export const defaultServerEnv = Util.createEnvProxy(true, z.object({
|
|
|
5
5
|
DEPLOY_ENV: z.enum(['dev', 'stg', 'prd']),
|
|
6
6
|
LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).optional(),
|
|
7
7
|
NEXTAUTH_URL: z.url(),
|
|
8
|
-
NEXTAUTH_SECRET: z.string().min(
|
|
8
|
+
NEXTAUTH_SECRET: z.string().min(32),
|
|
9
9
|
}), () => ({
|
|
10
10
|
NODE_ENV: process.env.NODE_ENV,
|
|
11
11
|
DEPLOY_ENV: process.env.DEPLOY_ENV,
|
|
@@ -14,7 +14,7 @@ export const defaultServerEnv = Util.createEnvProxy(true, z.object({
|
|
|
14
14
|
? process.env.NEXTAUTH_URL || 'https://build-only-not-used-at-runtime.invalid'
|
|
15
15
|
: process.env.NEXTAUTH_URL,
|
|
16
16
|
NEXTAUTH_SECRET: process.env.NEXT_PHASE === 'phase-production-build'
|
|
17
|
-
? process.env.NEXTAUTH_SECRET || 'build-only-not-used-at-runtime'
|
|
17
|
+
? process.env.NEXTAUTH_SECRET || 'build-only-not-used-at-runtime-32'
|
|
18
18
|
: process.env.NEXTAUTH_SECRET,
|
|
19
19
|
}));
|
|
20
20
|
//# sourceMappingURL=env.js.map
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CACjD,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;IACP,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC/C,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChE,YAAY,EAAE,CAAC,CAAC,GAAG,EAAE;IACrB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAEnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CACjD,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC;IACP,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC/C,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChE,YAAY,EAAE,CAAC,CAAC,GAAG,EAAE;IACrB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;CACpC,CAAC,EACF,GAAG,EAAE,CAAC,CAAC;IACL,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAC9B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,YAAY,EACV,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,wBAAwB;QACjD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,gDAAgD;QAC9E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY;IAC9B,eAAe,EACb,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,wBAAwB;QACjD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,mCAAmC;QACpE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe;CAClC,CAAC,CACH,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { useEffect, useRef, useState } from 'react';
|
|
3
3
|
import { logger } from '../../logger';
|
|
4
|
+
import { parseFileUpload } from '../../uploads';
|
|
4
5
|
export const useUploads = ({ name, multiple, disabled, uploadPath, onChange, }) => {
|
|
5
6
|
const pickerRef = useRef(null);
|
|
6
7
|
const [committed, setCommitted] = useState([]);
|
|
@@ -83,16 +84,19 @@ export const useUploads = ({ name, multiple, disabled, uploadPath, onChange, })
|
|
|
83
84
|
fail({ kind: 'server', status: xhr.status }, new Error(`upload failed (${xhr.status})`));
|
|
84
85
|
return;
|
|
85
86
|
}
|
|
86
|
-
let ref;
|
|
87
87
|
try {
|
|
88
|
-
ref = JSON.parse(xhr.responseText);
|
|
88
|
+
const ref = parseFileUpload(JSON.parse(xhr.responseText));
|
|
89
|
+
if (ref === undefined) {
|
|
90
|
+
fail({ kind: 'invalid-response' }, new Error('upload returned an invalid file reference'));
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
patchBatch(id, { progress: 100, status: 'done', ref });
|
|
94
|
+
commit(multiple ? [...committedRef.current, ref] : [ref]);
|
|
89
95
|
}
|
|
90
96
|
catch (err) {
|
|
91
97
|
fail({ kind: 'invalid-response' }, err);
|
|
92
98
|
return;
|
|
93
99
|
}
|
|
94
|
-
patchBatch(id, { progress: 100, status: 'done', ref });
|
|
95
|
-
commit(multiple ? [...committedRef.current, ref] : [ref]);
|
|
96
100
|
};
|
|
97
101
|
xhr.onerror = () => fail({ kind: 'network' }, new Error('upload failed'));
|
|
98
102
|
xhr.send(source);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/uploads/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/uploads/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { uploadConstants } from '../../constants';
|
|
1
2
|
import { logger } from '../../logger';
|
|
2
|
-
|
|
3
|
+
import { parseFileUpload } from '../../uploads';
|
|
4
|
+
export const createUploadRoute = (uploadAction, getUploadUrl) => async (request) => {
|
|
3
5
|
const origin = request.headers.get('origin');
|
|
4
6
|
if (request.headers.get('sec-fetch-site') !== 'same-origin' &&
|
|
5
7
|
(origin === null || URL.parse(origin)?.host !== request.headers.get('host'))) {
|
|
@@ -9,6 +11,27 @@ export const createUploadRoute = (uploadAction) => async (request) => {
|
|
|
9
11
|
});
|
|
10
12
|
}
|
|
11
13
|
const filename = request.headers.get('x-upload-filename');
|
|
14
|
+
if (filename !== null) {
|
|
15
|
+
let decodedFilename;
|
|
16
|
+
try {
|
|
17
|
+
decodedFilename = decodeURIComponent(filename);
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return new Response(JSON.stringify({ error: 'invalid upload' }), {
|
|
21
|
+
status: 400,
|
|
22
|
+
headers: { 'content-type': 'application/json' },
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
if (decodedFilename.length > uploadConstants.UPLOAD_FILENAME_MAX_LENGTH ||
|
|
26
|
+
/[/\\]/.test(decodedFilename) ||
|
|
27
|
+
decodedFilename === '.' ||
|
|
28
|
+
decodedFilename === '..') {
|
|
29
|
+
return new Response(JSON.stringify({ error: 'invalid upload' }), {
|
|
30
|
+
status: 400,
|
|
31
|
+
headers: { 'content-type': 'application/json' },
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
12
35
|
const minted = await uploadAction().catch((error) => {
|
|
13
36
|
logger.error('upload', { error });
|
|
14
37
|
return undefined;
|
|
@@ -20,8 +43,19 @@ export const createUploadRoute = (uploadAction) => async (request) => {
|
|
|
20
43
|
});
|
|
21
44
|
}
|
|
22
45
|
const { token, url } = minted;
|
|
46
|
+
const trustedUploadUrl = await getUploadUrl().catch((error) => {
|
|
47
|
+
logger.error('upload', { error });
|
|
48
|
+
return undefined;
|
|
49
|
+
});
|
|
50
|
+
if (trustedUploadUrl === undefined || url !== trustedUploadUrl) {
|
|
51
|
+
return new Response(JSON.stringify({ error: 'upload backend rejected' }), {
|
|
52
|
+
status: 502,
|
|
53
|
+
headers: { 'content-type': 'application/json' },
|
|
54
|
+
});
|
|
55
|
+
}
|
|
23
56
|
const response = await fetch(url, {
|
|
24
57
|
method: 'POST',
|
|
58
|
+
redirect: 'error',
|
|
25
59
|
headers: {
|
|
26
60
|
authorization: `Bearer ${token}`,
|
|
27
61
|
...(filename === null ? {} : { 'x-upload-filename': filename }),
|
|
@@ -38,7 +72,16 @@ export const createUploadRoute = (uploadAction) => async (request) => {
|
|
|
38
72
|
headers: { 'content-type': 'application/json' },
|
|
39
73
|
});
|
|
40
74
|
}
|
|
41
|
-
const body = await response.text()
|
|
75
|
+
const body = await response.text().catch((error) => {
|
|
76
|
+
logger.error('upload', { status: response.status, error });
|
|
77
|
+
return undefined;
|
|
78
|
+
});
|
|
79
|
+
if (body === undefined) {
|
|
80
|
+
return new Response(JSON.stringify({ error: response.ok ? 'upload backend returned an invalid response' : 'upload failed' }), {
|
|
81
|
+
status: response.ok || response.status === 304 ? 502 : response.status,
|
|
82
|
+
headers: { 'content-type': 'application/json' },
|
|
83
|
+
});
|
|
84
|
+
}
|
|
42
85
|
if (!response.ok) {
|
|
43
86
|
// The status and the body's SHAPE, never the body itself. This route exists to keep the uploaded
|
|
44
87
|
// filename out of proxy / access logs (it travels in a header, not the query string), and a backend
|
|
@@ -54,7 +97,31 @@ export const createUploadRoute = (uploadAction) => async (request) => {
|
|
|
54
97
|
bodyKeys = undefined;
|
|
55
98
|
}
|
|
56
99
|
logger.error('upload', { status: response.status, bodyKeys, bodyLength: body.length });
|
|
100
|
+
return new Response(JSON.stringify({ error: 'upload failed' }), {
|
|
101
|
+
status: response.status === 304 ? 502 : response.status,
|
|
102
|
+
headers: { 'content-type': 'application/json' },
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
try {
|
|
106
|
+
const ref = parseFileUpload(JSON.parse(body));
|
|
107
|
+
if (ref === undefined) {
|
|
108
|
+
logger.error('upload', { status: response.status, bodyLength: body.length });
|
|
109
|
+
return new Response(JSON.stringify({ error: 'upload backend returned an invalid response' }), {
|
|
110
|
+
status: 502,
|
|
111
|
+
headers: { 'content-type': 'application/json' },
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
return new Response(JSON.stringify(ref), {
|
|
115
|
+
status: response.status,
|
|
116
|
+
headers: { 'content-type': 'application/json' },
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
logger.error('upload', { status: response.status, bodyLength: body.length, error });
|
|
121
|
+
return new Response(JSON.stringify({ error: 'upload backend returned an invalid response' }), {
|
|
122
|
+
status: 502,
|
|
123
|
+
headers: { 'content-type': 'application/json' },
|
|
124
|
+
});
|
|
57
125
|
}
|
|
58
|
-
return new Response(body, { status: response.status, headers: { 'content-type': 'application/json' } });
|
|
59
126
|
};
|
|
60
127
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/uploads/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/uploads/index.ts"],"names":[],"mappings":"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"}
|