@vibes.diy/identity 2.7.1 → 3.0.0
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/dash-api/token.js +2 -1
- package/dash-api/token.js.map +1 -1
- package/device-id/sign.d.ts +1 -1
- package/device-id/sign.js +10 -4
- package/device-id/sign.js.map +1 -1
- package/device-id/verify.d.ts +6 -1
- package/device-id/verify.js +37 -0
- package/device-id/verify.js.map +1 -1
- package/node.js +2 -2
- package/node.js.map +1 -1
- package/package.json +1 -1
package/dash-api/token.js
CHANGED
|
@@ -40,7 +40,8 @@ export class DeviceIdApiToken {
|
|
|
40
40
|
if (rCa.isErr()) {
|
|
41
41
|
return Result.Err(rCa);
|
|
42
42
|
}
|
|
43
|
-
const
|
|
43
|
+
const requireCASignature = this.sthis.env.get("DEVICE_ID_REQUIRE_CA_SIGNATURE") === "true";
|
|
44
|
+
const verify = new DeviceIdVerifyMsg(this.sthis.txt.base64, [rCa.Ok()], { maxAge: 3600, requireCASignature, ...this.opts });
|
|
44
45
|
const res = await verify.verifyWithCertificate(token, FPDeviceIDSessionSchema);
|
|
45
46
|
if (res.valid) {
|
|
46
47
|
const creatingUser = res.certificate.certificate.asCert()
|
package/dash-api/token.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../jsr/dash-api/token.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,OAAO,gBAAgB;IAClB,KAAK,CAAY;IACjB,IAAI,CAA+B;IAC5C,YAAY,KAAgB,EAAE,IAAkC;QAC9D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa;QACxB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3E,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;QAC7B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5D,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAE,GAAG,CAAC,EAAE,EAA8C,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACvH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa;QACxB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../jsr/dash-api/token.ts"],"names":[],"mappings":"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"}
|
package/device-id/sign.d.ts
CHANGED
|
@@ -3,6 +3,6 @@ import { DeviceIdKey } from "./key.js";
|
|
|
3
3
|
export declare class DeviceIdSignMsg {
|
|
4
4
|
#private;
|
|
5
5
|
readonly base64: BaseXXEndeCoder;
|
|
6
|
-
constructor(base64: BaseXXEndeCoder, key: DeviceIdKey, cert: CertificatePayload);
|
|
6
|
+
constructor(base64: BaseXXEndeCoder, key: DeviceIdKey, cert: CertificatePayload, certificateJWT?: string);
|
|
7
7
|
sign<T extends JWTPayload>(payload: T, algorithm?: string): Promise<string>;
|
|
8
8
|
}
|
package/device-id/sign.js
CHANGED
|
@@ -3,10 +3,12 @@ import { Certor } from "./certor.js";
|
|
|
3
3
|
export class DeviceIdSignMsg {
|
|
4
4
|
#key;
|
|
5
5
|
#cert;
|
|
6
|
+
#certificateJWT;
|
|
6
7
|
base64;
|
|
7
|
-
constructor(base64, key, cert) {
|
|
8
|
+
constructor(base64, key, cert, certificateJWT) {
|
|
8
9
|
this.#key = key;
|
|
9
10
|
this.#cert = cert;
|
|
11
|
+
this.#certificateJWT = certificateJWT;
|
|
10
12
|
this.base64 = base64;
|
|
11
13
|
}
|
|
12
14
|
async sign(payload, algorithm = "ES256") {
|
|
@@ -14,15 +16,19 @@ export class DeviceIdSignMsg {
|
|
|
14
16
|
const x5c = [certor.asBase64()];
|
|
15
17
|
const x5t = await certor.asSHA1();
|
|
16
18
|
const x5tS256 = await certor.asSHA256();
|
|
17
|
-
|
|
18
|
-
.setProtectedHeader({
|
|
19
|
+
const protectedHeader = {
|
|
19
20
|
alg: algorithm,
|
|
20
21
|
typ: "JWT",
|
|
21
22
|
kid: await calculateJwkThumbprint(await this.#key.publicKey(), "sha256"),
|
|
22
23
|
x5c: x5c,
|
|
23
24
|
x5t: x5t,
|
|
24
25
|
"x5t#S256": x5tS256,
|
|
25
|
-
}
|
|
26
|
+
};
|
|
27
|
+
if (this.#certificateJWT) {
|
|
28
|
+
protectedHeader["x5c#jwt"] = this.#certificateJWT;
|
|
29
|
+
}
|
|
30
|
+
return await new SignJWT(payload)
|
|
31
|
+
.setProtectedHeader(protectedHeader)
|
|
26
32
|
.setIssuedAt()
|
|
27
33
|
.setExpirationTime("1h")
|
|
28
34
|
.sign(await this.#key.exportPrivateJWK());
|
package/device-id/sign.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../jsr/device-id/sign.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../jsr/device-id/sign.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAA+D,MAAM,MAAM,CAAC;AAEpH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,MAAM,OAAO,eAAe;IACjB,IAAI,CAAc;IAClB,KAAK,CAAqB;IAC1B,eAAe,CAAU;IACzB,MAAM,CAAkB;IAEjC,YAAY,MAAuB,EAAE,GAAgB,EAAE,IAAwB,EAAE,cAAuB;QACtG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAuB,OAAU,EAAE,SAAS,GAAG,OAAO;QAC9D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,eAAe,GAAwB;YAC3C,GAAG,EAAE,SAAS;YACd,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC;YACxE,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;YACR,UAAU,EAAE,OAAO;SACpB,CAAC;QAIF,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,eAAe,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QACpD,CAAC;QACD,OAAO,MAAM,IAAI,OAAO,CAAC,OAAyB,CAAC;aAChD,kBAAkB,CAAC,eAAe,CAAC;aACnC,WAAW,EAAE;aACb,iBAAiB,CAAC,IAAI,CAAC;aACvB,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC9C,CAAC;CACF"}
|
package/device-id/verify.d.ts
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { Result } from "@adviser/cement";
|
|
2
2
|
import type { BaseXXEndeCoder, CertificatePayload } from "@fireproof/core-types-base";
|
|
3
3
|
import type { CACertResult, HeaderCertInfo, VerifyWithCertificateError, VerifyWithCertificateOptions, VerifyWithCertificateResult } from "@fireproof/core-types-device-id";
|
|
4
|
+
type DeviceIdVerifyOptions = VerifyWithCertificateOptions & {
|
|
5
|
+
readonly requireCASignature?: boolean;
|
|
6
|
+
};
|
|
4
7
|
export declare class DeviceIdVerifyMsg {
|
|
5
8
|
#private;
|
|
6
|
-
constructor(base64: BaseXXEndeCoder, trustedCAs: CACertResult[], options:
|
|
9
|
+
constructor(base64: BaseXXEndeCoder, trustedCAs: CACertResult[], options: DeviceIdVerifyOptions);
|
|
7
10
|
createVerifyWithCertificateError(error: Result<unknown>, partialResults?: Partial<VerifyWithCertificateError["partialResults"]>): VerifyWithCertificateError;
|
|
8
11
|
verifyWithCertificate<S>(jwt: string, schema?: S): Promise<VerifyWithCertificateResult<S>>;
|
|
9
12
|
extractCertificateFromJWT(jwt: string): Result<HeaderCertInfo>;
|
|
10
13
|
validateCertificateThumbprint(certInfo: HeaderCertInfo): Promise<Result<boolean>>;
|
|
11
14
|
validateCertificate(certor: HeaderCertInfo["certificate"]): Promise<Result<unknown>>;
|
|
12
15
|
findTrustedCA(cert: CertificatePayload, trustedCAs: CertificatePayload[]): CertificatePayload | undefined;
|
|
16
|
+
validateCertificateChainSignature(certInfo: HeaderCertInfo): Promise<Result<true>>;
|
|
13
17
|
getErrorCode(ierror: unknown): VerifyWithCertificateError["errorCode"];
|
|
14
18
|
}
|
|
19
|
+
export {};
|
package/device-id/verify.js
CHANGED
|
@@ -77,6 +77,14 @@ export class DeviceIdVerifyMsg {
|
|
|
77
77
|
jwtSignatureValid: true,
|
|
78
78
|
});
|
|
79
79
|
}
|
|
80
|
+
const rChain = await this.validateCertificateChainSignature(certInfo);
|
|
81
|
+
if (rChain.isErr()) {
|
|
82
|
+
return this.createVerifyWithCertificateError(rChain, {
|
|
83
|
+
certificateExtracted: true,
|
|
84
|
+
certificateInfo: certInfo,
|
|
85
|
+
jwtSignatureValid: true,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
80
88
|
if (certInfo.certificateChain.length > 1) {
|
|
81
89
|
return this.createVerifyWithCertificateError(Result.Err("Certificate chain validation not implemented"), {
|
|
82
90
|
certificateExtracted: true,
|
|
@@ -184,6 +192,33 @@ export class DeviceIdVerifyMsg {
|
|
|
184
192
|
}
|
|
185
193
|
});
|
|
186
194
|
}
|
|
195
|
+
async validateCertificateChainSignature(certInfo) {
|
|
196
|
+
const caJwt = certInfo.rawHeader?.["x5c#jwt"];
|
|
197
|
+
if (typeof caJwt !== "string" || caJwt.length === 0) {
|
|
198
|
+
if (this.#options.requireCASignature) {
|
|
199
|
+
return Result.Err(new Error("Certificate not trusted: missing CA chain signature (x5c#jwt)"));
|
|
200
|
+
}
|
|
201
|
+
return Result.Ok(true);
|
|
202
|
+
}
|
|
203
|
+
const cert = certInfo.certificate.asCert();
|
|
204
|
+
const trustedCA = this.findTrustedCA(cert, this.#trustedCAs);
|
|
205
|
+
if (!trustedCA) {
|
|
206
|
+
return Result.Err(new Error("Certificate not issued by a trusted CA"));
|
|
207
|
+
}
|
|
208
|
+
const rCaKey = await sts.importJWK(trustedCA.certificate.subjectPublicKeyInfo, "ES256");
|
|
209
|
+
if (rCaKey.isErr()) {
|
|
210
|
+
return Result.Err(rCaKey.Err());
|
|
211
|
+
}
|
|
212
|
+
const rVerified = await exception2Result(() => jwtVerify(caJwt, rCaKey.Ok().key, { typ: "CERT+JWT", algorithms: ["ES256"] }));
|
|
213
|
+
if (rVerified.isErr()) {
|
|
214
|
+
return Result.Err(new Error(`Certificate CA-signature verification failed: ${rVerified.Err().message}`));
|
|
215
|
+
}
|
|
216
|
+
const signedCert = Certor.fromUnverifiedJWT(this.#base64, caJwt);
|
|
217
|
+
if (signedCert.asBase64() !== certInfo.certificate.asBase64()) {
|
|
218
|
+
return Result.Err(new Error("Certificate not trusted: CA-signed cert does not match embedded certificate"));
|
|
219
|
+
}
|
|
220
|
+
return Result.Ok(true);
|
|
221
|
+
}
|
|
187
222
|
getErrorCode(ierror) {
|
|
188
223
|
const { message: errorMessage } = ierror;
|
|
189
224
|
if (errorMessage.includes("thumbprint mismatch"))
|
|
@@ -196,6 +231,8 @@ export class DeviceIdVerifyMsg {
|
|
|
196
231
|
return "CERT_SELF_SIGNED";
|
|
197
232
|
if (errorMessage.includes("not trusted"))
|
|
198
233
|
return "CERT_NOT_TRUSTED";
|
|
234
|
+
if (errorMessage.includes("CA-signature"))
|
|
235
|
+
return "CERT_NOT_TRUSTED";
|
|
199
236
|
if (errorMessage.includes("revoked"))
|
|
200
237
|
return "CERT_REVOKED";
|
|
201
238
|
if (errorMessage.includes("signature verification failed"))
|
package/device-id/verify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../jsr/device-id/verify.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../jsr/device-id/verify.ts"],"names":[],"mappings":"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"}
|
package/node.js
CHANGED
|
@@ -19,8 +19,8 @@ export async function createDeviceIdGetToken(sthis, opts) {
|
|
|
19
19
|
if (rDevkey.isErr()) {
|
|
20
20
|
throw rDevkey.Err();
|
|
21
21
|
}
|
|
22
|
-
const
|
|
23
|
-
const signer = new DeviceIdSignMsg(sthis.txt.base64, rDevkey.Ok(),
|
|
22
|
+
const certResult = devid.cert.Unwrap();
|
|
23
|
+
const signer = new DeviceIdSignMsg(sthis.txt.base64, rDevkey.Ok(), certResult.certificatePayload, certResult.certificateJWT);
|
|
24
24
|
let seq = 0;
|
|
25
25
|
return Lazy(async () => {
|
|
26
26
|
const now = Math.floor(Date.now() / 1000);
|
package/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../jsr/node.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAiBpF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,KAAgB,EAChB,IAAoE;IAEpE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,uDAAuD,CAAC,CAAC;IACtG,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACzE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../jsr/node.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAiBpF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,KAAgB,EAChB,IAAoE;IAEpE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,uDAAuD,CAAC,CAAC;IACtG,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACzE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAG,CAAC;IAKxC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,kBAAkB,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;IAC7H,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,OAAO,IAAI,CACT,KAAK,IAAmC,EAAE;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAC7B;YACE,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,GAAG,EAAE,WAAW;YAChB,QAAQ,EAAE,MAAM,OAAO,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE;YAC1C,GAAG,EAAE,EAAE,GAAG;YACV,GAAG,EAAE,GAAG,GAAG,GAAG;YACd,GAAG,EAAE,GAAG,GAAG,CAAC;YACZ,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG;SACI,EAC7B,OAAO,CACR,CAAC;QACF,OAAO,MAAM,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IACjD,CAAC,EACD,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CACpC,CAAC;AACJ,CAAC"}
|