@gerege-systems/eid-mongolia-sdk 0.19.0 → 0.20.1
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/README.md +58 -1
- package/dist/button.cjs +71 -8
- package/dist/button.d.cts +15 -1
- package/dist/button.d.ts +15 -1
- package/dist/button.js +71 -8
- package/dist/chunk-J7EG3VNQ.js +1955 -0
- package/dist/{chunk-6M7VPMJU.js → chunk-JV4NR4LG.js} +56 -13
- package/dist/convert.js +3 -1
- package/dist/fetch-BjfH46q9.d.cts +12 -0
- package/dist/fetch-BjfH46q9.d.ts +12 -0
- package/dist/index.cjs +46 -16
- package/dist/index.d.cts +5 -4
- package/dist/index.d.ts +5 -4
- package/dist/index.js +7 -6
- package/dist/pades.cjs +25 -13
- package/dist/pades.d.cts +1 -11
- package/dist/pades.d.ts +1 -11
- package/dist/pades.js +24 -1925
- package/dist/validate.cjs +5553 -0
- package/dist/validate.d.cts +102 -0
- package/dist/validate.d.ts +102 -0
- package/dist/validate.js +3476 -0
- package/package.json +9 -3
|
@@ -499,6 +499,8 @@ function schemeFor(alg) {
|
|
|
499
499
|
return { kind: "rsa", hash: "SHA-384" };
|
|
500
500
|
case OID.sha512WithRSA:
|
|
501
501
|
return { kind: "rsa", hash: "SHA-512" };
|
|
502
|
+
case "1.2.840.10045.4.1":
|
|
503
|
+
return { kind: "ecdsa", hash: "SHA-1" };
|
|
502
504
|
case OID.ecdsaSHA256:
|
|
503
505
|
return { kind: "ecdsa", hash: "SHA-256" };
|
|
504
506
|
case OID.ecdsaSHA384:
|
|
@@ -839,6 +841,9 @@ function lenOf(n) {
|
|
|
839
841
|
}
|
|
840
842
|
var OID_OCSP_BASIC = "1.3.6.1.5.5.7.48.1.1";
|
|
841
843
|
async function parseOCSPForCert(der, c, issuer) {
|
|
844
|
+
return parseOCSP(der, intValue(c.serial), issuer);
|
|
845
|
+
}
|
|
846
|
+
async function parseOCSP(der, serial, issuer) {
|
|
842
847
|
const top = children(expect(parseOne(der), TAG.SEQUENCE, "OCSPResponse"));
|
|
843
848
|
if (expect(top[0], TAG.ENUMERATED, "status").value[0] !== 0) throw new Error("OCSP response status");
|
|
844
849
|
const rb = children(expect(children(expect(top[1], 160, "responseBytes"))[0], TAG.SEQUENCE, "ResponseBytes"));
|
|
@@ -854,18 +859,22 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
854
859
|
if (rid.tag !== 161 && rid.tag !== 162) throw new Error("invalid responder id tag");
|
|
855
860
|
i++;
|
|
856
861
|
const responses = children(expect(tf[i], TAG.SEQUENCE, "responses"));
|
|
857
|
-
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
858
|
-
const serial = intValue(c.serial);
|
|
859
862
|
let single;
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
const
|
|
863
|
-
|
|
864
|
-
|
|
865
|
-
|
|
863
|
+
if (serial !== void 0) {
|
|
864
|
+
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
865
|
+
for (const r of responses) {
|
|
866
|
+
const f = children(r);
|
|
867
|
+
const cid2 = children(f[0]);
|
|
868
|
+
if (intValue(expect(cid2[3], TAG.INTEGER, "serial").value) === serial) {
|
|
869
|
+
single = f;
|
|
870
|
+
break;
|
|
871
|
+
}
|
|
866
872
|
}
|
|
873
|
+
if (!single) throw new Error("no response matching the supplied certificate");
|
|
874
|
+
} else {
|
|
875
|
+
if (responses.length !== 1) throw new Error("OCSP response contains bad number of responses");
|
|
876
|
+
single = children(responses[0]);
|
|
867
877
|
}
|
|
868
|
-
if (!single) throw new Error("no response matching the supplied certificate");
|
|
869
878
|
let certificate;
|
|
870
879
|
if (basic[3]?.tag === 160) {
|
|
871
880
|
const certs = children(expect(children(basic[3])[0], TAG.SEQUENCE, "certs"));
|
|
@@ -873,8 +882,8 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
873
882
|
}
|
|
874
883
|
if (certificate) {
|
|
875
884
|
if (!await verifySignature(certificate, sigAlg, tbs.raw, sigBits)) throw new Error("bad signature on embedded certificate");
|
|
876
|
-
if (!await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
877
|
-
} else if (!await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
885
|
+
if (issuer && !await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
886
|
+
} else if (issuer && !await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
878
887
|
throw new Error("bad OCSP signature");
|
|
879
888
|
}
|
|
880
889
|
const cid = children(single[0]);
|
|
@@ -883,6 +892,7 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
883
892
|
const st = single[1];
|
|
884
893
|
const status = st.tag === 128 ? "good" : st.tag === 161 ? "revoked" : st.tag === 130 ? "unknown" : void 0;
|
|
885
894
|
if (!status) throw new Error("OCSP certStatus");
|
|
895
|
+
const revokedAt = status === "revoked" ? parsePreciseTime(expect(children(st)[0], TAG.GeneralizedTime, "revocationTime")) : void 0;
|
|
886
896
|
const thisUpdate = parsePreciseTime(expect(single[2], TAG.GeneralizedTime, "thisUpdate"));
|
|
887
897
|
let nextUpdate;
|
|
888
898
|
for (const x of single.slice(3)) {
|
|
@@ -894,7 +904,30 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
894
904
|
}
|
|
895
905
|
}
|
|
896
906
|
}
|
|
897
|
-
return { status, thisUpdate, nextUpdate, certificate };
|
|
907
|
+
return { status, serial: intValue(expect(cid[3], TAG.INTEGER, "serial").value), thisUpdate, nextUpdate, revokedAt, certificate };
|
|
908
|
+
}
|
|
909
|
+
function sameCertKey(a, b) {
|
|
910
|
+
return equal(a.raw, b.raw) || equal(a.rawSubject, b.rawSubject) && equal(a.spki, b.spki);
|
|
911
|
+
}
|
|
912
|
+
async function parseOCSPFrom(der, serial, issuer) {
|
|
913
|
+
try {
|
|
914
|
+
return await parseOCSP(der, serial, issuer);
|
|
915
|
+
} catch (e) {
|
|
916
|
+
let alt;
|
|
917
|
+
try {
|
|
918
|
+
alt = await parseOCSP(der, serial, void 0);
|
|
919
|
+
} catch {
|
|
920
|
+
throw e;
|
|
921
|
+
}
|
|
922
|
+
if (alt.certificate && sameCertKey(alt.certificate, issuer) && await ocspSignedBy(der, issuer)) return alt;
|
|
923
|
+
throw e;
|
|
924
|
+
}
|
|
925
|
+
}
|
|
926
|
+
async function ocspSignedBy(der, k) {
|
|
927
|
+
const top = children(parseOne(der));
|
|
928
|
+
const rb = children(children(top[1])[0]);
|
|
929
|
+
const basic = children(parseOne(rb[1].value));
|
|
930
|
+
return verifySignature(k, basic[1], basic[0].raw, basic[2].value.subarray(1));
|
|
898
931
|
}
|
|
899
932
|
function responderOK(resp, issuer) {
|
|
900
933
|
if (!resp.certificate || equal(resp.certificate.raw, issuer.raw)) return true;
|
|
@@ -1046,13 +1079,21 @@ export {
|
|
|
1046
1079
|
ByteWriter,
|
|
1047
1080
|
TAG,
|
|
1048
1081
|
readNode,
|
|
1082
|
+
parseOne,
|
|
1049
1083
|
children,
|
|
1084
|
+
expect,
|
|
1050
1085
|
oidString,
|
|
1086
|
+
intValue,
|
|
1087
|
+
parsePreciseTime,
|
|
1088
|
+
subtle,
|
|
1051
1089
|
randomBytes,
|
|
1052
1090
|
sha256,
|
|
1053
1091
|
sha1,
|
|
1092
|
+
digest,
|
|
1054
1093
|
OID,
|
|
1055
1094
|
parseCertificate,
|
|
1095
|
+
isTSASigningCert,
|
|
1096
|
+
verifySignature,
|
|
1056
1097
|
verifyCitizen,
|
|
1057
1098
|
checkSignatureFrom,
|
|
1058
1099
|
CLAIMED_ROLE_MAX_RUNES,
|
|
@@ -1062,7 +1103,9 @@ export {
|
|
|
1062
1103
|
verifySignedData,
|
|
1063
1104
|
timestampToken,
|
|
1064
1105
|
ocspRequest,
|
|
1065
|
-
|
|
1106
|
+
parseOCSP,
|
|
1107
|
+
sameCertKey,
|
|
1108
|
+
parseOCSPFrom,
|
|
1066
1109
|
LTVError,
|
|
1067
1110
|
collectLTVWithWait
|
|
1068
1111
|
};
|
package/dist/convert.js
CHANGED
|
@@ -74,7 +74,7 @@ function zlibInflate(src, limit = 64 << 20) {
|
|
|
74
74
|
if (flg & 32) throw new InflateError("zlib: preset dictionary");
|
|
75
75
|
return inflateRaw(src.subarray(2), limit);
|
|
76
76
|
}
|
|
77
|
-
function inflateRaw(src, limit = 64 << 20) {
|
|
77
|
+
function inflateRaw(src, limit = 64 << 20, info) {
|
|
78
78
|
let pos = 0;
|
|
79
79
|
let bitBuf = 0;
|
|
80
80
|
let bitCnt = 0;
|
|
@@ -119,7 +119,9 @@ function inflateRaw(src, limit = 64 << 20) {
|
|
|
119
119
|
inflateBlocks();
|
|
120
120
|
} catch (e) {
|
|
121
121
|
if (!(e instanceof Truncated)) throw e;
|
|
122
|
+
if (info) info.truncated = true;
|
|
122
123
|
}
|
|
124
|
+
if (info) info.end = pos;
|
|
123
125
|
return out.slice(0, len);
|
|
124
126
|
function inflateBlocks() {
|
|
125
127
|
for (; ; ) {
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
type FetchFn = (url: string, init: {
|
|
2
|
+
method: string;
|
|
3
|
+
headers?: Record<string, string>;
|
|
4
|
+
body?: Uint8Array;
|
|
5
|
+
redirect: "manual";
|
|
6
|
+
signal?: AbortSignal;
|
|
7
|
+
}) => Promise<{
|
|
8
|
+
status: number;
|
|
9
|
+
arrayBuffer(): Promise<ArrayBuffer>;
|
|
10
|
+
}>;
|
|
11
|
+
|
|
12
|
+
export type { FetchFn as F };
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
type FetchFn = (url: string, init: {
|
|
2
|
+
method: string;
|
|
3
|
+
headers?: Record<string, string>;
|
|
4
|
+
body?: Uint8Array;
|
|
5
|
+
redirect: "manual";
|
|
6
|
+
signal?: AbortSignal;
|
|
7
|
+
}) => Promise<{
|
|
8
|
+
status: number;
|
|
9
|
+
arrayBuffer(): Promise<ArrayBuffer>;
|
|
10
|
+
}>;
|
|
11
|
+
|
|
12
|
+
export type { FetchFn as F };
|
package/dist/index.cjs
CHANGED
|
@@ -1904,7 +1904,7 @@ function hexSha256Equal(hex, data) {
|
|
|
1904
1904
|
if (typeof hex !== "string" || !/^[0-9a-fA-F]{64}$/.test(hex)) return false;
|
|
1905
1905
|
return (0, import_node_crypto4.timingSafeEqual)((0, import_node_crypto4.createHash)("sha256").update(data).digest(), Buffer.from(hex, "hex"));
|
|
1906
1906
|
}
|
|
1907
|
-
var TOKEN_CONFLICT_CODES = ["TOKEN_LIMIT_REACHED", "TOKEN_IN_USE", "TOKEN_SCOPE_CHANGE"];
|
|
1907
|
+
var TOKEN_CONFLICT_CODES = ["TOKEN_LIMIT_REACHED", "TOKEN_IN_USE", "TOKEN_SCOPE_CHANGE", "ACCOUNT_DELETE_PENDING"];
|
|
1908
1908
|
var DISCOVERY_PATH = "/.well-known/eid";
|
|
1909
1909
|
var TOKEN_RESULT_TIMEOUT_MS = 3e4;
|
|
1910
1910
|
var TokenApi = class {
|
|
@@ -2683,6 +2683,8 @@ function schemeFor(alg) {
|
|
|
2683
2683
|
return { kind: "rsa", hash: "SHA-384" };
|
|
2684
2684
|
case OID.sha512WithRSA:
|
|
2685
2685
|
return { kind: "rsa", hash: "SHA-512" };
|
|
2686
|
+
case "1.2.840.10045.4.1":
|
|
2687
|
+
return { kind: "ecdsa", hash: "SHA-1" };
|
|
2686
2688
|
case OID.ecdsaSHA256:
|
|
2687
2689
|
return { kind: "ecdsa", hash: "SHA-256" };
|
|
2688
2690
|
case OID.ecdsaSHA384:
|
|
@@ -2786,7 +2788,7 @@ function lenOf(n) {
|
|
|
2786
2788
|
return [128 | out.length, ...out];
|
|
2787
2789
|
}
|
|
2788
2790
|
var OID_OCSP_BASIC = "1.3.6.1.5.5.7.48.1.1";
|
|
2789
|
-
async function
|
|
2791
|
+
async function parseOCSP(der, serial, issuer) {
|
|
2790
2792
|
const top = children(expect(parseOne(der), TAG.SEQUENCE, "OCSPResponse"));
|
|
2791
2793
|
if (expect(top[0], TAG.ENUMERATED, "status").value[0] !== 0) throw new Error("OCSP response status");
|
|
2792
2794
|
const rb = children(expect(children(expect(top[1], 160, "responseBytes"))[0], TAG.SEQUENCE, "ResponseBytes"));
|
|
@@ -2802,18 +2804,22 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
2802
2804
|
if (rid.tag !== 161 && rid.tag !== 162) throw new Error("invalid responder id tag");
|
|
2803
2805
|
i++;
|
|
2804
2806
|
const responses = children(expect(tf[i], TAG.SEQUENCE, "responses"));
|
|
2805
|
-
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
2806
|
-
const serial = intValue(c.serial);
|
|
2807
2807
|
let single;
|
|
2808
|
-
|
|
2809
|
-
|
|
2810
|
-
const
|
|
2811
|
-
|
|
2812
|
-
|
|
2813
|
-
|
|
2808
|
+
if (serial !== void 0) {
|
|
2809
|
+
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
2810
|
+
for (const r of responses) {
|
|
2811
|
+
const f = children(r);
|
|
2812
|
+
const cid2 = children(f[0]);
|
|
2813
|
+
if (intValue(expect(cid2[3], TAG.INTEGER, "serial").value) === serial) {
|
|
2814
|
+
single = f;
|
|
2815
|
+
break;
|
|
2816
|
+
}
|
|
2814
2817
|
}
|
|
2818
|
+
if (!single) throw new Error("no response matching the supplied certificate");
|
|
2819
|
+
} else {
|
|
2820
|
+
if (responses.length !== 1) throw new Error("OCSP response contains bad number of responses");
|
|
2821
|
+
single = children(responses[0]);
|
|
2815
2822
|
}
|
|
2816
|
-
if (!single) throw new Error("no response matching the supplied certificate");
|
|
2817
2823
|
let certificate;
|
|
2818
2824
|
if (basic[3]?.tag === 160) {
|
|
2819
2825
|
const certs = children(expect(children(basic[3])[0], TAG.SEQUENCE, "certs"));
|
|
@@ -2821,8 +2827,8 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
2821
2827
|
}
|
|
2822
2828
|
if (certificate) {
|
|
2823
2829
|
if (!await verifySignature(certificate, sigAlg, tbs.raw, sigBits)) throw new Error("bad signature on embedded certificate");
|
|
2824
|
-
if (!await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
2825
|
-
} else if (!await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
2830
|
+
if (issuer && !await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
2831
|
+
} else if (issuer && !await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
2826
2832
|
throw new Error("bad OCSP signature");
|
|
2827
2833
|
}
|
|
2828
2834
|
const cid = children(single[0]);
|
|
@@ -2831,6 +2837,7 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
2831
2837
|
const st = single[1];
|
|
2832
2838
|
const status = st.tag === 128 ? "good" : st.tag === 161 ? "revoked" : st.tag === 130 ? "unknown" : void 0;
|
|
2833
2839
|
if (!status) throw new Error("OCSP certStatus");
|
|
2840
|
+
const revokedAt = status === "revoked" ? parsePreciseTime(expect(children(st)[0], TAG.GeneralizedTime, "revocationTime")) : void 0;
|
|
2834
2841
|
const thisUpdate = parsePreciseTime(expect(single[2], TAG.GeneralizedTime, "thisUpdate"));
|
|
2835
2842
|
let nextUpdate;
|
|
2836
2843
|
for (const x of single.slice(3)) {
|
|
@@ -2842,7 +2849,30 @@ async function parseOCSPForCert(der, c, issuer) {
|
|
|
2842
2849
|
}
|
|
2843
2850
|
}
|
|
2844
2851
|
}
|
|
2845
|
-
return { status, thisUpdate, nextUpdate, certificate };
|
|
2852
|
+
return { status, serial: intValue(expect(cid[3], TAG.INTEGER, "serial").value), thisUpdate, nextUpdate, revokedAt, certificate };
|
|
2853
|
+
}
|
|
2854
|
+
function sameCertKey(a, b) {
|
|
2855
|
+
return equal(a.raw, b.raw) || equal(a.rawSubject, b.rawSubject) && equal(a.spki, b.spki);
|
|
2856
|
+
}
|
|
2857
|
+
async function parseOCSPFrom(der, serial, issuer) {
|
|
2858
|
+
try {
|
|
2859
|
+
return await parseOCSP(der, serial, issuer);
|
|
2860
|
+
} catch (e) {
|
|
2861
|
+
let alt;
|
|
2862
|
+
try {
|
|
2863
|
+
alt = await parseOCSP(der, serial, void 0);
|
|
2864
|
+
} catch {
|
|
2865
|
+
throw e;
|
|
2866
|
+
}
|
|
2867
|
+
if (alt.certificate && sameCertKey(alt.certificate, issuer) && await ocspSignedBy(der, issuer)) return alt;
|
|
2868
|
+
throw e;
|
|
2869
|
+
}
|
|
2870
|
+
}
|
|
2871
|
+
async function ocspSignedBy(der, k) {
|
|
2872
|
+
const top = children(parseOne(der));
|
|
2873
|
+
const rb = children(children(top[1])[0]);
|
|
2874
|
+
const basic = children(parseOne(rb[1].value));
|
|
2875
|
+
return verifySignature(k, basic[1], basic[0].raw, basic[2].value.subarray(1));
|
|
2846
2876
|
}
|
|
2847
2877
|
|
|
2848
2878
|
// src/ocsp.ts
|
|
@@ -2876,10 +2906,10 @@ function ocspRevocationChecker(opts = {}) {
|
|
|
2876
2906
|
if (res.status !== 200) continue;
|
|
2877
2907
|
const der = new Uint8Array(await res.arrayBuffer());
|
|
2878
2908
|
if (der.length > MAX_BYTES) continue;
|
|
2879
|
-
const resp = await
|
|
2909
|
+
const resp = await parseOCSPFrom(der, intValue(leaf.serial), issuer);
|
|
2880
2910
|
const t = now();
|
|
2881
2911
|
const rc = resp.certificate;
|
|
2882
|
-
if (rc && !
|
|
2912
|
+
if (rc && !sameCertKey(rc, issuer)) {
|
|
2883
2913
|
if (!rc.extKeyUsage.includes(OID.kpOCSPSigning)) continue;
|
|
2884
2914
|
if (t < rc.notBefore.getTime() || t > rc.notAfter.getTime()) continue;
|
|
2885
2915
|
}
|
package/dist/index.d.cts
CHANGED
|
@@ -395,8 +395,8 @@ interface PersonCertificate {
|
|
|
395
395
|
/** Олгосон мөч (RFC 3339). Хуучин CA-д байхгүй. */
|
|
396
396
|
issuedAt?: string;
|
|
397
397
|
/**
|
|
398
|
-
* Цуцалсан мөч (RFC 3339) — REVOKED
|
|
399
|
-
* `revocationReason: "superseded"`) мөрд
|
|
398
|
+
* Цуцалсан мөч (RFC 3339) — REVOKED-д, мөн сунгалт/дахин бүртгэлээр солигдсон (status SUSPENDED,
|
|
399
|
+
* `revocationReason: "superseded"`) мөрд (CA !377-оос).
|
|
400
400
|
*/
|
|
401
401
|
revokedAt?: string;
|
|
402
402
|
/**
|
|
@@ -918,9 +918,10 @@ interface TokenLimit {
|
|
|
918
918
|
* - `TOKEN_LIMIT_REACHED` — иргэний токены хязгаар хүрсэн ({@link tokenLimitOf});
|
|
919
919
|
* - `TOKEN_IN_USE` — `tokenSerial` өөр иргэнд хүчинтэй гэрчилгээтэй бүртгэлтэй;
|
|
920
920
|
* - `TOKEN_SCOPE_CHANGE` — сунгалт scope-ийг солих гэсэн (хувийн ↔ байгууллага, эсвэл өөр `onBehalfOf`). Override
|
|
921
|
-
* байхгүй: иргэн eID апп-аас токеноо цуцалж (`/v3/mobile/tokens/{tokenSerial}/revoke`) байж шинэ scope-оор
|
|
921
|
+
* байхгүй: иргэн eID апп-аас токеноо цуцалж (`/v3/mobile/tokens/{tokenSerial}/revoke`) байж шинэ scope-оор олгуулна;
|
|
922
|
+
* - `ACCOUNT_DELETE_PENDING` — иргэн «Бүртгэл устгах» хүсэлт (PENDING) өгсөн: токен олгохгүй (CA !377).
|
|
922
923
|
*/
|
|
923
|
-
type TokenConflictCode = "TOKEN_LIMIT_REACHED" | "TOKEN_IN_USE" | "TOKEN_SCOPE_CHANGE";
|
|
924
|
+
type TokenConflictCode = "TOKEN_LIMIT_REACHED" | "TOKEN_IN_USE" | "TOKEN_SCOPE_CHANGE" | "ACCOUNT_DELETE_PENDING";
|
|
924
925
|
/** {@link TokenConflictCode}-ийн бүх утга (runtime шалгалтад). */
|
|
925
926
|
declare const TOKEN_CONFLICT_CODES: readonly TokenConflictCode[];
|
|
926
927
|
/** Discovery (`/.well-known/eid`)-ийн `tokenCertificate` блок. */
|
package/dist/index.d.ts
CHANGED
|
@@ -395,8 +395,8 @@ interface PersonCertificate {
|
|
|
395
395
|
/** Олгосон мөч (RFC 3339). Хуучин CA-д байхгүй. */
|
|
396
396
|
issuedAt?: string;
|
|
397
397
|
/**
|
|
398
|
-
* Цуцалсан мөч (RFC 3339) — REVOKED
|
|
399
|
-
* `revocationReason: "superseded"`) мөрд
|
|
398
|
+
* Цуцалсан мөч (RFC 3339) — REVOKED-д, мөн сунгалт/дахин бүртгэлээр солигдсон (status SUSPENDED,
|
|
399
|
+
* `revocationReason: "superseded"`) мөрд (CA !377-оос).
|
|
400
400
|
*/
|
|
401
401
|
revokedAt?: string;
|
|
402
402
|
/**
|
|
@@ -918,9 +918,10 @@ interface TokenLimit {
|
|
|
918
918
|
* - `TOKEN_LIMIT_REACHED` — иргэний токены хязгаар хүрсэн ({@link tokenLimitOf});
|
|
919
919
|
* - `TOKEN_IN_USE` — `tokenSerial` өөр иргэнд хүчинтэй гэрчилгээтэй бүртгэлтэй;
|
|
920
920
|
* - `TOKEN_SCOPE_CHANGE` — сунгалт scope-ийг солих гэсэн (хувийн ↔ байгууллага, эсвэл өөр `onBehalfOf`). Override
|
|
921
|
-
* байхгүй: иргэн eID апп-аас токеноо цуцалж (`/v3/mobile/tokens/{tokenSerial}/revoke`) байж шинэ scope-оор
|
|
921
|
+
* байхгүй: иргэн eID апп-аас токеноо цуцалж (`/v3/mobile/tokens/{tokenSerial}/revoke`) байж шинэ scope-оор олгуулна;
|
|
922
|
+
* - `ACCOUNT_DELETE_PENDING` — иргэн «Бүртгэл устгах» хүсэлт (PENDING) өгсөн: токен олгохгүй (CA !377).
|
|
922
923
|
*/
|
|
923
|
-
type TokenConflictCode = "TOKEN_LIMIT_REACHED" | "TOKEN_IN_USE" | "TOKEN_SCOPE_CHANGE";
|
|
924
|
+
type TokenConflictCode = "TOKEN_LIMIT_REACHED" | "TOKEN_IN_USE" | "TOKEN_SCOPE_CHANGE" | "ACCOUNT_DELETE_PENDING";
|
|
924
925
|
/** {@link TokenConflictCode}-ийн бүх утга (runtime шалгалтад). */
|
|
925
926
|
declare const TOKEN_CONFLICT_CODES: readonly TokenConflictCode[];
|
|
926
927
|
/** Discovery (`/.well-known/eid`)-ийн `tokenCertificate` блок. */
|
package/dist/index.js
CHANGED
|
@@ -5,11 +5,12 @@ import {
|
|
|
5
5
|
INTERMEDIATES,
|
|
6
6
|
NATIONAL_ROOT,
|
|
7
7
|
OID,
|
|
8
|
-
|
|
8
|
+
intValue,
|
|
9
9
|
ocspRequest,
|
|
10
10
|
parseCertificate,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
parseOCSPFrom,
|
|
12
|
+
sameCertKey
|
|
13
|
+
} from "./chunk-JV4NR4LG.js";
|
|
13
14
|
import {
|
|
14
15
|
ApiError,
|
|
15
16
|
AuthenticationError,
|
|
@@ -1674,7 +1675,7 @@ function hexSha256Equal(hex, data) {
|
|
|
1674
1675
|
if (typeof hex !== "string" || !/^[0-9a-fA-F]{64}$/.test(hex)) return false;
|
|
1675
1676
|
return timingSafeEqual(createHash3("sha256").update(data).digest(), Buffer.from(hex, "hex"));
|
|
1676
1677
|
}
|
|
1677
|
-
var TOKEN_CONFLICT_CODES = ["TOKEN_LIMIT_REACHED", "TOKEN_IN_USE", "TOKEN_SCOPE_CHANGE"];
|
|
1678
|
+
var TOKEN_CONFLICT_CODES = ["TOKEN_LIMIT_REACHED", "TOKEN_IN_USE", "TOKEN_SCOPE_CHANGE", "ACCOUNT_DELETE_PENDING"];
|
|
1678
1679
|
var DISCOVERY_PATH = "/.well-known/eid";
|
|
1679
1680
|
var TOKEN_RESULT_TIMEOUT_MS = 3e4;
|
|
1680
1681
|
var TokenApi = class {
|
|
@@ -2108,10 +2109,10 @@ function ocspRevocationChecker(opts = {}) {
|
|
|
2108
2109
|
if (res.status !== 200) continue;
|
|
2109
2110
|
const der = new Uint8Array(await res.arrayBuffer());
|
|
2110
2111
|
if (der.length > MAX_BYTES) continue;
|
|
2111
|
-
const resp = await
|
|
2112
|
+
const resp = await parseOCSPFrom(der, intValue(leaf.serial), issuer);
|
|
2112
2113
|
const t = now();
|
|
2113
2114
|
const rc = resp.certificate;
|
|
2114
|
-
if (rc && !
|
|
2115
|
+
if (rc && !sameCertKey(rc, issuer)) {
|
|
2115
2116
|
if (!rc.extKeyUsage.includes(OID.kpOCSPSigning)) continue;
|
|
2116
2117
|
if (t < rc.notBefore.getTime() || t > rc.notAfter.getTime()) continue;
|
|
2117
2118
|
}
|
package/dist/pades.cjs
CHANGED
|
@@ -538,6 +538,8 @@ function schemeFor(alg) {
|
|
|
538
538
|
return { kind: "rsa", hash: "SHA-384" };
|
|
539
539
|
case OID.sha512WithRSA:
|
|
540
540
|
return { kind: "rsa", hash: "SHA-512" };
|
|
541
|
+
case "1.2.840.10045.4.1":
|
|
542
|
+
return { kind: "ecdsa", hash: "SHA-1" };
|
|
541
543
|
case OID.ecdsaSHA256:
|
|
542
544
|
return { kind: "ecdsa", hash: "SHA-256" };
|
|
543
545
|
case OID.ecdsaSHA384:
|
|
@@ -944,6 +946,9 @@ function lenOf(n) {
|
|
|
944
946
|
}
|
|
945
947
|
var OID_OCSP_BASIC = "1.3.6.1.5.5.7.48.1.1";
|
|
946
948
|
async function parseOCSPForCert(der2, c, issuer) {
|
|
949
|
+
return parseOCSP(der2, intValue(c.serial), issuer);
|
|
950
|
+
}
|
|
951
|
+
async function parseOCSP(der2, serial, issuer) {
|
|
947
952
|
const top = children(expect(parseOne(der2), TAG.SEQUENCE, "OCSPResponse"));
|
|
948
953
|
if (expect(top[0], TAG.ENUMERATED, "status").value[0] !== 0) throw new Error("OCSP response status");
|
|
949
954
|
const rb = children(expect(children(expect(top[1], 160, "responseBytes"))[0], TAG.SEQUENCE, "ResponseBytes"));
|
|
@@ -959,18 +964,22 @@ async function parseOCSPForCert(der2, c, issuer) {
|
|
|
959
964
|
if (rid.tag !== 161 && rid.tag !== 162) throw new Error("invalid responder id tag");
|
|
960
965
|
i++;
|
|
961
966
|
const responses = children(expect(tf[i], TAG.SEQUENCE, "responses"));
|
|
962
|
-
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
963
|
-
const serial = intValue(c.serial);
|
|
964
967
|
let single;
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
const
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
968
|
+
if (serial !== void 0) {
|
|
969
|
+
if (responses.length === 0) throw new Error("OCSP response contains bad number of responses");
|
|
970
|
+
for (const r of responses) {
|
|
971
|
+
const f = children(r);
|
|
972
|
+
const cid2 = children(f[0]);
|
|
973
|
+
if (intValue(expect(cid2[3], TAG.INTEGER, "serial").value) === serial) {
|
|
974
|
+
single = f;
|
|
975
|
+
break;
|
|
976
|
+
}
|
|
971
977
|
}
|
|
978
|
+
if (!single) throw new Error("no response matching the supplied certificate");
|
|
979
|
+
} else {
|
|
980
|
+
if (responses.length !== 1) throw new Error("OCSP response contains bad number of responses");
|
|
981
|
+
single = children(responses[0]);
|
|
972
982
|
}
|
|
973
|
-
if (!single) throw new Error("no response matching the supplied certificate");
|
|
974
983
|
let certificate;
|
|
975
984
|
if (basic[3]?.tag === 160) {
|
|
976
985
|
const certs = children(expect(children(basic[3])[0], TAG.SEQUENCE, "certs"));
|
|
@@ -978,8 +987,8 @@ async function parseOCSPForCert(der2, c, issuer) {
|
|
|
978
987
|
}
|
|
979
988
|
if (certificate) {
|
|
980
989
|
if (!await verifySignature(certificate, sigAlg, tbs.raw, sigBits)) throw new Error("bad signature on embedded certificate");
|
|
981
|
-
if (!await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
982
|
-
} else if (!await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
990
|
+
if (issuer && !await checkSignature(issuer, certificate.sigAlg, certificate.tbs, certificate.signature)) throw new Error("bad OCSP signature");
|
|
991
|
+
} else if (issuer && !await verifySignature(issuer, sigAlg, tbs.raw, sigBits)) {
|
|
983
992
|
throw new Error("bad OCSP signature");
|
|
984
993
|
}
|
|
985
994
|
const cid = children(single[0]);
|
|
@@ -988,6 +997,7 @@ async function parseOCSPForCert(der2, c, issuer) {
|
|
|
988
997
|
const st = single[1];
|
|
989
998
|
const status = st.tag === 128 ? "good" : st.tag === 161 ? "revoked" : st.tag === 130 ? "unknown" : void 0;
|
|
990
999
|
if (!status) throw new Error("OCSP certStatus");
|
|
1000
|
+
const revokedAt = status === "revoked" ? parsePreciseTime(expect(children(st)[0], TAG.GeneralizedTime, "revocationTime")) : void 0;
|
|
991
1001
|
const thisUpdate = parsePreciseTime(expect(single[2], TAG.GeneralizedTime, "thisUpdate"));
|
|
992
1002
|
let nextUpdate;
|
|
993
1003
|
for (const x of single.slice(3)) {
|
|
@@ -999,7 +1009,7 @@ async function parseOCSPForCert(der2, c, issuer) {
|
|
|
999
1009
|
}
|
|
1000
1010
|
}
|
|
1001
1011
|
}
|
|
1002
|
-
return { status, thisUpdate, nextUpdate, certificate };
|
|
1012
|
+
return { status, serial: intValue(expect(cid[3], TAG.INTEGER, "serial").value), thisUpdate, nextUpdate, revokedAt, certificate };
|
|
1003
1013
|
}
|
|
1004
1014
|
function responderOK(resp, issuer) {
|
|
1005
1015
|
if (!resp.certificate || equal(resp.certificate.raw, issuer.raw)) return true;
|
|
@@ -1211,7 +1221,7 @@ function zlibInflate(src, limit = 64 << 20) {
|
|
|
1211
1221
|
if (flg & 32) throw new InflateError("zlib: preset dictionary");
|
|
1212
1222
|
return inflateRaw(src.subarray(2), limit);
|
|
1213
1223
|
}
|
|
1214
|
-
function inflateRaw(src, limit = 64 << 20) {
|
|
1224
|
+
function inflateRaw(src, limit = 64 << 20, info) {
|
|
1215
1225
|
let pos = 0;
|
|
1216
1226
|
let bitBuf = 0;
|
|
1217
1227
|
let bitCnt = 0;
|
|
@@ -1256,7 +1266,9 @@ function inflateRaw(src, limit = 64 << 20) {
|
|
|
1256
1266
|
inflateBlocks();
|
|
1257
1267
|
} catch (e) {
|
|
1258
1268
|
if (!(e instanceof Truncated)) throw e;
|
|
1269
|
+
if (info) info.truncated = true;
|
|
1259
1270
|
}
|
|
1271
|
+
if (info) info.end = pos;
|
|
1260
1272
|
return out.slice(0, len);
|
|
1261
1273
|
function inflateBlocks() {
|
|
1262
1274
|
for (; ; ) {
|
package/dist/pades.d.cts
CHANGED
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import { E as EidError } from './errors-xTmsGXyo.cjs';
|
|
2
|
-
|
|
3
|
-
type FetchFn = (url: string, init: {
|
|
4
|
-
method: string;
|
|
5
|
-
headers?: Record<string, string>;
|
|
6
|
-
body?: Uint8Array;
|
|
7
|
-
redirect: "manual";
|
|
8
|
-
signal?: AbortSignal;
|
|
9
|
-
}) => Promise<{
|
|
10
|
-
status: number;
|
|
11
|
-
arrayBuffer(): Promise<ArrayBuffer>;
|
|
12
|
-
}>;
|
|
2
|
+
import { F as FetchFn } from './fetch-BjfH46q9.cjs';
|
|
13
3
|
|
|
14
4
|
/** PDF/CMS профайлын хувилбар (Go reference `ProfileVersion`). */
|
|
15
5
|
declare const PROFILE_VERSION = "pades-client/1";
|
package/dist/pades.d.ts
CHANGED
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import { E as EidError } from './errors-xTmsGXyo.js';
|
|
2
|
-
|
|
3
|
-
type FetchFn = (url: string, init: {
|
|
4
|
-
method: string;
|
|
5
|
-
headers?: Record<string, string>;
|
|
6
|
-
body?: Uint8Array;
|
|
7
|
-
redirect: "manual";
|
|
8
|
-
signal?: AbortSignal;
|
|
9
|
-
}) => Promise<{
|
|
10
|
-
status: number;
|
|
11
|
-
arrayBuffer(): Promise<ArrayBuffer>;
|
|
12
|
-
}>;
|
|
2
|
+
import { F as FetchFn } from './fetch-BjfH46q9.js';
|
|
13
3
|
|
|
14
4
|
/** PDF/CMS профайлын хувилбар (Go reference `ProfileVersion`). */
|
|
15
5
|
declare const PROFILE_VERSION = "pades-client/1";
|