Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1766 from yurydelendik/encryptmeta

Browse Source 
Suppress metadata decryption
This commit is contained in:
Brendan Dahl 2012-05-29 09:44:24 -07:00
commit 2ba7cbc4fa
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto.js
View File

@ -546,8 +546,10 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
var userPassword = stringToBytes(dict.get('U')); var userPassword = stringToBytes(dict.get('U'));
var flags = dict.get('P'); var flags = dict.get('P');
var revision = dict.get('R'); var revision = dict.get('R');
var encryptMetadata = var encryptMetadata = algorithm == 4 && // meaningful when V is 4
dict.get('EncryptMetadata') !== false; // makes true as default value dict.get('EncryptMetadata') !== false; // makes true as default value
this.encryptMetadata = encryptMetadata;
var fileIdBytes = stringToBytes(fileId); var fileIdBytes = stringToBytes(fileId);
var passwordBytes; var passwordBytes;
if (password) if (password)

20
src/obj.js
View File

@ -132,7 +132,14 @@ var Catalog = (function CatalogClosure() {
Catalog.prototype = { Catalog.prototype = {
get metadata() { get metadata() {
var stream = this.catDict.get('Metadata'); var streamRef = this.catDict.getRaw('Metadata');
if (!isRef(streamRef))
return shadow(this, 'metadata', null);
var encryptMetadata = !this.xref.encrypt ? false :
this.xref.encrypt.encryptMetadata;
var stream = this.xref.fetch(streamRef, !encryptMetadata);
var metadata; var metadata;
if (stream && isDict(stream.dict)) { if (stream && isDict(stream.dict)) {
var type = stream.dict.get('Type'); var type = stream.dict.get('Type');
@ -140,7 +147,16 @@ var Catalog = (function CatalogClosure() {
if (isName(type) && isName(subtype) && if (isName(type) && isName(subtype) &&
type.name === 'Metadata' && subtype.name === 'XML') { type.name === 'Metadata' && subtype.name === 'XML') {
metadata = stringToPDFString(bytesToString(stream.getBytes())); // XXX: This should examine the charset the XML document defines,
// however since there are currently no real means to decode
// arbitrary charsets, let's just hope that the author of the PDF
// was reasonable enough to stick with the XML default charset,
// which is UTF-8.
try {
metadata = stringToUTF8String(bytesToString(stream.getBytes()));
} catch (e) {
info('Skipping invalid metadata.');
}
} }
} }

4
src/util.js
View File

@ -332,6 +332,10 @@ function stringToPDFString(str) {
return str2; return str2;
} }
function stringToUTF8String(str) {
return decodeURIComponent(escape(str));
}
function isBool(v) { function isBool(v) {
return typeof v == 'boolean'; return typeof v == 'boolean';
} }