@gerege-systems/eid-mongolia-sdk 0.25.0 → 0.26.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/README.md +2 -1
- package/dist/{chunk-CRXEUCMP.js → chunk-YRL4CWWI.js} +31 -6
- package/dist/pades.cjs +33 -8
- package/dist/pades.d.cts +5 -1
- package/dist/pades.d.ts +5 -1
- package/dist/pades.js +5 -5
- package/dist/validate.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -624,7 +624,8 @@ reply({ verifyUrl: reg.verifyUrl });
|
|
|
624
624
|
**Харагдах гарын үсэг (сонголттой).** `appearance: { page?, x, y, width, height, lang? }` өгвөл гарын үсэг хуудсан дээр
|
|
625
625
|
харагдана (QR + нэр, `claimedRole`, «eID Mongolia-аар зурсан», огноо `YYYY-MM-DD HH:MM (+08)`); байхгүй бол үл харагдах
|
|
626
626
|
(өмнөхтэй байт-ижил). Координат pt-ээр, хуудасны CropBox-ийн `/Rotate`-ийн дараах (дэлгэцэнд харагдах) зүүн доод булангаас;
|
|
627
|
-
`page` 1-ээс (
|
|
627
|
+
`page` 1-ээс (байхгүй/0 = оролтын eID verify хуудас БИШ сүүлийн хуудас — энэ prepare-ийн нэмэх ба өмнөх гарын үсгүүдийн
|
|
628
|
+
нэмсэн verify хуудас тооцогдохгүй (0.26.0+); тодорхой дугаар нь verify хуудас байсан ч хэвээр). Өндөр ≥ 45 pt; хуудаснаас гарах, бичвэр
|
|
628
629
|
багтахгүй, docId-гүй (хуудасгүй гарын үсэгтэй баримт) бол `REQUEST_INVALID`. Харагдах бүр ~+90 KB. Дүрэм: Go репогийн
|
|
629
630
|
`pades/APPEARANCE_SPEC.md`.
|
|
630
631
|
|
|
@@ -2285,14 +2285,15 @@ function nthPage(root, n) {
|
|
|
2285
2285
|
};
|
|
2286
2286
|
return walk(root, 0);
|
|
2287
2287
|
}
|
|
2288
|
-
|
|
2288
|
+
var MAX_VERIFY_ANNOTS = 1e4;
|
|
2289
|
+
function defaultStampPage(doc, verifyUri) {
|
|
2289
2290
|
const inc = new Incremental(doc);
|
|
2290
|
-
|
|
2291
|
+
const pages = [];
|
|
2291
2292
|
const walk = (v, depth) => {
|
|
2292
|
-
if (depth > MAX_DEPTH2 ||
|
|
2293
|
+
if (depth > MAX_DEPTH2 || pages.length > 1 << 16) return;
|
|
2293
2294
|
switch (v.key("Type").name()) {
|
|
2294
2295
|
case "Page":
|
|
2295
|
-
|
|
2296
|
+
pages.push(v);
|
|
2296
2297
|
break;
|
|
2297
2298
|
case "Pages": {
|
|
2298
2299
|
const kids = v.key("Kids");
|
|
@@ -2301,7 +2302,31 @@ function pageCount(doc) {
|
|
|
2301
2302
|
}
|
|
2302
2303
|
};
|
|
2303
2304
|
walk(inc.root().key("Pages"), 0);
|
|
2304
|
-
|
|
2305
|
+
const n = pages.length;
|
|
2306
|
+
for (let i = n - 1; i >= 0; i--) {
|
|
2307
|
+
if (!isVerifyPage(pages[i], verifyUri)) return { page: i + 1, n };
|
|
2308
|
+
}
|
|
2309
|
+
return { page: n, n };
|
|
2310
|
+
}
|
|
2311
|
+
function isVerifyPage(page, verifyUri) {
|
|
2312
|
+
try {
|
|
2313
|
+
const annots = page.key("Annots");
|
|
2314
|
+
if (annots.kind() !== "array") return false;
|
|
2315
|
+
const want = latin1(verifyUri);
|
|
2316
|
+
const m = Math.min(annots.len(), MAX_VERIFY_ANNOTS);
|
|
2317
|
+
for (let i = 0; i < m; i++) {
|
|
2318
|
+
const a = annots.index(i);
|
|
2319
|
+
if (a.kind() !== "dict" || a.key("Subtype").name() !== "Link") continue;
|
|
2320
|
+
const act = a.key("A");
|
|
2321
|
+
if (act.kind() !== "dict" || act.key("S").name() !== "URI") continue;
|
|
2322
|
+
const u = act.key("URI");
|
|
2323
|
+
if (u.kind() !== "string") continue;
|
|
2324
|
+
const got = u.rawString();
|
|
2325
|
+
if (got.length === want.length && got.every((b, j) => b === want[j])) return true;
|
|
2326
|
+
}
|
|
2327
|
+
} catch {
|
|
2328
|
+
}
|
|
2329
|
+
return false;
|
|
2305
2330
|
}
|
|
2306
2331
|
|
|
2307
2332
|
export {
|
|
@@ -2330,5 +2355,5 @@ export {
|
|
|
2330
2355
|
visibleRect,
|
|
2331
2356
|
pageGeometry,
|
|
2332
2357
|
nthPage,
|
|
2333
|
-
|
|
2358
|
+
defaultStampPage
|
|
2334
2359
|
};
|
package/dist/pades.cjs
CHANGED
|
@@ -3543,14 +3543,15 @@ function nthPage(root, n) {
|
|
|
3543
3543
|
};
|
|
3544
3544
|
return walk(root, 0);
|
|
3545
3545
|
}
|
|
3546
|
-
|
|
3546
|
+
var MAX_VERIFY_ANNOTS = 1e4;
|
|
3547
|
+
function defaultStampPage(doc, verifyUri) {
|
|
3547
3548
|
const inc = new Incremental(doc);
|
|
3548
|
-
|
|
3549
|
+
const pages = [];
|
|
3549
3550
|
const walk = (v, depth) => {
|
|
3550
|
-
if (depth > MAX_DEPTH2 ||
|
|
3551
|
+
if (depth > MAX_DEPTH2 || pages.length > 1 << 16) return;
|
|
3551
3552
|
switch (v.key("Type").name()) {
|
|
3552
3553
|
case "Page":
|
|
3553
|
-
|
|
3554
|
+
pages.push(v);
|
|
3554
3555
|
break;
|
|
3555
3556
|
case "Pages": {
|
|
3556
3557
|
const kids = v.key("Kids");
|
|
@@ -3559,7 +3560,31 @@ function pageCount(doc) {
|
|
|
3559
3560
|
}
|
|
3560
3561
|
};
|
|
3561
3562
|
walk(inc.root().key("Pages"), 0);
|
|
3562
|
-
|
|
3563
|
+
const n = pages.length;
|
|
3564
|
+
for (let i = n - 1; i >= 0; i--) {
|
|
3565
|
+
if (!isVerifyPage(pages[i], verifyUri)) return { page: i + 1, n };
|
|
3566
|
+
}
|
|
3567
|
+
return { page: n, n };
|
|
3568
|
+
}
|
|
3569
|
+
function isVerifyPage(page, verifyUri) {
|
|
3570
|
+
try {
|
|
3571
|
+
const annots = page.key("Annots");
|
|
3572
|
+
if (annots.kind() !== "array") return false;
|
|
3573
|
+
const want = latin1(verifyUri);
|
|
3574
|
+
const m = Math.min(annots.len(), MAX_VERIFY_ANNOTS);
|
|
3575
|
+
for (let i = 0; i < m; i++) {
|
|
3576
|
+
const a = annots.index(i);
|
|
3577
|
+
if (a.kind() !== "dict" || a.key("Subtype").name() !== "Link") continue;
|
|
3578
|
+
const act = a.key("A");
|
|
3579
|
+
if (act.kind() !== "dict" || act.key("S").name() !== "URI") continue;
|
|
3580
|
+
const u = act.key("URI");
|
|
3581
|
+
if (u.kind() !== "string") continue;
|
|
3582
|
+
const got = u.rawString();
|
|
3583
|
+
if (got.length === want.length && got.every((b, j) => b === want[j])) return true;
|
|
3584
|
+
}
|
|
3585
|
+
} catch {
|
|
3586
|
+
}
|
|
3587
|
+
return false;
|
|
3563
3588
|
}
|
|
3564
3589
|
|
|
3565
3590
|
// src/pades/pdf/dss.ts
|
|
@@ -5219,13 +5244,13 @@ function checkAppearance(o) {
|
|
|
5219
5244
|
function visibleSpec(doc, o, name, now, docId, revIndex) {
|
|
5220
5245
|
const a = o.appearance;
|
|
5221
5246
|
if (docId === "") throw new PadesError("REQUEST_INVALID", "appearance: docId \u0437\u0430\u0430\u0432\u0430\u043B (\u0431\u0430\u0440\u0438\u043C\u0442\u0430\u0434 verify \u0445\u0443\u0443\u0434\u0430\u0441 \u0430\u043B\u0433\u0430)");
|
|
5222
|
-
let n;
|
|
5247
|
+
let last, n;
|
|
5223
5248
|
try {
|
|
5224
|
-
n =
|
|
5249
|
+
({ page: last, n } = defaultStampPage(doc, VERIFY_URL_PREFIX + docId));
|
|
5225
5250
|
} catch (e) {
|
|
5226
5251
|
throw new PadesError("PDF_INVALID", "PDF \u0437\u0430\u0434\u0430\u0440\u0441\u0430\u043D\u0433\u04AF\u0439", { cause: e });
|
|
5227
5252
|
}
|
|
5228
|
-
const page = a.page ||
|
|
5253
|
+
const page = a.page || last;
|
|
5229
5254
|
if (page > n) throw new PadesError("REQUEST_INVALID", `appearance: page ${page} > \u0445\u0443\u0443\u0434\u0430\u0441\u043D\u044B \u0442\u043E\u043E ${n}`);
|
|
5230
5255
|
const z = new Date(now.getTime() + 8 * 36e5);
|
|
5231
5256
|
const p2 = (v) => String(v).padStart(2, "0");
|
package/dist/pades.d.cts
CHANGED
|
@@ -61,7 +61,11 @@ interface PadesPrepareOptions {
|
|
|
61
61
|
* байрлал {@link PadesPrepared.placement}-д.
|
|
62
62
|
*/
|
|
63
63
|
interface PadesAppearance {
|
|
64
|
-
/**
|
|
64
|
+
/**
|
|
65
|
+
* Оролтын баримтын хуудас, 1-ээс (тодорхой дугаар — юуг ч алгасахгүй); 0/байхгүй = оролтын eID verify хуудас БИШ
|
|
66
|
+
* сүүлийн хуудас: энэ prepare-ийн нэмэх ба өмнөх гарын үсгүүдийн нэмсэн verify хуудас тооцогдохгүй (0.26.0+,
|
|
67
|
+
* PLACEMENT_SPEC §1a — `/Annots`-д энэ баримтын `https://ca.eidmongolia.mn/verify/<docId>` Link-тэй хуудас).
|
|
68
|
+
*/
|
|
65
69
|
page?: number;
|
|
66
70
|
x: number;
|
|
67
71
|
y: number;
|
package/dist/pades.d.ts
CHANGED
|
@@ -61,7 +61,11 @@ interface PadesPrepareOptions {
|
|
|
61
61
|
* байрлал {@link PadesPrepared.placement}-д.
|
|
62
62
|
*/
|
|
63
63
|
interface PadesAppearance {
|
|
64
|
-
/**
|
|
64
|
+
/**
|
|
65
|
+
* Оролтын баримтын хуудас, 1-ээс (тодорхой дугаар — юуг ч алгасахгүй); 0/байхгүй = оролтын eID verify хуудас БИШ
|
|
66
|
+
* сүүлийн хуудас: энэ prepare-ийн нэмэх ба өмнөх гарын үсгүүдийн нэмсэн verify хуудас тооцогдохгүй (0.26.0+,
|
|
67
|
+
* PLACEMENT_SPEC §1a — `/Annots`-д энэ баримтын `https://ca.eidmongolia.mn/verify/<docId>` Link-тэй хуудас).
|
|
68
|
+
*/
|
|
65
69
|
page?: number;
|
|
66
70
|
x: number;
|
|
67
71
|
y: number;
|
package/dist/pades.js
CHANGED
|
@@ -10,18 +10,18 @@ import {
|
|
|
10
10
|
appearanceObjects,
|
|
11
11
|
appendVerifyPage,
|
|
12
12
|
checkStructure,
|
|
13
|
+
defaultStampPage,
|
|
13
14
|
escapeName,
|
|
14
15
|
hexString,
|
|
15
16
|
isBrowser,
|
|
16
17
|
nthPage,
|
|
17
|
-
pageCount,
|
|
18
18
|
pageGeometry,
|
|
19
19
|
round100,
|
|
20
20
|
serialize,
|
|
21
21
|
visibleRect,
|
|
22
22
|
visibleWidget,
|
|
23
23
|
zlibInflateStrict
|
|
24
|
-
} from "./chunk-
|
|
24
|
+
} from "./chunk-YRL4CWWI.js";
|
|
25
25
|
import {
|
|
26
26
|
CLAIMED_ROLE_MAX_RUNES,
|
|
27
27
|
CertificateRevokedError,
|
|
@@ -1719,13 +1719,13 @@ function checkAppearance(o) {
|
|
|
1719
1719
|
function visibleSpec(doc, o, name, now, docId, revIndex) {
|
|
1720
1720
|
const a = o.appearance;
|
|
1721
1721
|
if (docId === "") throw new PadesError("REQUEST_INVALID", "appearance: docId \u0437\u0430\u0430\u0432\u0430\u043B (\u0431\u0430\u0440\u0438\u043C\u0442\u0430\u0434 verify \u0445\u0443\u0443\u0434\u0430\u0441 \u0430\u043B\u0433\u0430)");
|
|
1722
|
-
let n;
|
|
1722
|
+
let last, n;
|
|
1723
1723
|
try {
|
|
1724
|
-
n =
|
|
1724
|
+
({ page: last, n } = defaultStampPage(doc, VERIFY_URL_PREFIX + docId));
|
|
1725
1725
|
} catch (e) {
|
|
1726
1726
|
throw new PadesError("PDF_INVALID", "PDF \u0437\u0430\u0434\u0430\u0440\u0441\u0430\u043D\u0433\u04AF\u0439", { cause: e });
|
|
1727
1727
|
}
|
|
1728
|
-
const page = a.page ||
|
|
1728
|
+
const page = a.page || last;
|
|
1729
1729
|
if (page > n) throw new PadesError("REQUEST_INVALID", `appearance: page ${page} > \u0445\u0443\u0443\u0434\u0430\u0441\u043D\u044B \u0442\u043E\u043E ${n}`);
|
|
1730
1730
|
const z = new Date(now.getTime() + 8 * 36e5);
|
|
1731
1731
|
const p2 = (v) => String(v).padStart(2, "0");
|
package/dist/validate.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gerege-systems/eid-mongolia-sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
4
4
|
"description": "e-ID Mongolia Relying Party SDK — иргэнээр утсаар нь нэвтрэлт ба хууль ёсны цахим гарын үсэг (RP-API v3, Smart-ID нийцтэй).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|