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

Support the newWindow flag in white-listed app.launchURL JavaScript actions (PR 7794 follow-up)

Browse Source 
A simple follow-up to PR 7794, which let's us add support for the `newWindow` parameter; refer to https://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/js_api_reference.pdf#G5.1507380.

The patch also fixes an embarrassing oversight regarding the placement of the case-insensitive flag, and also allows arbitrary white-space at the beginning of JS actions.
This commit is contained in:
Jonas Jenwald 2017-02-27 12:08:41 +01:00
parent afc3cd2a81
commit 2a7e5b8a54
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/obj.js
View File

@ -703,12 +703,17 @@ var Catalog = (function CatalogClosure() {
'app.launchURL', 'app.launchURL',
'window.open' 'window.open'
]; ];
var regex = new RegExp('^(?:' + URL_OPEN_METHODS.join('|') + ')' + var regex = new RegExp(
'\\((?:\'|\")(\\S+)(?:\'|\")(?:,|\\))'); '^\\s*(' + URL_OPEN_METHODS.join('|').split('.').join('\\.') +
')\\((?:\'|\")([^\'\"]*)(?:\'|\")(?:,\\s*(\\w+)\\)|\\))', 'i');
var jsUrl = regex.exec(stringToPDFString(js), 'i'); var jsUrl = regex.exec(stringToPDFString(js));
if (jsUrl && jsUrl[1]) { if (jsUrl && jsUrl[2]) {
url = jsUrl[1]; url = jsUrl[2];
if (jsUrl[3] === 'true' && jsUrl[1] === 'app.launchURL') {
resultObj.newWindow = true;
}
break; break;
} }
} }

6
test/unit/annotation_spec.js
View File

@ -611,6 +611,7 @@ describe('annotation', function() {
var jsEntry = params.jsEntry; var jsEntry = params.jsEntry;
var expectedUrl = params.expectedUrl; var expectedUrl = params.expectedUrl;
var expectedUnsafeUrl = params.expectedUnsafeUrl; var expectedUnsafeUrl = params.expectedUnsafeUrl;
var expectedNewWindow = params.expectedNewWindow;
var actionDict = new Dict(); var actionDict = new Dict();
actionDict.set('Type', Name.get('Action')); actionDict.set('Type', Name.get('Action'));
@ -636,7 +637,7 @@ describe('annotation', function() {
expect(data.url).toEqual(expectedUrl); expect(data.url).toEqual(expectedUrl);
expect(data.unsafeUrl).toEqual(expectedUnsafeUrl); expect(data.unsafeUrl).toEqual(expectedUnsafeUrl);
expect(data.dest).toBeUndefined(); expect(data.dest).toBeUndefined();
expect(data.newWindow).toBeFalsy(); expect(data.newWindow).toEqual(expectedNewWindow);
} }
// Check that we reject a 'JS' entry containing arbitrary JavaScript. // Check that we reject a 'JS' entry containing arbitrary JavaScript.
@ -644,12 +645,14 @@ describe('annotation', function() {
jsEntry: 'function someFun() { return "qwerty"; } someFun();', jsEntry: 'function someFun() { return "qwerty"; } someFun();',
expectedUrl: undefined, expectedUrl: undefined,
expectedUnsafeUrl: undefined, expectedUnsafeUrl: undefined,
expectedNewWindow: undefined,
}); });
// Check that we accept a white-listed {string} 'JS' entry. // Check that we accept a white-listed {string} 'JS' entry.
checkJsAction({ checkJsAction({
jsEntry: 'window.open(\'http://www.example.com/test.pdf\')', jsEntry: 'window.open(\'http://www.example.com/test.pdf\')',
expectedUrl: new URL('http://www.example.com/test.pdf').href, expectedUrl: new URL('http://www.example.com/test.pdf').href,
expectedUnsafeUrl: 'http://www.example.com/test.pdf', expectedUnsafeUrl: 'http://www.example.com/test.pdf',
expectedNewWindow: undefined,
}); });
// Check that we accept a white-listed {Stream} 'JS' entry. // Check that we accept a white-listed {Stream} 'JS' entry.
checkJsAction({ checkJsAction({
@ -657,6 +660,7 @@ describe('annotation', function() {
'app.launchURL("http://www.example.com/test.pdf", true)'), 'app.launchURL("http://www.example.com/test.pdf", true)'),
expectedUrl: new URL('http://www.example.com/test.pdf').href, expectedUrl: new URL('http://www.example.com/test.pdf').href,
expectedUnsafeUrl: 'http://www.example.com/test.pdf', expectedUnsafeUrl: 'http://www.example.com/test.pdf',
expectedNewWindow: true,
}); });
}); });