@eggjs/cookies 4.0.0-beta.19 → 4.0.0-beta.21
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/cookie.d.ts +64 -67
- package/dist/cookie.js +87 -70
- package/dist/cookies.d.ts +36 -40
- package/dist/cookies.js +271 -215
- package/dist/error.d.ts +2 -5
- package/dist/error.js +10 -11
- package/dist/index.d.ts +4 -5
- package/dist/index.js +5 -6
- package/dist/keygrip.d.ts +10 -13
- package/dist/keygrip.js +103 -88
- package/package.json +3 -3
package/dist/cookie.d.ts
CHANGED
|
@@ -1,69 +1,66 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
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
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
priority?: 'low' | 'medium' | 'high' | 'LOW' | 'MEDIUM' | 'HIGH';
|
|
1
|
+
export interface CookieSetOptions {
|
|
2
|
+
/**
|
|
3
|
+
* The path for the cookie to be set in
|
|
4
|
+
*/
|
|
5
|
+
path?: string | null;
|
|
6
|
+
/**
|
|
7
|
+
* The domain for the cookie
|
|
8
|
+
*/
|
|
9
|
+
domain?: string | (() => string);
|
|
10
|
+
/**
|
|
11
|
+
* Is overridable
|
|
12
|
+
*/
|
|
13
|
+
overwrite?: boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Is the same site
|
|
16
|
+
*/
|
|
17
|
+
sameSite?: string | boolean;
|
|
18
|
+
/**
|
|
19
|
+
* Encrypt the cookie's value or not
|
|
20
|
+
*/
|
|
21
|
+
encrypt?: boolean;
|
|
22
|
+
/**
|
|
23
|
+
* Max age for browsers
|
|
24
|
+
*/
|
|
25
|
+
maxAge?: number;
|
|
26
|
+
/**
|
|
27
|
+
* Expire time
|
|
28
|
+
*/
|
|
29
|
+
expires?: Date;
|
|
30
|
+
/**
|
|
31
|
+
* Is for http only
|
|
32
|
+
*/
|
|
33
|
+
httpOnly?: boolean;
|
|
34
|
+
/**
|
|
35
|
+
* Encrypt the cookie's value or not
|
|
36
|
+
*/
|
|
37
|
+
secure?: boolean;
|
|
38
|
+
/**
|
|
39
|
+
* Once `true` and secure set to `true`, ignore the secure error in a none-ssl environment.
|
|
40
|
+
*/
|
|
41
|
+
ignoreSecureError?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* Is it signed or not.
|
|
44
|
+
*/
|
|
45
|
+
signed?: boolean | number;
|
|
46
|
+
/**
|
|
47
|
+
* Is it partitioned or not.
|
|
48
|
+
*/
|
|
49
|
+
partitioned?: boolean;
|
|
50
|
+
/**
|
|
51
|
+
* Remove unpartitioned same name cookie or not.
|
|
52
|
+
*/
|
|
53
|
+
removeUnpartitioned?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* The cookie priority.
|
|
56
|
+
*/
|
|
57
|
+
priority?: 'low' | 'medium' | 'high' | 'LOW' | 'MEDIUM' | 'HIGH';
|
|
59
58
|
}
|
|
60
|
-
declare class Cookie {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
59
|
+
export declare class Cookie {
|
|
60
|
+
name: string;
|
|
61
|
+
value: string;
|
|
62
|
+
readonly attrs: CookieSetOptions;
|
|
63
|
+
constructor(name: string, value?: string | null, attrs?: CookieSetOptions);
|
|
64
|
+
toString(): string;
|
|
65
|
+
toHeader(): string;
|
|
67
66
|
}
|
|
68
|
-
//#endregion
|
|
69
|
-
export { Cookie, CookieSetOptions };
|
package/dist/cookie.js
CHANGED
|
@@ -1,77 +1,94 @@
|
|
|
1
|
-
import assert from
|
|
2
|
-
|
|
3
|
-
//#region src/cookie.ts
|
|
1
|
+
import assert from 'node:assert';
|
|
4
2
|
/**
|
|
5
|
-
* RegExp to match field-content in RFC 7230 sec 3.2
|
|
6
|
-
*
|
|
7
|
-
* field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
|
|
8
|
-
* field-vchar = VCHAR / obs-text
|
|
9
|
-
* obs-text = %x80-FF
|
|
10
|
-
*/
|
|
11
|
-
const fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
|
|
3
|
+
* RegExp to match field-content in RFC 7230 sec 3.2
|
|
4
|
+
*
|
|
5
|
+
* field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
|
|
6
|
+
* field-vchar = VCHAR / obs-text
|
|
7
|
+
* obs-text = %x80-FF
|
|
8
|
+
*/
|
|
9
|
+
const fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/; // eslint-disable-line no-control-regex
|
|
12
10
|
/**
|
|
13
|
-
* RegExp to match Same-Site cookie attribute value.
|
|
14
|
-
* https://en.wikipedia.org/wiki/HTTP_cookie#SameSite_cookie
|
|
15
|
-
*/
|
|
11
|
+
* RegExp to match Same-Site cookie attribute value.
|
|
12
|
+
* https://en.wikipedia.org/wiki/HTTP_cookie#SameSite_cookie
|
|
13
|
+
*/
|
|
16
14
|
const sameSiteRegExp = /^(?:none|lax|strict)$/i;
|
|
17
15
|
/**
|
|
18
|
-
* RegExp to match Priority cookie attribute value.
|
|
19
|
-
*/
|
|
16
|
+
* RegExp to match Priority cookie attribute value.
|
|
17
|
+
*/
|
|
20
18
|
const PRIORITY_REGEXP = /^(?:low|medium|high)$/i;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
19
|
+
export class Cookie {
|
|
20
|
+
name;
|
|
21
|
+
value;
|
|
22
|
+
attrs;
|
|
23
|
+
constructor(name, value, attrs) {
|
|
24
|
+
assert(fieldContentRegExp.test(name), 'argument name is invalid');
|
|
25
|
+
assert(!value || fieldContentRegExp.test(value), 'argument value is invalid');
|
|
26
|
+
this.name = name;
|
|
27
|
+
this.value = value ?? '';
|
|
28
|
+
this.attrs = mergeDefaultAttrs(attrs);
|
|
29
|
+
assert(!this.attrs.path || fieldContentRegExp.test(this.attrs.path), 'argument option path is invalid');
|
|
30
|
+
if (typeof this.attrs.domain === 'function') {
|
|
31
|
+
this.attrs.domain = this.attrs.domain();
|
|
32
|
+
}
|
|
33
|
+
assert(!this.attrs.domain || fieldContentRegExp.test(this.attrs.domain), 'argument option domain is invalid');
|
|
34
|
+
assert(!this.attrs.sameSite || this.attrs.sameSite === true || sameSiteRegExp.test(this.attrs.sameSite), 'argument option sameSite is invalid');
|
|
35
|
+
assert(!this.attrs.priority || PRIORITY_REGEXP.test(this.attrs.priority), 'argument option priority is invalid');
|
|
36
|
+
if (!value) {
|
|
37
|
+
this.attrs.expires = new Date(0);
|
|
38
|
+
// make sure maxAge is empty
|
|
39
|
+
this.attrs.maxAge = undefined;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
toString() {
|
|
43
|
+
return this.name + '=' + this.value;
|
|
44
|
+
}
|
|
45
|
+
toHeader() {
|
|
46
|
+
let header = this.toString();
|
|
47
|
+
const attrs = this.attrs;
|
|
48
|
+
if (attrs.path) {
|
|
49
|
+
header += '; path=' + attrs.path;
|
|
50
|
+
}
|
|
51
|
+
const maxAge = typeof attrs.maxAge === 'string' ? parseInt(attrs.maxAge, 10) : attrs.maxAge;
|
|
52
|
+
// ignore 0, `session` and other invalid maxAge
|
|
53
|
+
if (maxAge) {
|
|
54
|
+
header += '; max-age=' + Math.round(maxAge / 1000);
|
|
55
|
+
attrs.expires = new Date(Date.now() + maxAge);
|
|
56
|
+
}
|
|
57
|
+
if (attrs.expires) {
|
|
58
|
+
header += '; expires=' + attrs.expires.toUTCString();
|
|
59
|
+
}
|
|
60
|
+
if (attrs.domain) {
|
|
61
|
+
header += '; domain=' + attrs.domain;
|
|
62
|
+
}
|
|
63
|
+
if (attrs.priority) {
|
|
64
|
+
header += '; priority=' + attrs.priority.toLowerCase();
|
|
65
|
+
}
|
|
66
|
+
if (attrs.sameSite) {
|
|
67
|
+
header += '; samesite=' + (attrs.sameSite === true ? 'strict' : attrs.sameSite.toLowerCase());
|
|
68
|
+
}
|
|
69
|
+
if (attrs.secure) {
|
|
70
|
+
header += '; secure';
|
|
71
|
+
}
|
|
72
|
+
if (attrs.httpOnly) {
|
|
73
|
+
header += '; httponly';
|
|
74
|
+
}
|
|
75
|
+
if (attrs.partitioned) {
|
|
76
|
+
header += '; partitioned';
|
|
77
|
+
}
|
|
78
|
+
return header;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
63
81
|
function mergeDefaultAttrs(attrs) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
82
|
+
const merged = {
|
|
83
|
+
path: '/',
|
|
84
|
+
httpOnly: true,
|
|
85
|
+
secure: false,
|
|
86
|
+
overwrite: false,
|
|
87
|
+
sameSite: false,
|
|
88
|
+
partitioned: false,
|
|
89
|
+
priority: undefined,
|
|
90
|
+
...attrs,
|
|
91
|
+
};
|
|
92
|
+
return merged;
|
|
74
93
|
}
|
|
75
|
-
|
|
76
|
-
//#endregion
|
|
77
|
-
export { Cookie };
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29va2llLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Nvb2tpZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFFakM7Ozs7OztHQU1HO0FBQ0gsTUFBTSxrQkFBa0IsR0FBRyx1Q0FBdUMsQ0FBQyxDQUFDLHVDQUF1QztBQUUzRzs7O0dBR0c7QUFDSCxNQUFNLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQztBQUVoRDs7R0FFRztBQUNILE1BQU0sZUFBZSxHQUFHLHdCQUF3QixDQUFDO0FBOERqRCxNQUFNLE9BQU8sTUFBTTtJQUNqQixJQUFJLENBQVM7SUFDYixLQUFLLENBQVM7SUFDTCxLQUFLLENBQW1CO0lBRWpDLFlBQVksSUFBWSxFQUFFLEtBQXFCLEVBQUUsS0FBd0I7UUFDdkUsTUFBTSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSwwQkFBMEIsQ0FBQyxDQUFDO1FBQ2xFLE1BQU0sQ0FBQyxDQUFDLEtBQUssSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsMkJBQTJCLENBQUMsQ0FBQztRQUM5RSxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssSUFBSSxFQUFFLENBQUM7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN0QyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxpQ0FBaUMsQ0FBQyxDQUFDO1FBQ3hHLElBQUksT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUM1QyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FB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
|
package/dist/cookies.d.ts
CHANGED
|
@@ -1,47 +1,43 @@
|
|
|
1
|
-
import { Keygrip } from
|
|
2
|
-
import { CookieSetOptions } from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
*/
|
|
9
|
-
autoChips?: boolean;
|
|
1
|
+
import { Keygrip } from './keygrip.ts';
|
|
2
|
+
import { type CookieSetOptions } from './cookie.ts';
|
|
3
|
+
export interface DefaultCookieOptions extends CookieSetOptions {
|
|
4
|
+
/**
|
|
5
|
+
* Auto get and set `_CHIPS-` prefix cookie to adaptation CHIPS mode (The default value is false).
|
|
6
|
+
*/
|
|
7
|
+
autoChips?: boolean;
|
|
10
8
|
}
|
|
11
|
-
interface CookieGetOptions {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
9
|
+
export interface CookieGetOptions {
|
|
10
|
+
/**
|
|
11
|
+
* Whether to sign or not (The default value is true).
|
|
12
|
+
*/
|
|
13
|
+
signed?: boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Encrypt the cookie's value or not (The default value is false).
|
|
16
|
+
*/
|
|
17
|
+
encrypt?: boolean;
|
|
20
18
|
}
|
|
21
19
|
/**
|
|
22
20
|
* cookies for egg
|
|
23
21
|
* extend pillarjs/cookies, add encrypt and decrypt
|
|
24
22
|
*/
|
|
25
|
-
declare class Cookies {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
23
|
+
export declare class Cookies {
|
|
24
|
+
#private;
|
|
25
|
+
readonly ctx: Record<string, any>;
|
|
26
|
+
readonly app: Record<string, any>;
|
|
27
|
+
readonly secure: boolean;
|
|
28
|
+
constructor(ctx: Record<string, any>, keys: string[], defaultCookieOptions?: DefaultCookieOptions);
|
|
29
|
+
get keys(): Keygrip;
|
|
30
|
+
/**
|
|
31
|
+
* get cookie value by name
|
|
32
|
+
* @param {String} name - cookie's name
|
|
33
|
+
* @param {Object} opts - cookies' options
|
|
34
|
+
* - {Boolean} signed - default to true
|
|
35
|
+
* - {Boolean} encrypt - default to false
|
|
36
|
+
* @return {String} value - cookie's value
|
|
37
|
+
*/
|
|
38
|
+
get(name: string, opts?: CookieGetOptions): string | undefined;
|
|
39
|
+
_get(name: string, opts: CookieGetOptions): string | undefined;
|
|
40
|
+
set(name: string, value: string | null, opts?: CookieSetOptions): this;
|
|
41
|
+
isSameSiteNoneCompatible(userAgent: string): boolean;
|
|
42
|
+
isPartitionedCompatible(userAgent: string): boolean;
|
|
45
43
|
}
|
|
46
|
-
//#endregion
|
|
47
|
-
export { CookieGetOptions, Cookies, DefaultCookieOptions };
|
package/dist/cookies.js
CHANGED
|
@@ -1,231 +1,287 @@
|
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import { base64decode, base64encode } from 'utility';
|
|
3
|
+
import { isSameSiteNoneCompatible } from 'should-send-same-site-none';
|
|
1
4
|
import { Keygrip } from "./keygrip.js";
|
|
2
5
|
import { Cookie } from "./cookie.js";
|
|
3
6
|
import { CookieError } from "./error.js";
|
|
4
|
-
|
|
5
|
-
import { base64decode, base64encode } from "utility";
|
|
6
|
-
import { isSameSiteNoneCompatible } from "should-send-same-site-none";
|
|
7
|
-
|
|
8
|
-
//#region src/cookies.ts
|
|
9
|
-
const keyCache = /* @__PURE__ */ new Map();
|
|
7
|
+
const keyCache = new Map();
|
|
10
8
|
/**
|
|
11
|
-
* cookies for egg
|
|
12
|
-
* extend pillarjs/cookies, add encrypt and decrypt
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
9
|
+
* cookies for egg
|
|
10
|
+
* extend pillarjs/cookies, add encrypt and decrypt
|
|
11
|
+
*/
|
|
12
|
+
export class Cookies {
|
|
13
|
+
#keysArray;
|
|
14
|
+
#keys;
|
|
15
|
+
#defaultCookieOptions;
|
|
16
|
+
#autoChips;
|
|
17
|
+
ctx;
|
|
18
|
+
app;
|
|
19
|
+
secure;
|
|
20
|
+
#parseChromiumResult;
|
|
21
|
+
constructor(ctx, keys, defaultCookieOptions) {
|
|
22
|
+
this.#keysArray = keys;
|
|
23
|
+
// default cookie options
|
|
24
|
+
this.#defaultCookieOptions = defaultCookieOptions;
|
|
25
|
+
this.#autoChips = defaultCookieOptions?.autoChips;
|
|
26
|
+
this.ctx = ctx;
|
|
27
|
+
this.secure = this.ctx.secure;
|
|
28
|
+
this.app = ctx.app;
|
|
29
|
+
}
|
|
30
|
+
get keys() {
|
|
31
|
+
if (!this.#keys) {
|
|
32
|
+
assert(Array.isArray(this.#keysArray), '.keys required for encrypt/sign cookies');
|
|
33
|
+
const cache = keyCache.get(this.#keysArray);
|
|
34
|
+
if (cache) {
|
|
35
|
+
this.#keys = cache;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
this.#keys = new Keygrip(this.#keysArray);
|
|
39
|
+
keyCache.set(this.#keysArray, this.#keys);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return this.#keys;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* get cookie value by name
|
|
46
|
+
* @param {String} name - cookie's name
|
|
47
|
+
* @param {Object} opts - cookies' options
|
|
48
|
+
* - {Boolean} signed - default to true
|
|
49
|
+
* - {Boolean} encrypt - default to false
|
|
50
|
+
* @return {String} value - cookie's value
|
|
51
|
+
*/
|
|
52
|
+
get(name, opts = {}) {
|
|
53
|
+
let value = this._get(name, opts);
|
|
54
|
+
if (value === undefined && this.#autoChips) {
|
|
55
|
+
// try to read _CHIPS-${name} prefix cookie
|
|
56
|
+
value = this._get(this.#formatChipsCookieName(name), opts);
|
|
57
|
+
}
|
|
58
|
+
return value;
|
|
59
|
+
}
|
|
60
|
+
_get(name, opts) {
|
|
61
|
+
const signed = computeSigned(opts);
|
|
62
|
+
const header = this.ctx.get('cookie');
|
|
63
|
+
if (!header)
|
|
64
|
+
return;
|
|
65
|
+
const match = header.match(getPattern(name));
|
|
66
|
+
if (!match)
|
|
67
|
+
return;
|
|
68
|
+
let value = match[1];
|
|
69
|
+
if (!opts.encrypt && !signed)
|
|
70
|
+
return value;
|
|
71
|
+
// signed
|
|
72
|
+
if (signed) {
|
|
73
|
+
const sigName = name + '.sig';
|
|
74
|
+
const sigValue = this.get(sigName, { signed: false });
|
|
75
|
+
if (!sigValue)
|
|
76
|
+
return;
|
|
77
|
+
const raw = name + '=' + value;
|
|
78
|
+
const index = this.keys.verify(raw, sigValue);
|
|
79
|
+
if (index < 0) {
|
|
80
|
+
// can not match any key, remove ${name}.sig
|
|
81
|
+
this.set(sigName, null, { path: '/', signed: false, overwrite: true });
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (index > 0) {
|
|
85
|
+
// not signed by the first key, update sigValue
|
|
86
|
+
this.set(sigName, this.keys.sign(raw), { signed: false, overwrite: true });
|
|
87
|
+
}
|
|
88
|
+
return value;
|
|
89
|
+
}
|
|
90
|
+
// encrypt
|
|
91
|
+
value = base64decode(value, true, 'buffer');
|
|
92
|
+
const res = this.keys.decrypt(value);
|
|
93
|
+
return res ? res.value.toString() : undefined;
|
|
94
|
+
}
|
|
95
|
+
set(name, value, opts) {
|
|
96
|
+
opts = {
|
|
97
|
+
...this.#defaultCookieOptions,
|
|
98
|
+
...opts,
|
|
99
|
+
};
|
|
100
|
+
const signed = computeSigned(opts);
|
|
101
|
+
const shouldIgnoreSecureError = opts && opts.ignoreSecureError;
|
|
102
|
+
value = value || '';
|
|
103
|
+
if (!shouldIgnoreSecureError) {
|
|
104
|
+
if (!this.secure && opts.secure) {
|
|
105
|
+
throw new CookieError('Cannot send secure cookie over unencrypted connection');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
let headers = this.ctx.response.get('set-cookie') || [];
|
|
109
|
+
if (!Array.isArray(headers)) {
|
|
110
|
+
headers = [headers];
|
|
111
|
+
}
|
|
112
|
+
// encrypt
|
|
113
|
+
if (opts.encrypt) {
|
|
114
|
+
value = value && base64encode(this.keys.encrypt(value), true);
|
|
115
|
+
}
|
|
116
|
+
// http://browsercookielimits.squawky.net/
|
|
117
|
+
if (value.length > 4093) {
|
|
118
|
+
this.app.emit('cookieLimitExceed', { name, value, ctx: this.ctx });
|
|
119
|
+
}
|
|
120
|
+
// https://github.com/linsight/should-send-same-site-none
|
|
121
|
+
// fixed SameSite=None: Known Incompatible Clients
|
|
122
|
+
const userAgent = this.ctx.get('user-agent');
|
|
123
|
+
let isSameSiteNone = false;
|
|
124
|
+
// disable autoChips if partitioned enable
|
|
125
|
+
let autoChips = !opts.partitioned && this.#autoChips;
|
|
126
|
+
if (opts.sameSite && typeof opts.sameSite === 'string' && opts.sameSite.toLowerCase() === 'none') {
|
|
127
|
+
isSameSiteNone = true;
|
|
128
|
+
if (opts.secure === false || !this.secure || (userAgent && !this.isSameSiteNoneCompatible(userAgent))) {
|
|
129
|
+
// Non-secure context or Incompatible clients, don't send SameSite=None property
|
|
130
|
+
opts.sameSite = false;
|
|
131
|
+
isSameSiteNone = false;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
if (autoChips || opts.partitioned) {
|
|
135
|
+
// allow to set partitioned: secure=true and sameSite=none and chrome >= 118
|
|
136
|
+
if (!isSameSiteNone ||
|
|
137
|
+
opts.secure === false ||
|
|
138
|
+
!this.secure ||
|
|
139
|
+
(userAgent && !this.isPartitionedCompatible(userAgent))) {
|
|
140
|
+
// Non-secure context or Incompatible clients, don't send partitioned property
|
|
141
|
+
autoChips = false;
|
|
142
|
+
opts.partitioned = false;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
// remove unpartitioned same name cookie first
|
|
146
|
+
if (opts.partitioned && opts.removeUnpartitioned) {
|
|
147
|
+
const overwrite = opts.overwrite;
|
|
148
|
+
if (overwrite) {
|
|
149
|
+
opts.overwrite = false;
|
|
150
|
+
headers = ignoreCookiesByName(headers, name);
|
|
151
|
+
}
|
|
152
|
+
const removeCookieOpts = {
|
|
153
|
+
...opts,
|
|
154
|
+
partitioned: false,
|
|
155
|
+
};
|
|
156
|
+
const removeUnpartitionedCookie = new Cookie(name, '', removeCookieOpts);
|
|
157
|
+
// if user not set secure, reset secure to ctx.secure
|
|
158
|
+
if (opts.secure === undefined) {
|
|
159
|
+
removeUnpartitionedCookie.attrs.secure = this.secure;
|
|
160
|
+
}
|
|
161
|
+
headers = pushCookie(headers, removeUnpartitionedCookie);
|
|
162
|
+
// signed
|
|
163
|
+
if (signed) {
|
|
164
|
+
removeUnpartitionedCookie.name += '.sig';
|
|
165
|
+
headers = ignoreCookiesByNameAndPath(headers, removeUnpartitionedCookie.name, removeUnpartitionedCookie.attrs.path);
|
|
166
|
+
headers = pushCookie(headers, removeUnpartitionedCookie);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
else if (autoChips) {
|
|
170
|
+
// add _CHIPS-${name} prefix cookie
|
|
171
|
+
const newCookieName = this.#formatChipsCookieName(name);
|
|
172
|
+
const newCookieOpts = {
|
|
173
|
+
...opts,
|
|
174
|
+
partitioned: true,
|
|
175
|
+
};
|
|
176
|
+
const newPartitionedCookie = new Cookie(newCookieName, value, newCookieOpts);
|
|
177
|
+
// if user not set secure, reset secure to ctx.secure
|
|
178
|
+
if (opts.secure === undefined)
|
|
179
|
+
newPartitionedCookie.attrs.secure = this.secure;
|
|
180
|
+
headers = pushCookie(headers, newPartitionedCookie);
|
|
181
|
+
// signed
|
|
182
|
+
if (signed) {
|
|
183
|
+
newPartitionedCookie.value = value && this.keys.sign(newPartitionedCookie.toString());
|
|
184
|
+
newPartitionedCookie.name += '.sig';
|
|
185
|
+
headers = ignoreCookiesByNameAndPath(headers, newPartitionedCookie.name, newPartitionedCookie.attrs.path);
|
|
186
|
+
headers = pushCookie(headers, newPartitionedCookie);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const cookie = new Cookie(name, value, opts);
|
|
190
|
+
// if user not set secure, reset secure to ctx.secure
|
|
191
|
+
if (opts.secure === undefined) {
|
|
192
|
+
cookie.attrs.secure = this.secure;
|
|
193
|
+
}
|
|
194
|
+
headers = pushCookie(headers, cookie);
|
|
195
|
+
// signed
|
|
196
|
+
if (signed) {
|
|
197
|
+
cookie.value = value && this.keys.sign(cookie.toString());
|
|
198
|
+
cookie.name += '.sig';
|
|
199
|
+
headers = pushCookie(headers, cookie);
|
|
200
|
+
}
|
|
201
|
+
this.ctx.set('set-cookie', headers);
|
|
202
|
+
return this;
|
|
203
|
+
}
|
|
204
|
+
#formatChipsCookieName(name) {
|
|
205
|
+
return `_CHIPS-${name}`;
|
|
206
|
+
}
|
|
207
|
+
#parseChromiumAndMajorVersion(userAgent) {
|
|
208
|
+
if (!this.#parseChromiumResult) {
|
|
209
|
+
this.#parseChromiumResult = parseChromiumAndMajorVersion(userAgent);
|
|
210
|
+
}
|
|
211
|
+
return this.#parseChromiumResult;
|
|
212
|
+
}
|
|
213
|
+
isSameSiteNoneCompatible(userAgent) {
|
|
214
|
+
// Chrome >= 80.0.0.0
|
|
215
|
+
const result = this.#parseChromiumAndMajorVersion(userAgent);
|
|
216
|
+
if (result.chromium) {
|
|
217
|
+
return result.majorVersion >= 80;
|
|
218
|
+
}
|
|
219
|
+
return isSameSiteNoneCompatible(userAgent);
|
|
220
|
+
}
|
|
221
|
+
isPartitionedCompatible(userAgent) {
|
|
222
|
+
// support: Chrome >= 114.0.0.0
|
|
223
|
+
// default enable: Chrome >= 118.0.0.0
|
|
224
|
+
// https://developers.google.com/privacy-sandbox/3pcd/chips
|
|
225
|
+
const result = this.#parseChromiumAndMajorVersion(userAgent);
|
|
226
|
+
if (result.chromium) {
|
|
227
|
+
return result.majorVersion >= 118;
|
|
228
|
+
}
|
|
229
|
+
return false;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
// https://github.com/linsight/should-send-same-site-none/blob/master/index.js#L86
|
|
185
233
|
function parseChromiumAndMajorVersion(userAgent) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
chromium: true,
|
|
193
|
-
majorVersion: parseInt(m[1])
|
|
194
|
-
};
|
|
234
|
+
const m = /Chrom[^ /]{1,100}\/(\d{1,100}?)\./.exec(userAgent);
|
|
235
|
+
if (!m) {
|
|
236
|
+
return { chromium: false, majorVersion: 0 };
|
|
237
|
+
}
|
|
238
|
+
// Extract digits from first capturing group.
|
|
239
|
+
return { chromium: true, majorVersion: parseInt(m[1]) };
|
|
195
240
|
}
|
|
196
|
-
const _patternCache =
|
|
241
|
+
const _patternCache = new Map();
|
|
197
242
|
function getPattern(name) {
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
243
|
+
const cache = _patternCache.get(name);
|
|
244
|
+
if (cache) {
|
|
245
|
+
return cache;
|
|
246
|
+
}
|
|
247
|
+
const reg = new RegExp('(?:^|;) *' + name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + '=([^;]*)');
|
|
248
|
+
_patternCache.set(name, reg);
|
|
249
|
+
return reg;
|
|
203
250
|
}
|
|
204
251
|
function computeSigned(opts) {
|
|
205
|
-
|
|
206
|
-
|
|
252
|
+
// encrypt default to false, signed default to true.
|
|
253
|
+
// disable singed when encrypt is true.
|
|
254
|
+
if (opts.encrypt)
|
|
255
|
+
return false;
|
|
256
|
+
return opts.signed !== false;
|
|
207
257
|
}
|
|
208
258
|
function pushCookie(cookies, cookie) {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
259
|
+
if (cookie.attrs.overwrite) {
|
|
260
|
+
cookies = ignoreCookiesByName(cookies, cookie.name);
|
|
261
|
+
}
|
|
262
|
+
cookies.push(cookie.toHeader());
|
|
263
|
+
return cookies;
|
|
212
264
|
}
|
|
213
265
|
function ignoreCookiesByName(cookies, name) {
|
|
214
|
-
|
|
215
|
-
|
|
266
|
+
const prefix = `${name}=`;
|
|
267
|
+
return cookies.filter(c => !c.startsWith(prefix));
|
|
216
268
|
}
|
|
217
269
|
function ignoreCookiesByNameAndPath(cookies, name, path) {
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
270
|
+
if (!path) {
|
|
271
|
+
return ignoreCookiesByName(cookies, name);
|
|
272
|
+
}
|
|
273
|
+
const prefix = `${name}=`;
|
|
274
|
+
// foo=hello; path=/path1; samesite=none
|
|
275
|
+
const includedPath = `; path=${path};`;
|
|
276
|
+
// foo=hello; path=/path1
|
|
277
|
+
const endsWithPath = `; path=${path}`;
|
|
278
|
+
return cookies.filter(c => {
|
|
279
|
+
if (c.startsWith(prefix)) {
|
|
280
|
+
if (c.includes(includedPath) || c.endsWith(endsWithPath)) {
|
|
281
|
+
return false;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
return true;
|
|
285
|
+
});
|
|
228
286
|
}
|
|
229
|
-
|
|
230
|
-
//#endregion
|
|
231
|
-
export { Cookies };
|
|
287
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../src/cookies.ts"],"names":[],"mappings":"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"}
|
package/dist/error.d.ts
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
constructor(message: string, options?: ErrorOptions);
|
|
1
|
+
export declare class CookieError extends Error {
|
|
2
|
+
constructor(message: string, options?: ErrorOptions);
|
|
4
3
|
}
|
|
5
|
-
//#endregion
|
|
6
|
-
export { CookieError };
|
package/dist/error.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
//#
|
|
11
|
-
export { CookieError };
|
|
1
|
+
export class CookieError extends Error {
|
|
2
|
+
constructor(message, options) {
|
|
3
|
+
super(message, options);
|
|
4
|
+
this.name = this.constructor.name;
|
|
5
|
+
if ('captureStackTrace' in Error) {
|
|
6
|
+
Error.captureStackTrace(this, this.constructor);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFdBQVksU0FBUSxLQUFLO0lBQ3BDLFlBQVksT0FBZSxFQUFFLE9BQXNCO1FBQ2pELEtBQUssQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztRQUNsQyxJQUFJLG1CQUFtQixJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ2pDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ2xELENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export { Cookie, CookieError, CookieGetOptions, CookieSetOptions, Cookies, DefaultCookieOptions, Keygrip };
|
|
1
|
+
export * from './cookies.ts';
|
|
2
|
+
export * from './cookie.ts';
|
|
3
|
+
export * from './error.ts';
|
|
4
|
+
export * from './keygrip.ts';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export { Cookie, CookieError, Cookies, Keygrip };
|
|
1
|
+
export * from "./cookies.js";
|
|
2
|
+
export * from "./cookie.js";
|
|
3
|
+
export * from "./error.js";
|
|
4
|
+
export * from "./keygrip.js";
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxjQUFjLENBQUMifQ==
|
package/dist/keygrip.d.ts
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
verify(data: string, digest: string): number;
|
|
1
|
+
export declare class Keygrip {
|
|
2
|
+
#private;
|
|
3
|
+
constructor(keys: string[]);
|
|
4
|
+
encrypt(data: string, key?: string): Buffer<ArrayBuffer>;
|
|
5
|
+
decrypt(data: string | Buffer): {
|
|
6
|
+
value: Buffer;
|
|
7
|
+
index: number;
|
|
8
|
+
} | false;
|
|
9
|
+
sign(data: string | Buffer, key?: string): string;
|
|
10
|
+
verify(data: string, digest: string): number;
|
|
12
11
|
}
|
|
13
|
-
//#endregion
|
|
14
|
-
export { Keygrip };
|
package/dist/keygrip.js
CHANGED
|
@@ -1,98 +1,113 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
|
|
5
|
-
//#region src/keygrip.ts
|
|
6
|
-
const debug = debuglog("egg/cookies:keygrip");
|
|
1
|
+
import { debuglog } from 'node:util';
|
|
2
|
+
import crypto, {} from 'node:crypto';
|
|
3
|
+
import assert from 'node:assert';
|
|
4
|
+
const debug = debuglog('egg/cookies:keygrip');
|
|
7
5
|
const KEY_LEN = 32;
|
|
8
6
|
const IV_SIZE = 16;
|
|
9
|
-
const passwordCache =
|
|
7
|
+
const passwordCache = new Map();
|
|
10
8
|
const replacer = {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
'/': '_',
|
|
10
|
+
'+': '-',
|
|
11
|
+
'=': '',
|
|
14
12
|
};
|
|
15
13
|
function constantTimeCompare(a, b) {
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
if (a.length !== b.length) {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
return crypto.timingSafeEqual(a, b);
|
|
18
|
+
}
|
|
19
|
+
// patch from https://github.com/crypto-utils/keygrip
|
|
20
|
+
export class Keygrip {
|
|
21
|
+
#keys;
|
|
22
|
+
#hash = 'sha256';
|
|
23
|
+
#cipher = 'aes-256-cbc';
|
|
24
|
+
constructor(keys) {
|
|
25
|
+
assert(Array.isArray(keys) && keys.length > 0, 'keys must be provided and should be an array');
|
|
26
|
+
this.#keys = keys;
|
|
27
|
+
}
|
|
28
|
+
// encrypt a message
|
|
29
|
+
encrypt(data, key) {
|
|
30
|
+
key = key || this.#keys[0];
|
|
31
|
+
const password = keyToPassword(key);
|
|
32
|
+
const cipher = crypto.createCipheriv(this.#cipher, password.key, password.iv);
|
|
33
|
+
return crypt(cipher, data);
|
|
34
|
+
}
|
|
35
|
+
// decrypt a single message
|
|
36
|
+
// returns false on bad decrypts
|
|
37
|
+
decrypt(data) {
|
|
38
|
+
// decrypt every key
|
|
39
|
+
const keys = this.#keys;
|
|
40
|
+
for (let i = 0; i < keys.length; i++) {
|
|
41
|
+
const value = this.#decryptByKey(data, keys[i]);
|
|
42
|
+
if (value !== false) {
|
|
43
|
+
return { value, index: i };
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
#decryptByKey(data, key) {
|
|
49
|
+
try {
|
|
50
|
+
const password = keyToPassword(key);
|
|
51
|
+
const cipher = crypto.createDecipheriv(this.#cipher, password.key, password.iv);
|
|
52
|
+
return crypt(cipher, data);
|
|
53
|
+
}
|
|
54
|
+
catch (err) {
|
|
55
|
+
debug('crypt error: %s', err);
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
sign(data, key) {
|
|
60
|
+
// default to the first key
|
|
61
|
+
key = key || this.#keys[0];
|
|
62
|
+
// url safe base64
|
|
63
|
+
return crypto
|
|
64
|
+
.createHmac(this.#hash, key)
|
|
65
|
+
.update(data)
|
|
66
|
+
.digest('base64')
|
|
67
|
+
.replace(/\/|\+|=/g, x => {
|
|
68
|
+
return replacer[x];
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
verify(data, digest) {
|
|
72
|
+
const keys = this.#keys;
|
|
73
|
+
for (let i = 0; i < keys.length; i++) {
|
|
74
|
+
const key = keys[i];
|
|
75
|
+
if (constantTimeCompare(Buffer.from(digest), Buffer.from(this.sign(data, key)))) {
|
|
76
|
+
debug('data %s match key %s, index: %d', data, key, i);
|
|
77
|
+
return i;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return -1;
|
|
81
|
+
}
|
|
18
82
|
}
|
|
19
|
-
var Keygrip = class {
|
|
20
|
-
#keys;
|
|
21
|
-
#hash = "sha256";
|
|
22
|
-
#cipher = "aes-256-cbc";
|
|
23
|
-
constructor(keys) {
|
|
24
|
-
assert(Array.isArray(keys) && keys.length > 0, "keys must be provided and should be an array");
|
|
25
|
-
this.#keys = keys;
|
|
26
|
-
}
|
|
27
|
-
encrypt(data, key) {
|
|
28
|
-
key = key || this.#keys[0];
|
|
29
|
-
const password = keyToPassword(key);
|
|
30
|
-
const cipher = crypto.createCipheriv(this.#cipher, password.key, password.iv);
|
|
31
|
-
return crypt(cipher, data);
|
|
32
|
-
}
|
|
33
|
-
decrypt(data) {
|
|
34
|
-
const keys = this.#keys;
|
|
35
|
-
for (let i = 0; i < keys.length; i++) {
|
|
36
|
-
const value = this.#decryptByKey(data, keys[i]);
|
|
37
|
-
if (value !== false) return {
|
|
38
|
-
value,
|
|
39
|
-
index: i
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
return false;
|
|
43
|
-
}
|
|
44
|
-
#decryptByKey(data, key) {
|
|
45
|
-
try {
|
|
46
|
-
const password = keyToPassword(key);
|
|
47
|
-
const cipher = crypto.createDecipheriv(this.#cipher, password.key, password.iv);
|
|
48
|
-
return crypt(cipher, data);
|
|
49
|
-
} catch (err) {
|
|
50
|
-
debug("crypt error: %s", err);
|
|
51
|
-
return false;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
sign(data, key) {
|
|
55
|
-
key = key || this.#keys[0];
|
|
56
|
-
return crypto.createHmac(this.#hash, key).update(data).digest("base64").replace(/\/|\+|=/g, (x) => {
|
|
57
|
-
return replacer[x];
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
verify(data, digest) {
|
|
61
|
-
const keys = this.#keys;
|
|
62
|
-
for (let i = 0; i < keys.length; i++) {
|
|
63
|
-
const key = keys[i];
|
|
64
|
-
if (constantTimeCompare(Buffer.from(digest), Buffer.from(this.sign(data, key)))) {
|
|
65
|
-
debug("data %s match key %s, index: %d", data, key, i);
|
|
66
|
-
return i;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
return -1;
|
|
70
|
-
}
|
|
71
|
-
};
|
|
72
83
|
function crypt(cipher, data) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
84
|
+
const text = Buffer.isBuffer(data) ? cipher.update(data) : cipher.update(data, 'utf-8');
|
|
85
|
+
const pad = cipher.final();
|
|
86
|
+
return Buffer.concat([text, pad]);
|
|
76
87
|
}
|
|
77
88
|
function keyToPassword(key) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
89
|
+
if (passwordCache.has(key)) {
|
|
90
|
+
return passwordCache.get(key);
|
|
91
|
+
}
|
|
92
|
+
// Simulate EVP_BytesToKey.
|
|
93
|
+
// see https://github.com/nodejs/help/issues/1673#issuecomment-503222925
|
|
94
|
+
const bytes = Buffer.alloc(KEY_LEN + IV_SIZE);
|
|
95
|
+
let lastHash = null, nBytes = 0;
|
|
96
|
+
while (nBytes < bytes.length) {
|
|
97
|
+
const hash = crypto.createHash('md5');
|
|
98
|
+
if (lastHash)
|
|
99
|
+
hash.update(lastHash);
|
|
100
|
+
hash.update(key);
|
|
101
|
+
lastHash = hash.digest();
|
|
102
|
+
lastHash.copy(bytes, nBytes);
|
|
103
|
+
nBytes += lastHash.length;
|
|
104
|
+
}
|
|
105
|
+
// Use these for decryption.
|
|
106
|
+
const password = {
|
|
107
|
+
key: bytes.subarray(0, KEY_LEN),
|
|
108
|
+
iv: bytes.subarray(KEY_LEN, bytes.length),
|
|
109
|
+
};
|
|
110
|
+
passwordCache.set(key, password);
|
|
111
|
+
return password;
|
|
95
112
|
}
|
|
96
|
-
|
|
97
|
-
//#endregion
|
|
98
|
-
export { Keygrip };
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5Z3JpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9rZXlncmlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxNQUFNLEVBQUUsRUFBaUIsTUFBTSxhQUFhLENBQUM7QUFDcEQsT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBRWpDLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRTlDLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQztBQUNuQixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUM7QUFDbkIsTUFBTSxhQUFhLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQUVoQyxNQUFNLFFBQVEsR0FBMkI7SUFDdkMsR0FBRyxFQUFFLEdBQUc7SUFDUixHQUFHLEVBQUUsR0FBRztJQUNSLEdBQUcsRUFBRSxFQUFFO0NBQ1IsQ0FBQztBQUVGLFNBQVMsbUJBQW1CLENBQUMsQ0FBUyxFQUFFLENBQVM7SUFDL0MsSUFBSSxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUMxQixPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3RDLENBQUM7QUFFRCxxREFBcUQ7QUFFckQsTUFBTSxPQUFPLE9BQU87SUFDVCxLQUFLLENBQVc7SUFDaEIsS0FBSyxHQUFHLFFBQVEsQ0FBQztJQUNqQixPQUFPLEdBQUcsYUFBYSxDQUFDO0lBRWpDLFlBQVksSUFBYztRQUN4QixNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSw4Q0FBOEMsQ0FBQyxDQUFDO1FBQy9GLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFD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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/cookies",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.21",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=22.18.0"
|
|
6
6
|
},
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"oxlint": "^1.19.0",
|
|
21
21
|
"typescript": "^5.9.3",
|
|
22
22
|
"tsdown": "^0.15.4",
|
|
23
|
-
"@eggjs/tsconfig": "3.1.0-beta.
|
|
23
|
+
"@eggjs/tsconfig": "3.1.0-beta.21"
|
|
24
24
|
},
|
|
25
25
|
"repository": {
|
|
26
26
|
"type": "git",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"./package.json": "./package.json"
|
|
43
43
|
},
|
|
44
44
|
"scripts": {
|
|
45
|
-
"build": "tsdown",
|
|
45
|
+
"build": "tsdown && rimraf dist && tsc -b --clean && tsc",
|
|
46
46
|
"typecheck": "tsc --noEmit",
|
|
47
47
|
"lint": "oxlint --type-aware",
|
|
48
48
|
"lint:fix": "npm run lint -- --fix",
|