@file-viewer/renderer-ofd 2.1.23 → 2.1.25

package/vendor/dltech/ofd/ofd_util.js

@@ -61,6 +61,19 @@ export const convertPathAbbreviatedDatatoPoint = abbreviatedData => {
             }
             i = i + 7;
             pointList.push(point);
+        } else if (array[i] === 'Q') {
+            // Q x1 y1 x2 y2：以(x1,y1)为控制点画二次贝塞尔到(x2,y2)。
+            // 大量中文字形轮廓（本身是路径而非 TextObject）都靠 Q 描述笔画弧线，
+            // 之前完全未识别，会导致后续 token 错位、字形整体丢失。
+            let point = {
+                'type': 'Q',
+                'x1': parseFloat(array[i + 1]),
+                'y1': parseFloat(array[i + 2]),
+                'x2': parseFloat(array[i + 3]),
+                'y2': parseFloat(array[i + 4])
+            }
+            i = i + 5;
+            pointList.push(point);
         } else {
             i++;
         }
@@ -90,6 +103,13 @@ export const calPathPoint = function (abbreviatedPoint) {
                 'x3': converterDpi(x3), 'y3': converterDpi(y3)
             }
             pointList.push(realPoint);
+        } else if (point.type === 'Q') {
+            let realPoint = {
+                'type': 'Q',
+                'x1': converterDpi(point.x1), 'y1': converterDpi(point.y1),
+                'x2': converterDpi(point.x2), 'y2': converterDpi(point.y2)
+            }
+            pointList.push(realPoint);
         }
     }
     return pointList;
@@ -192,8 +212,7 @@ export const calTextPoint = function (textCodes) {
         let textStr = textCode['#text'];
         if (textStr) {
             textStr += '';
-            textStr = decodeHtml(textStr);
-            textStr = textStr.replace(/ /g, ' ');
+            textStr = decodeOfdText(textStr);
             for (let i = 0; i < textStr.length; i++) {
                 if (i > 0 && deltaXList.length > 0) {
                     x += deltaXList[(i - 1)];
@@ -232,7 +251,7 @@ export const getExtensionByPath = function (path) {
 }
 
 
-let REGX_HTML_DECODE = /&\w+;|&#(\d+);/g;
+let REGX_HTML_DECODE = /&\w+;|&#(x?[0-9a-fA-F]+);/g;
 
 let HTML_DECODE = {
     "&lt;": "<",
@@ -253,8 +272,9 @@ export const decodeHtml = function (s) {
                 var c = HTML_DECODE[$0];
                 if (c == undefined) {
                     // Maybe is Entity Number
-                    if (!isNaN($1)) {
-                        c = String.fromCharCode(($1 == 160) ? 32 : $1);
+                    if ($1) {
+                        const codePoint = /^x/i.test($1) ? parseInt($1.slice(1), 16) : parseInt($1, 10);
+                        c = Number.isFinite(codePoint) ? String.fromCodePoint((codePoint == 160) ? 32 : codePoint) : $0;
                     } else {
                         c = $0;
                     }
@@ -263,6 +283,17 @@ export const decodeHtml = function (s) {
             });
 };
 
+export const decodeOfdText = function (s) {
+    s = decodeHtml(s);
+    if (typeof s != "string") {
+        return s;
+    }
+    return s.replace(/\\0x([0-9a-fA-F]{4,6})/g, function (_, hex) {
+        const codePoint = parseInt(hex, 16);
+        return Number.isFinite(codePoint) ? String.fromCodePoint((codePoint == 160) ? 32 : codePoint) : _;
+    });
+}
+
 let FONT_FAMILY = {
     '楷体': '楷体, KaiTi, Kai, simkai',
     'kaiti': '楷体, KaiTi, Kai, simkai',

package/vendor/dltech/ofd/ses_signature_parser.js

@@ -0,0 +1,196 @@
+/*
+ * ofd.js - A Javascript class for reading and rendering ofd files
+ * <https://github.com/DLTech21/ofd.js>
+ *
+ * Copyright (c) 2020. DLTech21 All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ * Display-only SES signature parser for File Viewer:
+ * extracts seal picture bytes for preview, skips crypto verification
+ * so ASN.1/国密校验不会进入预览主路径。
+ */
+
+import Hex from '../../lapo-asn1js/hex.js';
+import Base64 from '../../lapo-asn1js/base64.js';
+import ASN1 from '../../lapo-asn1js/asn1.js';
+
+const reHex = /^\s*(?:[0-9A-Fa-f][0-9A-Fa-f]\s*)+$/;
+
+const unwrapDefault = (mod) => (mod && typeof mod === 'object' && 'default' in mod ? mod.default : mod);
+
+const HexApi = unwrapDefault(Hex);
+const Base64Api = unwrapDefault(Base64);
+const ASN1Api = unwrapDefault(ASN1);
+
+export const parseSesSignature = async function (zip, name, getEntry) {
+    const entry = typeof getEntry === 'function' ? getEntry(zip, name) : zip.files[name];
+    if (!entry) {
+        return {};
+    }
+    try {
+        const bytes = await entry.async('base64');
+        return decodeText(bytes);
+    } catch (e) {
+        console.warn('[ofd] parseSesSignature failed', name, e);
+        return {};
+    }
+};
+
+const decodeText = function (val) {
+    try {
+        const der = reHex.test(val) ? HexApi.decode(val) : Base64Api.unarmor(val);
+        return decode(der);
+    } catch (e) {
+        console.warn('[ofd] decode SES signature text failed', e);
+        return {};
+    }
+};
+
+const decode = function (der, offset) {
+    offset = offset || 0;
+    try {
+        const SES_Signature = decodeSES_Signature(der, offset);
+        const picture = SES_Signature?.toSign?.eseal?.esealInfo?.picture;
+        if (!picture?.data?.byte?.length) {
+            return {};
+        }
+        const type = (picture.type?.str || picture.type || '').toString().toLowerCase();
+        return {
+            ofdArray: picture.data.byte,
+            type,
+            // 预览只保留轻量元数据，避免把 DER/证书二进制塞进 DOM data-*。
+            SES_Signature: {
+                realVersion: SES_Signature.realVersion,
+                displayOnly: true,
+                pictureType: type,
+                pictureWidth: picture.width,
+                pictureHeight: picture.height,
+                sealName: SES_Signature.toSign?.eseal?.esealInfo?.property?.name,
+            },
+            verifyRet: true,
+        };
+    } catch (e) {
+        console.warn('[ofd] decode SES signature failed', e);
+        return {};
+    }
+};
+
+const decodeUTCTime = function (str) {
+    str = String(str || '').replace('Unrecognized time: ', '');
+    str = str.replace('Z', '');
+    str = str.substr(0, 1) < '5' ? '20' + str : '19' + str;
+    return str;
+};
+
+const parseStringUTF = function (node) {
+    if (!node) {
+        return '';
+    }
+    return node.stream.parseStringUTF(node.stream.pos + node.header, node.stream.pos + node.header + node.length);
+};
+
+const parseInteger = function (node) {
+    if (!node) {
+        return undefined;
+    }
+    return node.stream.parseInteger(node.stream.pos + node.header, node.stream.pos + node.header + node.length);
+};
+
+const parseOctetBytes = function (node) {
+    if (!node) {
+        return new Uint8Array(0);
+    }
+    return node.stream.enc.subarray(node.stream.pos + node.header, node.stream.pos + node.header + node.length);
+};
+
+const parseTimeNode = function (node, utc) {
+    if (!node) {
+        return '';
+    }
+    const raw = node.stream.parseTime(node.stream.pos + node.header, node.stream.pos + node.header + node.length, utc);
+    return decodeUTCTime(raw);
+};
+
+const decodeSES_Signature = function (der, offset) {
+    offset = offset || 0;
+    const asn1 = ASN1Api.decode(der, offset);
+    let SES_Signature;
+    try {
+        // V1
+        const createDate = parseTimeNode(asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[3]);
+        const validStart = parseTimeNode(asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[4]);
+        const validEnd = parseTimeNode(asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[5]);
+        const pictureNode = asn1.sub[0]?.sub[1]?.sub[0]?.sub[3];
+        SES_Signature = {
+            realVersion: 1,
+            toSign: {
+                eseal: {
+                    esealInfo: {
+                        property: {
+                            name: parseStringUTF(asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[1]),
+                            createDate,
+                            validStart,
+                            validEnd,
+                        },
+                        picture: {
+                            type: parseStringUTF(pictureNode?.sub[0]),
+                            data: { byte: parseOctetBytes(pictureNode?.sub[1]) },
+                            width: parseInteger(pictureNode?.sub[2]),
+                            height: parseInteger(pictureNode?.sub[3]),
+                        },
+                    },
+                },
+            },
+        };
+    } catch (e) {
+        try {
+            // V4
+            const pictureNode = asn1.sub[0]?.sub[1]?.sub[0]?.sub[3];
+            SES_Signature = {
+                realVersion: 4,
+                toSign: {
+                    eseal: {
+                        esealInfo: {
+                            property: {
+                                name: parseStringUTF(asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[1]),
+                                createDate: asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[4]?.stream.parseTime(
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[4].header,
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[4].header + asn1.sub[0].sub[1].sub[0].sub[2].sub[4].length
+                                ),
+                                validStart: asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[5]?.stream.parseTime(
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[5].header,
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[5].header + asn1.sub[0].sub[1].sub[0].sub[2].sub[5].length
+                                ),
+                                validEnd: asn1.sub[0]?.sub[1]?.sub[0]?.sub[2]?.sub[6]?.stream.parseTime(
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[6].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[6].header,
+                                    asn1.sub[0].sub[1].sub[0].sub[2].sub[6].stream.pos + asn1.sub[0].sub[1].sub[0].sub[2].sub[6].header + asn1.sub[0].sub[1].sub[0].sub[2].sub[6].length
+                                ),
+                            },
+                            picture: {
+                                type: parseStringUTF(pictureNode?.sub[0]),
+                                data: { byte: parseOctetBytes(pictureNode?.sub[1]) },
+                                width: parseInteger(pictureNode?.sub[2]),
+                                height: parseInteger(pictureNode?.sub[3]),
+                            },
+                        },
+                    },
+                },
+            };
+        } catch (inner) {
+            console.warn('[ofd] unsupported SES signature structure', inner);
+            SES_Signature = {};
+        }
+    }
+    return SES_Signature;
+};

package/vendor/lapo-asn1js/README.md

@@ -0,0 +1,3 @@
+# @lapo/asn1js browser ESM vendoring
+
+Vendored from @lapo/asn1js@1.2.1 for browser-safe OFD SES signature parsing.