@harrylabsj/kiwi 0.7.8 → 0.7.9
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/product-cli.d.ts
CHANGED
|
@@ -42,7 +42,7 @@ export declare const DEFAULT_PROFILE_PATH: string;
|
|
|
42
42
|
*/
|
|
43
43
|
export declare function writeDefaultProfile(yaml: string, profilePath?: string): void;
|
|
44
44
|
/** 与 package.json / USAGE 同步的产品版本。 */
|
|
45
|
-
export declare const PRODUCT_VERSION = "0.7.
|
|
45
|
+
export declare const PRODUCT_VERSION = "0.7.9";
|
|
46
46
|
/**
|
|
47
47
|
* 缺省 kiwi-catalog 地址（单一来源，cli.ts 各处解析一致）。
|
|
48
48
|
*
|
package/dist/product-cli.js
CHANGED
|
@@ -51,7 +51,7 @@ export function writeDefaultProfile(yaml, profilePath) {
|
|
|
51
51
|
writeFileSync(target, yaml, { mode: 0o600 });
|
|
52
52
|
}
|
|
53
53
|
/** 与 package.json / USAGE 同步的产品版本。 */
|
|
54
|
-
export const PRODUCT_VERSION = "0.7.
|
|
54
|
+
export const PRODUCT_VERSION = "0.7.9";
|
|
55
55
|
/**
|
|
56
56
|
* 缺省 kiwi-catalog 地址（单一来源，cli.ts 各处解析一致）。
|
|
57
57
|
*
|
|
@@ -99,6 +99,8 @@ export declare class HttpMessageSignatureVerifier implements AuthVerifier {
|
|
|
99
99
|
private readonly maxClockSkewSeconds;
|
|
100
100
|
private readonly maxSignatureAgeSeconds;
|
|
101
101
|
private readonly expectedAuthority;
|
|
102
|
+
/** scheme 是否显式配置（公网 https 节点经反代终结 TLS 时必须显式 https）。 */
|
|
103
|
+
private readonly schemeExplicit;
|
|
102
104
|
constructor(options: HttpMessageSignatureVerifierOptions);
|
|
103
105
|
verify(ctx: AuthContext): AuthResult;
|
|
104
106
|
}
|
|
@@ -62,12 +62,15 @@ export class HttpMessageSignatureVerifier {
|
|
|
62
62
|
maxClockSkewSeconds;
|
|
63
63
|
maxSignatureAgeSeconds;
|
|
64
64
|
expectedAuthority;
|
|
65
|
+
/** scheme 是否显式配置（公网 https 节点经反代终结 TLS 时必须显式 https）。 */
|
|
66
|
+
schemeExplicit;
|
|
65
67
|
constructor(options) {
|
|
66
68
|
this.resolver = options.resolver;
|
|
67
69
|
this.policy = options.policy ?? DEFAULT_TRUST_POLICY;
|
|
68
70
|
this.nonceStore = options.nonceStore;
|
|
69
71
|
this.now = options.now ?? (() => Math.floor(Date.now() / 1000));
|
|
70
72
|
this.scheme = options.scheme ?? "http";
|
|
73
|
+
this.schemeExplicit = options.scheme !== undefined;
|
|
71
74
|
this.anonymousTrustLevel = options.anonymousTrustLevel ?? "T0";
|
|
72
75
|
this.anonymousIdentity = options.anonymousIdentity ?? "anonymous";
|
|
73
76
|
this.verifyCardJws = options.verifyCardJws;
|
|
@@ -90,7 +93,14 @@ export class HttpMessageSignatureVerifier {
|
|
|
90
93
|
}
|
|
91
94
|
// 签名请求：重建 @target-uri / @authority（服务端只有 origin-form req.url）。
|
|
92
95
|
const authority = headerValue(headers, "host") ?? "";
|
|
93
|
-
|
|
96
|
+
// scheme 优先级：节点**显式**配置了 scheme + expectedAuthority（声明固定公网
|
|
97
|
+
// 身份，如 https://veyquo.com，反代终结 TLS、本地 socket 是 http）时，
|
|
98
|
+
// @target-uri 必须用节点声明的 scheme——否则签名者按 https 签、节点按本地 http
|
|
99
|
+
// 重建，验签必败。scheme 未显式配置（默认 http）时维持 ctx.scheme 优先（兼容
|
|
100
|
+
// 未配置身份的既有调用方）。
|
|
101
|
+
const scheme = this.schemeExplicit && this.expectedAuthority !== undefined
|
|
102
|
+
? this.scheme
|
|
103
|
+
: (ctx.scheme ?? this.scheme);
|
|
94
104
|
const targetUri = ctx.url.startsWith("http://") || ctx.url.startsWith("https://")
|
|
95
105
|
? ctx.url
|
|
96
106
|
: `${scheme}://${authority}${ctx.url}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-verifier.js","sourceRoot":"","sources":["../../../src/trust/identity/auth-verifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAyBH,OAAO,EAAE,YAAY,EAAgD,MAAM,uBAAuB,CAAC;AAEnG,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,oBAAoB,GAGrB,MAAM,mBAAmB,CAAC;AAE3B,iCAAiC;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAClD,yCAAyC;AACzC,MAAM,CAAC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAmCjE;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,OAAsD;IAEtD,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAC5D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7F,MAAM,GAAG,GAAG,MAAiC,CAAC;IAC9C,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAClE,IAAI,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ;QAAE,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;IAC9E,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU;QAAE,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACzE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wDAAwD;AACxD,MAAM,OAAO,4BAA4B;IAC9B,IAAI,GAAG,wBAAwB,CAAC;IACxB,QAAQ,CAAc;IACtB,MAAM,CAAc;IACpB,UAAU,CAAyB;IACnC,GAAG,CAAe;IAClB,MAAM,CAAmB;IACzB,mBAAmB,CAAa;IAChC,iBAAiB,CAAS;IAC1B,aAAa,CAA2D;IACxE,mBAAmB,CAAS;IAC5B,sBAAsB,CAAS;IAC/B,iBAAiB,CAAqB;
|
|
1
|
+
{"version":3,"file":"auth-verifier.js","sourceRoot":"","sources":["../../../src/trust/identity/auth-verifier.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED