@cj-tech-master/excelts 9.1.0 → 9.2.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 +16 -1
- package/dist/browser/modules/archive/compression/crc32.js +1 -1
- package/dist/browser/modules/archive/crypto/aes.d.ts +0 -8
- package/dist/browser/modules/archive/crypto/aes.js +1 -20
- package/dist/browser/modules/archive/crypto/index.d.ts +2 -1
- package/dist/browser/modules/archive/crypto/index.js +3 -1
- package/dist/browser/modules/csv/parse/row-processor.d.ts +1 -1
- package/dist/browser/modules/csv/worker/worker-script.generated.js +1 -1
- package/dist/browser/modules/excel/utils/cell-matrix.js +1 -0
- package/dist/browser/modules/excel/utils/encryptor.browser.d.ts +4 -5
- package/dist/browser/modules/excel/utils/encryptor.browser.js +7 -12
- package/dist/browser/modules/excel/utils/encryptor.d.ts +1 -1
- package/dist/browser/modules/excel/utils/encryptor.js +4 -7
- package/dist/browser/modules/pdf/builder/document-builder.d.ts +517 -0
- package/dist/browser/modules/pdf/builder/document-builder.js +1493 -0
- package/dist/browser/modules/pdf/builder/form-appearance.d.ts +56 -0
- package/dist/browser/modules/pdf/builder/form-appearance.js +140 -0
- package/dist/browser/modules/pdf/builder/image-utils.d.ts +39 -0
- package/dist/browser/modules/pdf/builder/image-utils.js +129 -0
- package/dist/browser/modules/pdf/builder/pdf-editor.d.ts +230 -0
- package/dist/browser/modules/pdf/builder/pdf-editor.js +1574 -0
- package/dist/browser/modules/pdf/builder/resource-merger.d.ts +41 -0
- package/dist/browser/modules/pdf/builder/resource-merger.js +258 -0
- package/dist/browser/modules/pdf/core/digital-signature.d.ts +109 -0
- package/dist/browser/modules/pdf/core/digital-signature.js +659 -0
- package/dist/browser/modules/pdf/core/encryption.js +8 -7
- package/dist/browser/modules/pdf/core/pdf-object.d.ts +11 -0
- package/dist/browser/modules/pdf/core/pdf-object.js +38 -0
- package/dist/browser/modules/pdf/core/pdf-stream.d.ts +32 -0
- package/dist/browser/modules/pdf/core/pdf-stream.js +66 -0
- package/dist/browser/modules/pdf/core/pdf-writer.d.ts +55 -1
- package/dist/browser/modules/pdf/core/pdf-writer.js +271 -6
- package/dist/browser/modules/pdf/core/pdfa.d.ts +62 -0
- package/dist/browser/modules/pdf/core/pdfa.js +261 -0
- package/dist/browser/modules/pdf/index.d.ts +11 -0
- package/dist/browser/modules/pdf/index.js +9 -0
- package/dist/browser/modules/pdf/reader/bookmark-extractor.d.ts +35 -0
- package/dist/browser/modules/pdf/reader/bookmark-extractor.js +324 -0
- package/dist/browser/modules/pdf/reader/pdf-decrypt.js +6 -5
- package/dist/browser/modules/pdf/reader/pdf-reader.d.ts +17 -0
- package/dist/browser/modules/pdf/reader/pdf-reader.js +26 -2
- package/dist/browser/modules/pdf/reader/table-extractor.d.ts +69 -0
- package/dist/browser/modules/pdf/reader/table-extractor.js +365 -0
- package/dist/browser/modules/pdf/render/layout-engine.d.ts +21 -1
- package/dist/browser/modules/pdf/render/layout-engine.js +112 -5
- package/dist/browser/modules/pdf/render/page-renderer.d.ts +2 -9
- package/dist/browser/modules/pdf/render/page-renderer.js +62 -103
- package/dist/browser/modules/pdf/render/pdf-exporter.js +2 -61
- package/dist/browser/modules/pdf/render/style-converter.d.ts +4 -0
- package/dist/browser/modules/pdf/render/style-converter.js +1 -1
- package/dist/browser/modules/pdf/types.d.ts +14 -1
- package/dist/browser/modules/stream/browser/readable.js +8 -2
- package/dist/browser/utils/crypto.browser.d.ts +64 -0
- package/dist/browser/{modules/pdf/core/crypto.js → utils/crypto.browser.js} +91 -101
- package/dist/browser/utils/crypto.d.ts +97 -0
- package/dist/browser/utils/crypto.js +209 -0
- package/dist/cjs/modules/archive/compression/crc32.js +1 -1
- package/dist/cjs/modules/archive/crypto/aes.js +2 -23
- package/dist/cjs/modules/archive/crypto/index.js +3 -1
- package/dist/cjs/modules/csv/worker/worker-script.generated.js +1 -1
- package/dist/cjs/modules/excel/utils/cell-matrix.js +1 -0
- package/dist/cjs/modules/excel/utils/encryptor.browser.js +7 -12
- package/dist/cjs/modules/excel/utils/encryptor.js +4 -10
- package/dist/cjs/modules/pdf/builder/document-builder.js +1532 -0
- package/dist/cjs/modules/pdf/builder/form-appearance.js +145 -0
- package/dist/cjs/modules/pdf/builder/image-utils.js +135 -0
- package/dist/cjs/modules/pdf/builder/pdf-editor.js +1612 -0
- package/dist/cjs/modules/pdf/builder/resource-merger.js +263 -0
- package/dist/cjs/modules/pdf/core/digital-signature.js +667 -0
- package/dist/cjs/modules/pdf/core/encryption.js +8 -7
- package/dist/cjs/modules/pdf/core/pdf-object.js +38 -0
- package/dist/cjs/modules/pdf/core/pdf-stream.js +66 -0
- package/dist/cjs/modules/pdf/core/pdf-writer.js +272 -6
- package/dist/cjs/modules/pdf/core/pdfa.js +266 -0
- package/dist/cjs/modules/pdf/index.js +19 -1
- package/dist/cjs/modules/pdf/reader/bookmark-extractor.js +327 -0
- package/dist/cjs/modules/pdf/reader/pdf-decrypt.js +6 -5
- package/dist/cjs/modules/pdf/reader/pdf-reader.js +26 -2
- package/dist/cjs/modules/pdf/reader/table-extractor.js +368 -0
- package/dist/cjs/modules/pdf/render/layout-engine.js +113 -4
- package/dist/cjs/modules/pdf/render/page-renderer.js +63 -105
- package/dist/cjs/modules/pdf/render/pdf-exporter.js +3 -62
- package/dist/cjs/modules/pdf/render/style-converter.js +1 -0
- package/dist/cjs/modules/stream/browser/readable.js +8 -2
- package/dist/cjs/{modules/pdf/core/crypto.js → utils/crypto.browser.js} +95 -102
- package/dist/cjs/utils/crypto.js +228 -0
- package/dist/esm/modules/archive/compression/crc32.js +1 -1
- package/dist/esm/modules/archive/crypto/aes.js +1 -20
- package/dist/esm/modules/archive/crypto/index.js +3 -1
- package/dist/esm/modules/csv/worker/worker-script.generated.js +1 -1
- package/dist/esm/modules/excel/utils/cell-matrix.js +1 -0
- package/dist/esm/modules/excel/utils/encryptor.browser.js +7 -12
- package/dist/esm/modules/excel/utils/encryptor.js +4 -7
- package/dist/esm/modules/pdf/builder/document-builder.js +1493 -0
- package/dist/esm/modules/pdf/builder/form-appearance.js +140 -0
- package/dist/esm/modules/pdf/builder/image-utils.js +129 -0
- package/dist/esm/modules/pdf/builder/pdf-editor.js +1574 -0
- package/dist/esm/modules/pdf/builder/resource-merger.js +258 -0
- package/dist/esm/modules/pdf/core/digital-signature.js +659 -0
- package/dist/esm/modules/pdf/core/encryption.js +8 -7
- package/dist/esm/modules/pdf/core/pdf-object.js +38 -0
- package/dist/esm/modules/pdf/core/pdf-stream.js +66 -0
- package/dist/esm/modules/pdf/core/pdf-writer.js +271 -6
- package/dist/esm/modules/pdf/core/pdfa.js +261 -0
- package/dist/esm/modules/pdf/index.js +9 -0
- package/dist/esm/modules/pdf/reader/bookmark-extractor.js +324 -0
- package/dist/esm/modules/pdf/reader/pdf-decrypt.js +6 -5
- package/dist/esm/modules/pdf/reader/pdf-reader.js +26 -2
- package/dist/esm/modules/pdf/reader/table-extractor.js +365 -0
- package/dist/esm/modules/pdf/render/layout-engine.js +112 -5
- package/dist/esm/modules/pdf/render/page-renderer.js +62 -103
- package/dist/esm/modules/pdf/render/pdf-exporter.js +2 -61
- package/dist/esm/modules/pdf/render/style-converter.js +1 -1
- package/dist/esm/modules/stream/browser/readable.js +8 -2
- package/dist/esm/{modules/pdf/core/crypto.js → utils/crypto.browser.js} +91 -101
- package/dist/esm/utils/crypto.js +209 -0
- package/dist/iife/excelts.iife.js +1248 -1074
- package/dist/iife/excelts.iife.js.map +1 -1
- package/dist/iife/excelts.iife.min.js +53 -54
- package/dist/types/modules/archive/crypto/aes.d.ts +0 -8
- package/dist/types/modules/archive/crypto/index.d.ts +2 -1
- package/dist/types/modules/csv/parse/row-processor.d.ts +1 -1
- package/dist/types/modules/excel/utils/encryptor.browser.d.ts +4 -5
- package/dist/types/modules/excel/utils/encryptor.d.ts +1 -1
- package/dist/types/modules/pdf/builder/document-builder.d.ts +517 -0
- package/dist/types/modules/pdf/builder/form-appearance.d.ts +56 -0
- package/dist/types/modules/pdf/builder/image-utils.d.ts +39 -0
- package/dist/types/modules/pdf/builder/pdf-editor.d.ts +230 -0
- package/dist/types/modules/pdf/builder/resource-merger.d.ts +41 -0
- package/dist/types/modules/pdf/core/digital-signature.d.ts +109 -0
- package/dist/types/modules/pdf/core/pdf-object.d.ts +11 -0
- package/dist/types/modules/pdf/core/pdf-stream.d.ts +32 -0
- package/dist/types/modules/pdf/core/pdf-writer.d.ts +55 -1
- package/dist/types/modules/pdf/core/pdfa.d.ts +62 -0
- package/dist/types/modules/pdf/index.d.ts +11 -0
- package/dist/types/modules/pdf/reader/bookmark-extractor.d.ts +35 -0
- package/dist/types/modules/pdf/reader/pdf-reader.d.ts +17 -0
- package/dist/types/modules/pdf/reader/table-extractor.d.ts +69 -0
- package/dist/types/modules/pdf/render/layout-engine.d.ts +21 -1
- package/dist/types/modules/pdf/render/page-renderer.d.ts +2 -9
- package/dist/types/modules/pdf/render/style-converter.d.ts +4 -0
- package/dist/types/modules/pdf/types.d.ts +14 -1
- package/dist/types/utils/crypto.browser.d.ts +64 -0
- package/dist/types/utils/crypto.d.ts +97 -0
- package/package.json +110 -111
- package/dist/browser/modules/pdf/core/crypto.d.ts +0 -65
- package/dist/types/modules/pdf/core/crypto.d.ts +0 -65
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PDF/A-1b compliance utilities.
|
|
3
|
+
*
|
|
4
|
+
* Provides XMP metadata stream writing and OutputIntent creation for
|
|
5
|
+
* PDF/A-1b (ISO 19005-1, Level B) conformance.
|
|
6
|
+
*
|
|
7
|
+
* **Limitations:**
|
|
8
|
+
* - Type1 base fonts (Helvetica, Times-Roman, Courier, etc.) are NOT embedded.
|
|
9
|
+
* PDF/A-1b strictly requires all fonts to be embedded. Documents using only
|
|
10
|
+
* CIDFonts (embedded TrueType via `embedFont()`) are fully compliant.
|
|
11
|
+
* Documents using base Type1 fonts will pass structural validation but may
|
|
12
|
+
* fail strict PDF/A font-embedding checks.
|
|
13
|
+
*
|
|
14
|
+
* @see ISO 19005-1:2005 — Document management — Electronic document file
|
|
15
|
+
* format for long-term preservation — Part 1: Use of PDF 1.4 (PDF/A-1)
|
|
16
|
+
*/
|
|
17
|
+
import { PdfDict, pdfNumber, pdfRef } from "./pdf-object.js";
|
|
18
|
+
// =============================================================================
|
|
19
|
+
// sRGB ICC Profile
|
|
20
|
+
// =============================================================================
|
|
21
|
+
/**
|
|
22
|
+
* Minimal sRGB ICC profile (v2.1.0).
|
|
23
|
+
*
|
|
24
|
+
* This is a valid ICC profile with the correct header structure, profile
|
|
25
|
+
* signature, and a minimal tag table. It identifies the color space as RGB
|
|
26
|
+
* with the sRGB rendering intent. The profile is intentionally minimal
|
|
27
|
+
* (~128 bytes) — enough to satisfy PDF/A-1b OutputIntent requirements.
|
|
28
|
+
*
|
|
29
|
+
* Structure:
|
|
30
|
+
* - 128-byte header (profile size, preferred CMM, version, device class,
|
|
31
|
+
* color space, PCS, creation date, signature, platform, flags, etc.)
|
|
32
|
+
* - Tag table with 0 tags (profile is header-only for minimal compliance)
|
|
33
|
+
*
|
|
34
|
+
* @see ICC.1:2001-04 — File Format for Color Profiles (v2)
|
|
35
|
+
*/
|
|
36
|
+
export const sRGB_ICC_PROFILE = buildMinimalSrgbProfile();
|
|
37
|
+
function buildMinimalSrgbProfile() {
|
|
38
|
+
// ICC profile header is exactly 128 bytes
|
|
39
|
+
// We add a tag table with 3 required tags: desc, wtpt, cprt
|
|
40
|
+
// Each tag table entry is 12 bytes
|
|
41
|
+
const TAG_COUNT = 3;
|
|
42
|
+
const TAG_TABLE_SIZE = 4 + TAG_COUNT * 12; // 4 (count) + 3 * 12 (entries)
|
|
43
|
+
// Tag data — description, white point, copyright
|
|
44
|
+
const descData = buildTextDescriptionTag("sRGB IEC61966-2.1");
|
|
45
|
+
const wtptData = buildXYZTag(0.9505, 1.0, 1.089); // D50 white point
|
|
46
|
+
const cprtData = buildTextTag("No copyright");
|
|
47
|
+
const descOffset = 128 + TAG_TABLE_SIZE;
|
|
48
|
+
const wtptOffset = descOffset + descData.length;
|
|
49
|
+
const cprtOffset = wtptOffset + wtptData.length;
|
|
50
|
+
const profileSize = cprtOffset + cprtData.length;
|
|
51
|
+
const buf = new Uint8Array(profileSize);
|
|
52
|
+
const view = new DataView(buf.buffer);
|
|
53
|
+
// --- Header (128 bytes) ---
|
|
54
|
+
view.setUint32(0, profileSize); // Profile size
|
|
55
|
+
// Preferred CMM: none (0)
|
|
56
|
+
view.setUint8(8, 2); // Major version 2
|
|
57
|
+
view.setUint8(9, 0x10); // Minor version 1.0
|
|
58
|
+
// Profile/Device class: 'mntr' (monitor)
|
|
59
|
+
writeAscii(buf, 12, "mntr");
|
|
60
|
+
// Color space: 'RGB '
|
|
61
|
+
writeAscii(buf, 16, "RGB ");
|
|
62
|
+
// Profile Connection Space: 'XYZ '
|
|
63
|
+
writeAscii(buf, 20, "XYZ ");
|
|
64
|
+
// Creation date/time (2000-01-01 00:00:00)
|
|
65
|
+
view.setUint16(24, 2000); // year
|
|
66
|
+
view.setUint16(26, 1); // month
|
|
67
|
+
view.setUint16(28, 1); // day
|
|
68
|
+
// hour, minute, second = 0 (already zero)
|
|
69
|
+
// File signature: 'acsp'
|
|
70
|
+
writeAscii(buf, 36, "acsp");
|
|
71
|
+
// Primary platform: 'APPL'
|
|
72
|
+
writeAscii(buf, 40, "APPL");
|
|
73
|
+
// Rendering intent: 0 = Perceptual
|
|
74
|
+
view.setUint32(64, 0);
|
|
75
|
+
// PCS illuminant (D50 XYZ): X=0.9642, Y=1.0, Z=0.8249
|
|
76
|
+
writeS15Fixed16(view, 68, 0.9642);
|
|
77
|
+
writeS15Fixed16(view, 72, 1.0);
|
|
78
|
+
writeS15Fixed16(view, 76, 0.8249);
|
|
79
|
+
// --- Tag table ---
|
|
80
|
+
const tagTableOffset = 128;
|
|
81
|
+
view.setUint32(tagTableOffset, TAG_COUNT);
|
|
82
|
+
// Tag 1: 'desc' (profile description)
|
|
83
|
+
writeAscii(buf, tagTableOffset + 4, "desc");
|
|
84
|
+
view.setUint32(tagTableOffset + 8, descOffset);
|
|
85
|
+
view.setUint32(tagTableOffset + 12, descData.length);
|
|
86
|
+
// Tag 2: 'wtpt' (media white point)
|
|
87
|
+
writeAscii(buf, tagTableOffset + 16, "wtpt");
|
|
88
|
+
view.setUint32(tagTableOffset + 20, wtptOffset);
|
|
89
|
+
view.setUint32(tagTableOffset + 24, wtptData.length);
|
|
90
|
+
// Tag 3: 'cprt' (copyright)
|
|
91
|
+
writeAscii(buf, tagTableOffset + 28, "cprt");
|
|
92
|
+
view.setUint32(tagTableOffset + 32, cprtOffset);
|
|
93
|
+
view.setUint32(tagTableOffset + 36, cprtData.length);
|
|
94
|
+
// --- Tag data ---
|
|
95
|
+
buf.set(descData, descOffset);
|
|
96
|
+
buf.set(wtptData, wtptOffset);
|
|
97
|
+
buf.set(cprtData, cprtOffset);
|
|
98
|
+
return buf;
|
|
99
|
+
}
|
|
100
|
+
/** Write a 4-character ASCII string at the given offset. */
|
|
101
|
+
function writeAscii(buf, offset, str) {
|
|
102
|
+
for (let i = 0; i < str.length; i++) {
|
|
103
|
+
buf[offset + i] = str.charCodeAt(i);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
/** Write an s15Fixed16Number (ICC fixed-point) at the given offset. */
|
|
107
|
+
function writeS15Fixed16(view, offset, value) {
|
|
108
|
+
const fixed = Math.round(value * 65536);
|
|
109
|
+
view.setInt32(offset, fixed);
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Build an ICC 'desc' (textDescription) tag.
|
|
113
|
+
* Type signature: 'desc', followed by ASCII string.
|
|
114
|
+
*/
|
|
115
|
+
function buildTextDescriptionTag(text) {
|
|
116
|
+
// desc type: 4 (sig) + 4 (reserved) + 4 (ASCII count) + N (ASCII) + padding
|
|
117
|
+
const asciiLen = text.length + 1; // include null terminator
|
|
118
|
+
// Total: sig(4) + reserved(4) + count(4) + ascii(asciiLen) + unicode_count(4) + scriptcode_count(2) + scriptcode(67)
|
|
119
|
+
// Simplified: just ASCII portion for minimal profile
|
|
120
|
+
const totalLen = 4 + 4 + 4 + asciiLen + 4 + 4 + 2 + 67;
|
|
121
|
+
const buf = new Uint8Array(totalLen);
|
|
122
|
+
const view = new DataView(buf.buffer);
|
|
123
|
+
writeAscii(buf, 0, "desc");
|
|
124
|
+
// reserved: 0 (already zero)
|
|
125
|
+
view.setUint32(8, asciiLen);
|
|
126
|
+
for (let i = 0; i < text.length; i++) {
|
|
127
|
+
buf[12 + i] = text.charCodeAt(i);
|
|
128
|
+
}
|
|
129
|
+
// null terminator at 12 + text.length is already 0
|
|
130
|
+
// Unicode count = 0, scriptcode count = 0 — all zeros
|
|
131
|
+
return buf;
|
|
132
|
+
}
|
|
133
|
+
/** Build an ICC 'XYZ ' tag for a single XYZ triplet. */
|
|
134
|
+
function buildXYZTag(x, y, z) {
|
|
135
|
+
const buf = new Uint8Array(20); // sig(4) + reserved(4) + X(4) + Y(4) + Z(4)
|
|
136
|
+
const view = new DataView(buf.buffer);
|
|
137
|
+
writeAscii(buf, 0, "XYZ ");
|
|
138
|
+
// reserved: 0
|
|
139
|
+
writeS15Fixed16(view, 8, x);
|
|
140
|
+
writeS15Fixed16(view, 12, y);
|
|
141
|
+
writeS15Fixed16(view, 16, z);
|
|
142
|
+
return buf;
|
|
143
|
+
}
|
|
144
|
+
/** Build an ICC 'text' tag. */
|
|
145
|
+
function buildTextTag(text) {
|
|
146
|
+
const asciiLen = text.length + 1; // include null terminator
|
|
147
|
+
const buf = new Uint8Array(4 + 4 + asciiLen); // sig(4) + reserved(4) + text
|
|
148
|
+
writeAscii(buf, 0, "text");
|
|
149
|
+
for (let i = 0; i < text.length; i++) {
|
|
150
|
+
buf[8 + i] = text.charCodeAt(i);
|
|
151
|
+
}
|
|
152
|
+
return buf;
|
|
153
|
+
}
|
|
154
|
+
// =============================================================================
|
|
155
|
+
// XMP Metadata Writer
|
|
156
|
+
// =============================================================================
|
|
157
|
+
/**
|
|
158
|
+
* Write a PDF/A-1b XMP metadata stream as an indirect object.
|
|
159
|
+
*
|
|
160
|
+
* The XMP packet contains:
|
|
161
|
+
* - `dc:title` — document title
|
|
162
|
+
* - `dc:creator` — document author
|
|
163
|
+
* - `xmp:CreatorTool` — creating application
|
|
164
|
+
* - `pdf:Producer` — PDF producer
|
|
165
|
+
* - `pdfaid:part` — PDF/A part (1)
|
|
166
|
+
* - `pdfaid:conformance` — PDF/A conformance level (B)
|
|
167
|
+
*
|
|
168
|
+
* @returns The object number of the XMP metadata stream.
|
|
169
|
+
*/
|
|
170
|
+
export function writePdfAMetadata(writer, metadata) {
|
|
171
|
+
const now = new Date();
|
|
172
|
+
const isoDate = now.toISOString().replace(/\.\d{3}Z$/, "Z");
|
|
173
|
+
const title = escapeXml(metadata.title ?? "");
|
|
174
|
+
const author = escapeXml(metadata.author ?? "");
|
|
175
|
+
const subject = escapeXml(metadata.subject ?? "");
|
|
176
|
+
const creator = escapeXml(metadata.creator ?? "excelts");
|
|
177
|
+
const producer = "excelts";
|
|
178
|
+
const xmp = [
|
|
179
|
+
'<?xpacket begin="\uFEFF" id="W5M0MpCehiHzreSzNTczkc9d"?>',
|
|
180
|
+
'<x:xmpmeta xmlns:x="adobe:ns:meta/">',
|
|
181
|
+
'<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">',
|
|
182
|
+
'<rdf:Description rdf:about=""',
|
|
183
|
+
' xmlns:dc="http://purl.org/dc/elements/1.1/"',
|
|
184
|
+
' xmlns:xmp="http://ns.adobe.com/xap/1.0/"',
|
|
185
|
+
' xmlns:pdf="http://ns.adobe.com/pdf/1.3/"',
|
|
186
|
+
' xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/">',
|
|
187
|
+
" <dc:title>",
|
|
188
|
+
' <rdf:Alt><rdf:li xml:lang="x-default">' + title + "</rdf:li></rdf:Alt>",
|
|
189
|
+
" </dc:title>",
|
|
190
|
+
" <dc:creator>",
|
|
191
|
+
" <rdf:Seq><rdf:li>" + author + "</rdf:li></rdf:Seq>",
|
|
192
|
+
" </dc:creator>",
|
|
193
|
+
" <dc:description>",
|
|
194
|
+
' <rdf:Alt><rdf:li xml:lang="x-default">' + subject + "</rdf:li></rdf:Alt>",
|
|
195
|
+
" </dc:description>",
|
|
196
|
+
" <xmp:CreatorTool>" + creator + "</xmp:CreatorTool>",
|
|
197
|
+
" <xmp:CreateDate>" + isoDate + "</xmp:CreateDate>",
|
|
198
|
+
" <xmp:ModifyDate>" + isoDate + "</xmp:ModifyDate>",
|
|
199
|
+
" <pdf:Producer>" + producer + "</pdf:Producer>",
|
|
200
|
+
" <pdfaid:part>1</pdfaid:part>",
|
|
201
|
+
" <pdfaid:conformance>B</pdfaid:conformance>",
|
|
202
|
+
"</rdf:Description>",
|
|
203
|
+
"</rdf:RDF>",
|
|
204
|
+
"</x:xmpmeta>",
|
|
205
|
+
'<?xpacket end="w"?>'
|
|
206
|
+
].join("\n");
|
|
207
|
+
const encoder = new TextEncoder();
|
|
208
|
+
const xmpBytes = encoder.encode(xmp);
|
|
209
|
+
const objNum = writer.allocObject();
|
|
210
|
+
const dict = new PdfDict()
|
|
211
|
+
.set("Type", "/Metadata")
|
|
212
|
+
.set("Subtype", "/XML")
|
|
213
|
+
.set("Length", pdfNumber(xmpBytes.length));
|
|
214
|
+
// XMP metadata must NOT be compressed for PDF/A compliance
|
|
215
|
+
// (and for general discoverability by search tools)
|
|
216
|
+
writer.addStreamObject(objNum, dict, xmpBytes, { compress: false });
|
|
217
|
+
return objNum;
|
|
218
|
+
}
|
|
219
|
+
// =============================================================================
|
|
220
|
+
// OutputIntent Writer
|
|
221
|
+
// =============================================================================
|
|
222
|
+
/**
|
|
223
|
+
* Write a PDF/A-1b OutputIntent with an embedded sRGB ICC profile.
|
|
224
|
+
*
|
|
225
|
+
* Creates two objects:
|
|
226
|
+
* 1. The ICC profile stream
|
|
227
|
+
* 2. The OutputIntent dictionary referencing the profile
|
|
228
|
+
*
|
|
229
|
+
* @returns The object number of the OutputIntent dictionary.
|
|
230
|
+
*/
|
|
231
|
+
export function writePdfAOutputIntent(writer) {
|
|
232
|
+
// Write ICC profile stream
|
|
233
|
+
const iccObjNum = writer.allocObject();
|
|
234
|
+
const iccDict = new PdfDict()
|
|
235
|
+
.set("N", pdfNumber(3)) // 3 components (RGB)
|
|
236
|
+
.set("Length", pdfNumber(sRGB_ICC_PROFILE.length));
|
|
237
|
+
writer.addStreamObject(iccObjNum, iccDict, sRGB_ICC_PROFILE);
|
|
238
|
+
// Write OutputIntent dictionary
|
|
239
|
+
const intentObjNum = writer.allocObject();
|
|
240
|
+
const intentDict = new PdfDict()
|
|
241
|
+
.set("Type", "/OutputIntent")
|
|
242
|
+
.set("S", "/GTS_PDFA1")
|
|
243
|
+
.set("OutputConditionIdentifier", "(sRGB IEC61966-2.1)")
|
|
244
|
+
.set("RegistryName", "(http://www.color.org)")
|
|
245
|
+
.set("Info", "(sRGB IEC61966-2.1)")
|
|
246
|
+
.set("DestOutputProfile", pdfRef(iccObjNum));
|
|
247
|
+
writer.addObject(intentObjNum, intentDict);
|
|
248
|
+
return intentObjNum;
|
|
249
|
+
}
|
|
250
|
+
// =============================================================================
|
|
251
|
+
// Helpers
|
|
252
|
+
// =============================================================================
|
|
253
|
+
/** Escape XML special characters for XMP content. */
|
|
254
|
+
function escapeXml(str) {
|
|
255
|
+
return str
|
|
256
|
+
.replace(/&/g, "&")
|
|
257
|
+
.replace(/</g, "<")
|
|
258
|
+
.replace(/>/g, ">")
|
|
259
|
+
.replace(/"/g, """)
|
|
260
|
+
.replace(/'/g, "'");
|
|
261
|
+
}
|
|
@@ -52,6 +52,15 @@ export { excelToPdf } from "./excel-bridge.js";
|
|
|
52
52
|
// =============================================================================
|
|
53
53
|
/** Read a PDF file and extract text, images, and metadata. */
|
|
54
54
|
export { readPdf } from "./reader/pdf-reader.js";
|
|
55
|
+
// =============================================================================
|
|
56
|
+
// Public API — Building (free-form content)
|
|
57
|
+
// =============================================================================
|
|
58
|
+
/** Build PDFs with free text positioning, vector drawing, and images. */
|
|
59
|
+
export { PdfDocumentBuilder, PdfPageBuilder, parseSvgPath } from "./builder/document-builder.js";
|
|
60
|
+
/** Edit existing PDFs: overlay content, fill forms, copy/merge pages. */
|
|
61
|
+
export { PdfEditor, PdfEditorPage } from "./builder/pdf-editor.js";
|
|
62
|
+
/** Digital signatures — verify and sign PDF documents. */
|
|
63
|
+
export { verifyPdfSignature, signPdf, buildSignatureDictPlaceholder, asn1Parse } from "./core/digital-signature.js";
|
|
55
64
|
export { PageSizes } from "./types.js";
|
|
56
65
|
// =============================================================================
|
|
57
66
|
// Errors
|
|
@@ -0,0 +1,324 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PDF bookmark (outline) extractor.
|
|
3
|
+
*
|
|
4
|
+
* Extracts the document outline tree from a PDF's `/Outlines` dictionary.
|
|
5
|
+
* Each outline item has a title, a target page index, and optional children
|
|
6
|
+
* forming a hierarchical bookmark tree.
|
|
7
|
+
*
|
|
8
|
+
* Supports:
|
|
9
|
+
* - Direct destinations (`/Dest` as array or named destination)
|
|
10
|
+
* - Action-based destinations (`/A << /S /GoTo /D ... >>`)
|
|
11
|
+
* - Nested bookmarks (children via `/First`/`/Last` chains)
|
|
12
|
+
* - Circular reference protection
|
|
13
|
+
*
|
|
14
|
+
* @see PDF Reference 1.7, §12.3 - Document-Level Navigation
|
|
15
|
+
*/
|
|
16
|
+
import { isPdfArray, isPdfRef, dictGetName, decodePdfStringBytes } from "./pdf-parser.js";
|
|
17
|
+
import { getDictStringValue } from "./reader-utils.js";
|
|
18
|
+
// =============================================================================
|
|
19
|
+
// Constants
|
|
20
|
+
// =============================================================================
|
|
21
|
+
/** Maximum depth for recursive outline traversal to prevent stack overflow. */
|
|
22
|
+
const MAX_OUTLINE_DEPTH = 100;
|
|
23
|
+
/** Maximum number of siblings at any level to prevent infinite /Next chains. */
|
|
24
|
+
const MAX_SIBLINGS = 10000;
|
|
25
|
+
// =============================================================================
|
|
26
|
+
// Public API
|
|
27
|
+
// =============================================================================
|
|
28
|
+
/**
|
|
29
|
+
* Extract bookmarks (outlines) from a PDF document.
|
|
30
|
+
*
|
|
31
|
+
* Reads the `/Outlines` dictionary from the catalog and recursively
|
|
32
|
+
* traverses the outline tree following `/First` → `/Next` chains.
|
|
33
|
+
*
|
|
34
|
+
* @param doc - The PDF document
|
|
35
|
+
* @returns Array of top-level bookmarks with nested children
|
|
36
|
+
*/
|
|
37
|
+
export function extractBookmarks(doc) {
|
|
38
|
+
try {
|
|
39
|
+
const catalog = doc.getCatalog();
|
|
40
|
+
const outlinesObj = catalog.get("Outlines");
|
|
41
|
+
if (!outlinesObj) {
|
|
42
|
+
return [];
|
|
43
|
+
}
|
|
44
|
+
const outlinesDict = doc.derefDict(outlinesObj);
|
|
45
|
+
if (!outlinesDict) {
|
|
46
|
+
return [];
|
|
47
|
+
}
|
|
48
|
+
// Build a page reference → index map for resolving destinations
|
|
49
|
+
const pageMap = buildPageMap(doc);
|
|
50
|
+
// The outline root's /First points to the first top-level item
|
|
51
|
+
const visited = new Set();
|
|
52
|
+
return collectSiblings(outlinesDict, doc, pageMap, visited, 0);
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return [];
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
// =============================================================================
|
|
59
|
+
// Page Map
|
|
60
|
+
// =============================================================================
|
|
61
|
+
/**
|
|
62
|
+
* Build a map from page object reference identity to 0-based page index.
|
|
63
|
+
*
|
|
64
|
+
* We map by object number since page dicts resolved from different refs
|
|
65
|
+
* will share the same objNum.
|
|
66
|
+
*/
|
|
67
|
+
function buildPageMap(doc) {
|
|
68
|
+
const pages = doc.getPagesWithObjInfo();
|
|
69
|
+
const map = new Map();
|
|
70
|
+
for (let i = 0; i < pages.length; i++) {
|
|
71
|
+
const { objNum } = pages[i];
|
|
72
|
+
if (objNum !== 0) {
|
|
73
|
+
map.set(objNum, i);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return map;
|
|
77
|
+
}
|
|
78
|
+
// =============================================================================
|
|
79
|
+
// Outline Tree Traversal
|
|
80
|
+
// =============================================================================
|
|
81
|
+
/**
|
|
82
|
+
* Collect the sibling chain starting from the `/First` child of a parent node.
|
|
83
|
+
*/
|
|
84
|
+
function collectSiblings(parentDict, doc, pageMap, visited, depth) {
|
|
85
|
+
if (depth > MAX_OUTLINE_DEPTH) {
|
|
86
|
+
return [];
|
|
87
|
+
}
|
|
88
|
+
const firstObj = parentDict.get("First");
|
|
89
|
+
if (!firstObj) {
|
|
90
|
+
return [];
|
|
91
|
+
}
|
|
92
|
+
const bookmarks = [];
|
|
93
|
+
let currentObj = firstObj;
|
|
94
|
+
let count = 0;
|
|
95
|
+
while (currentObj != null && count < MAX_SIBLINGS) {
|
|
96
|
+
count++;
|
|
97
|
+
// Guard against circular references using object numbers
|
|
98
|
+
if (isPdfRef(currentObj)) {
|
|
99
|
+
if (visited.has(currentObj.objNum)) {
|
|
100
|
+
break;
|
|
101
|
+
}
|
|
102
|
+
visited.add(currentObj.objNum);
|
|
103
|
+
}
|
|
104
|
+
const itemDict = doc.derefDict(currentObj);
|
|
105
|
+
if (!itemDict) {
|
|
106
|
+
break;
|
|
107
|
+
}
|
|
108
|
+
const bookmark = parseOutlineItem(itemDict, doc, pageMap, visited, depth);
|
|
109
|
+
if (bookmark) {
|
|
110
|
+
bookmarks.push(bookmark);
|
|
111
|
+
}
|
|
112
|
+
// Follow /Next to the next sibling
|
|
113
|
+
currentObj = itemDict.get("Next");
|
|
114
|
+
}
|
|
115
|
+
return bookmarks;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Parse a single outline item dictionary into a PdfBookmark.
|
|
119
|
+
*/
|
|
120
|
+
function parseOutlineItem(dict, doc, pageMap, visited, depth) {
|
|
121
|
+
// Extract title — required per spec
|
|
122
|
+
const title = getOutlineTitle(dict, doc);
|
|
123
|
+
if (!title) {
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
// Resolve destination to a page index
|
|
127
|
+
const pageIndex = resolveDestination(dict, doc, pageMap);
|
|
128
|
+
// Collect children (nested bookmarks)
|
|
129
|
+
const children = collectSiblings(dict, doc, pageMap, visited, depth + 1);
|
|
130
|
+
return { title, pageIndex, children };
|
|
131
|
+
}
|
|
132
|
+
// =============================================================================
|
|
133
|
+
// Title Extraction
|
|
134
|
+
// =============================================================================
|
|
135
|
+
/**
|
|
136
|
+
* Extract the title string from an outline item dictionary.
|
|
137
|
+
* The /Title entry is a text string (may be Uint8Array or string).
|
|
138
|
+
*/
|
|
139
|
+
function getOutlineTitle(dict, doc) {
|
|
140
|
+
return getDictStringValue(dict, "Title", doc);
|
|
141
|
+
}
|
|
142
|
+
// =============================================================================
|
|
143
|
+
// Destination Resolution
|
|
144
|
+
// =============================================================================
|
|
145
|
+
/**
|
|
146
|
+
* Resolve an outline item's destination to a 0-based page index.
|
|
147
|
+
*
|
|
148
|
+
* Checks /Dest first, then falls back to /A (action) with /S /GoTo.
|
|
149
|
+
* Returns -1 if the destination cannot be resolved.
|
|
150
|
+
*/
|
|
151
|
+
function resolveDestination(dict, doc, pageMap) {
|
|
152
|
+
// 1. Try /Dest (direct destination)
|
|
153
|
+
const destObj = dict.get("Dest");
|
|
154
|
+
if (destObj != null) {
|
|
155
|
+
const pageIndex = resolveDestValue(destObj, doc, pageMap);
|
|
156
|
+
if (pageIndex >= 0) {
|
|
157
|
+
return pageIndex;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
// 2. Try /A (action dictionary) with /S /GoTo
|
|
161
|
+
const actionObj = dict.get("A");
|
|
162
|
+
if (actionObj != null) {
|
|
163
|
+
const actionDict = doc.derefDict(actionObj);
|
|
164
|
+
if (actionDict) {
|
|
165
|
+
const actionType = dictGetName(actionDict, "S");
|
|
166
|
+
if (actionType === "GoTo") {
|
|
167
|
+
const actionDest = actionDict.get("D");
|
|
168
|
+
if (actionDest != null) {
|
|
169
|
+
return resolveDestValue(actionDest, doc, pageMap);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
return -1;
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Resolve a destination value (from /Dest or /A.D) to a page index.
|
|
178
|
+
*
|
|
179
|
+
* Destination formats (PDF Reference 1.7, §12.3.2):
|
|
180
|
+
* - Array: `[pageRef /XYZ left top zoom]`, `[pageRef /Fit]`, etc.
|
|
181
|
+
* - Named string: looked up in the document's /Dests or /Names.Dests
|
|
182
|
+
*/
|
|
183
|
+
function resolveDestValue(destObj, doc, pageMap) {
|
|
184
|
+
const resolved = doc.deref(destObj);
|
|
185
|
+
if (resolved == null) {
|
|
186
|
+
return -1;
|
|
187
|
+
}
|
|
188
|
+
// Array destination: first element is the page reference
|
|
189
|
+
if (isPdfArray(resolved) && resolved.length >= 1) {
|
|
190
|
+
return resolvePageRef(resolved[0], doc, pageMap);
|
|
191
|
+
}
|
|
192
|
+
// Named destination (string) — look up in /Dests or /Names tree
|
|
193
|
+
if (typeof resolved === "string") {
|
|
194
|
+
return resolveNamedDest(resolved, doc, pageMap);
|
|
195
|
+
}
|
|
196
|
+
// Byte string named destination
|
|
197
|
+
if (resolved instanceof Uint8Array) {
|
|
198
|
+
const name = decodePdfStringBytes(resolved);
|
|
199
|
+
return resolveNamedDest(name, doc, pageMap);
|
|
200
|
+
}
|
|
201
|
+
return -1;
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Resolve a page reference (from the first element of a dest array) to a page index.
|
|
205
|
+
*/
|
|
206
|
+
function resolvePageRef(pageObj, doc, pageMap) {
|
|
207
|
+
// If it's a direct reference, use the object number
|
|
208
|
+
if (isPdfRef(pageObj)) {
|
|
209
|
+
const idx = pageMap.get(pageObj.objNum);
|
|
210
|
+
return idx !== undefined ? idx : -1;
|
|
211
|
+
}
|
|
212
|
+
// If it's a page number (integer), use it directly as 0-based index
|
|
213
|
+
if (typeof pageObj === "number" && Number.isInteger(pageObj)) {
|
|
214
|
+
return pageObj;
|
|
215
|
+
}
|
|
216
|
+
return -1;
|
|
217
|
+
}
|
|
218
|
+
/**
|
|
219
|
+
* Look up a named destination in the catalog's /Dests dictionary
|
|
220
|
+
* or /Names.Dests name tree.
|
|
221
|
+
*/
|
|
222
|
+
function resolveNamedDest(name, doc, pageMap) {
|
|
223
|
+
const catalog = doc.getCatalog();
|
|
224
|
+
// 1. Try /Dests dictionary (older PDFs)
|
|
225
|
+
const destsObj = catalog.get("Dests");
|
|
226
|
+
if (destsObj != null) {
|
|
227
|
+
const destsDict = doc.derefDict(destsObj);
|
|
228
|
+
if (destsDict) {
|
|
229
|
+
const entry = destsDict.get(name);
|
|
230
|
+
if (entry != null) {
|
|
231
|
+
return resolveDestEntry(entry, doc, pageMap);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
// 2. Try /Names.Dests name tree (PDF 1.2+)
|
|
236
|
+
const namesObj = catalog.get("Names");
|
|
237
|
+
if (namesObj != null) {
|
|
238
|
+
const namesDict = doc.derefDict(namesObj);
|
|
239
|
+
if (namesDict) {
|
|
240
|
+
const destsTreeObj = namesDict.get("Dests");
|
|
241
|
+
if (destsTreeObj != null) {
|
|
242
|
+
const value = lookupNameTree(destsTreeObj, name, doc);
|
|
243
|
+
if (value != null) {
|
|
244
|
+
return resolveDestEntry(value, doc, pageMap);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
return -1;
|
|
250
|
+
}
|
|
251
|
+
/**
|
|
252
|
+
* Resolve a destination entry value. It may be a dict with /D key,
|
|
253
|
+
* or a direct array destination.
|
|
254
|
+
*/
|
|
255
|
+
function resolveDestEntry(entry, doc, pageMap) {
|
|
256
|
+
const resolved = doc.deref(entry);
|
|
257
|
+
if (resolved == null) {
|
|
258
|
+
return -1;
|
|
259
|
+
}
|
|
260
|
+
// Direct array destination
|
|
261
|
+
if (isPdfArray(resolved) && resolved.length >= 1) {
|
|
262
|
+
return resolvePageRef(resolved[0], doc, pageMap);
|
|
263
|
+
}
|
|
264
|
+
// Dictionary with /D entry (destination dictionary)
|
|
265
|
+
if (resolved instanceof Map) {
|
|
266
|
+
const d = resolved.get("D");
|
|
267
|
+
if (d != null) {
|
|
268
|
+
return resolveDestValue(d, doc, pageMap);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return -1;
|
|
272
|
+
}
|
|
273
|
+
/**
|
|
274
|
+
* Look up a key in a PDF name tree.
|
|
275
|
+
*
|
|
276
|
+
* Name trees use either /Names (leaf) or /Kids (intermediate) arrays.
|
|
277
|
+
* /Names is an array of alternating [key, value, key, value, ...] pairs.
|
|
278
|
+
*
|
|
279
|
+
* @see PDF Reference 1.7, §7.9.6 - Name Trees
|
|
280
|
+
*/
|
|
281
|
+
function lookupNameTree(treeObj, name, doc, depth = 0) {
|
|
282
|
+
if (depth > MAX_OUTLINE_DEPTH) {
|
|
283
|
+
return null;
|
|
284
|
+
}
|
|
285
|
+
const treeDict = doc.derefDict(treeObj);
|
|
286
|
+
if (!treeDict) {
|
|
287
|
+
return null;
|
|
288
|
+
}
|
|
289
|
+
// Check leaf /Names array
|
|
290
|
+
const namesArr = treeDict.get("Names");
|
|
291
|
+
if (namesArr != null) {
|
|
292
|
+
const resolved = doc.deref(namesArr);
|
|
293
|
+
if (isPdfArray(resolved)) {
|
|
294
|
+
// Alternating [key, value, key, value, ...]
|
|
295
|
+
for (let i = 0; i + 1 < resolved.length; i += 2) {
|
|
296
|
+
const key = doc.deref(resolved[i]);
|
|
297
|
+
let keyStr = null;
|
|
298
|
+
if (typeof key === "string") {
|
|
299
|
+
keyStr = key;
|
|
300
|
+
}
|
|
301
|
+
else if (key instanceof Uint8Array) {
|
|
302
|
+
keyStr = decodePdfStringBytes(key);
|
|
303
|
+
}
|
|
304
|
+
if (keyStr === name) {
|
|
305
|
+
return resolved[i + 1];
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
// Check intermediate /Kids array
|
|
311
|
+
const kidsArr = treeDict.get("Kids");
|
|
312
|
+
if (kidsArr != null) {
|
|
313
|
+
const resolved = doc.deref(kidsArr);
|
|
314
|
+
if (isPdfArray(resolved)) {
|
|
315
|
+
for (const kid of resolved) {
|
|
316
|
+
const result = lookupNameTree(kid, name, doc, depth + 1);
|
|
317
|
+
if (result != null) {
|
|
318
|
+
return result;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
return null;
|
|
324
|
+
}
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
* @see PDF Reference 1.7, §3.5 - Encryption
|
|
11
11
|
* @see PDF 2.0 (ISO 32000-2), §7.6 - Encryption
|
|
12
12
|
*/
|
|
13
|
-
import { rc4, md5, sha256, aesCbcDecrypt, aesCbcDecryptRaw
|
|
13
|
+
import { rc4, md5, sha256, aesCbcDecrypt, aesCbcDecryptRaw } from "../../../utils/crypto.js";
|
|
14
|
+
import { concatUint8Arrays } from "../../../utils/binary.js";
|
|
14
15
|
import { dictGetNumber, dictGetName, dictGetBytes, dictGetArray, dictGetBool } from "./pdf-parser.js";
|
|
15
16
|
import { PdfStructureError } from "../errors.js";
|
|
16
17
|
// =============================================================================
|
|
@@ -164,13 +165,13 @@ function tryUserPasswordV5(passwordBytes, uValue, ueValue) {
|
|
|
164
165
|
const uValidationSalt = uValue.subarray(32, 40);
|
|
165
166
|
const uKeySalt = uValue.subarray(40, 48);
|
|
166
167
|
// Validate: SHA-256(password + validation salt) == first 32 bytes of U
|
|
167
|
-
const validateInput =
|
|
168
|
+
const validateInput = concatUint8Arrays([passwordBytes, uValidationSalt]);
|
|
168
169
|
const computedHash = sha256(validateInput);
|
|
169
170
|
if (!arraysEqual(computedHash, uHash)) {
|
|
170
171
|
return null;
|
|
171
172
|
}
|
|
172
173
|
// Derive key: SHA-256(password + key salt) => use as AES-256 key to decrypt UE
|
|
173
|
-
const keyInput =
|
|
174
|
+
const keyInput = concatUint8Arrays([passwordBytes, uKeySalt]);
|
|
174
175
|
const keyHash = sha256(keyInput);
|
|
175
176
|
// Decrypt UE with this key using AES-256-CBC with zero IV
|
|
176
177
|
const zeroIv = new Uint8Array(16);
|
|
@@ -188,13 +189,13 @@ function tryOwnerPasswordV5(passwordBytes, oValue, oeValue, uValue) {
|
|
|
188
189
|
const oKeySalt = oValue.subarray(40, 48);
|
|
189
190
|
const u48 = uValue.subarray(0, 48);
|
|
190
191
|
// Validate: SHA-256(password + validation salt + U(0..47)) == first 32 bytes of O
|
|
191
|
-
const validateInput =
|
|
192
|
+
const validateInput = concatUint8Arrays([passwordBytes, oValidationSalt, u48]);
|
|
192
193
|
const computedHash = sha256(validateInput);
|
|
193
194
|
if (!arraysEqual(computedHash, oHash)) {
|
|
194
195
|
return null;
|
|
195
196
|
}
|
|
196
197
|
// Derive key: SHA-256(password + key salt + U(0..47))
|
|
197
|
-
const keyInput =
|
|
198
|
+
const keyInput = concatUint8Arrays([passwordBytes, oKeySalt, u48]);
|
|
198
199
|
const keyHash = sha256(keyInput);
|
|
199
200
|
// Decrypt OE with this key using AES-256-CBC with zero IV
|
|
200
201
|
const zeroIv = new Uint8Array(16);
|