1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-25 17:48:07 +02:00

XFA - Add <a> element in button when an url is detected (bug 1716758)

- it aims to fix https://bugzilla.mozilla.org/show_bug.cgi?id=1716758;
  - some buttons have a JS action with the pattern `app.launchURL(...)` (or similar) so extract when it's possible the url and generate a <a> element with the href equals to the found url;
  - pdf.js already had some code to handle that so this patch slightly refactor that.
This commit is contained in:
Calixte Denizet 2021-09-25 14:46:40 +02:00
parent 3b1d547738
commit 558e58f354
8 changed files with 173 additions and 44 deletions

View file

@ -17,6 +17,7 @@ import {
addDefaultProtocolToUrl,
collectActions,
MissingDataException,
recoverJsURL,
toRomanNumerals,
tryConvertUrlEncoding,
} from "./core_utils.js";
@ -1399,28 +1400,11 @@ class Catalog {
js = jsAction;
}
if (js) {
// Attempt to recover valid URLs from `JS` entries with certain
// white-listed formats:
// - window.open('http://example.com')
// - app.launchURL('http://example.com', true)
const URL_OPEN_METHODS = ["app.launchURL", "window.open"];
const regex = new RegExp(
"^\\s*(" +
URL_OPEN_METHODS.join("|").split(".").join("\\.") +
")\\((?:'|\")([^'\"]*)(?:'|\")(?:,\\s*(\\w+)\\)|\\))",
"i"
);
const jsUrl = regex.exec(stringToPDFString(js));
if (jsUrl && jsUrl[2]) {
url = jsUrl[2];
if (jsUrl[3] === "true" && jsUrl[1] === "app.launchURL") {
resultObj.newWindow = true;
}
break;
}
const jsURL = js && recoverJsURL(stringToPDFString(js));
if (jsURL) {
url = jsURL.url;
resultObj.newWindow = jsURL.newWindow;
break;
}
/* falls through */
default:

View file

@ -467,6 +467,34 @@ function tryConvertUrlEncoding(url) {
}
}
function recoverJsURL(str) {
// Attempt to recover valid URLs from `JS` entries with certain
// white-listed formats:
// - window.open('http://example.com')
// - app.launchURL('http://example.com', true)
// - xfa.host.gotoURL('http://example.com')
const URL_OPEN_METHODS = ["app.launchURL", "window.open", "xfa.host.gotoURL"];
const regex = new RegExp(
"^\\s*(" +
URL_OPEN_METHODS.join("|").split(".").join("\\.") +
")\\((?:'|\")([^'\"]*)(?:'|\")(?:,\\s*(\\w+)\\)|\\))",
"i"
);
const jsUrl = regex.exec(str);
if (jsUrl && jsUrl[2]) {
const url = jsUrl[2];
let newWindow = false;
if (jsUrl[3] === "true" && jsUrl[1] === "app.launchURL") {
newWindow = true;
}
return { url, newWindow };
}
return null;
}
export {
addDefaultProtocolToUrl,
collectActions,
@ -483,6 +511,7 @@ export {
readInt8,
readUint16,
readUint32,
recoverJsURL,
toRomanNumerals,
tryConvertUrlEncoding,
validateCSSFont,

View file

@ -26,10 +26,14 @@ import {
$toStyle,
XFAObject,
} from "./xfa_object.js";
import {
addDefaultProtocolToUrl,
tryConvertUrlEncoding,
} from "../core_utils.js";
import { createValidAbsoluteUrl, warn } from "../../shared/util.js";
import { getMeasurement, stripQuotes } from "./utils.js";
import { selectFont } from "./fonts.js";
import { TextMeasure } from "./text.js";
import { warn } from "../../shared/util.js";
function measureToString(m) {
if (typeof m === "string") {
@ -633,11 +637,24 @@ function setFontFamily(xfaFont, node, fontFinder, style) {
}
}
function fixURL(str) {
if (typeof str === "string") {
let url = addDefaultProtocolToUrl(str);
url = tryConvertUrlEncoding(url);
const absoluteUrl = createValidAbsoluteUrl(url);
if (absoluteUrl) {
return absoluteUrl.href;
}
}
return null;
}
export {
computeBbox,
createWrapper,
fixDimensions,
fixTextIndent,
fixURL,
isPrintOnly,
layoutClass,
layoutNode,

View file

@ -76,6 +76,7 @@ import {
createWrapper,
fixDimensions,
fixTextIndent,
fixURL,
isPrintOnly,
layoutClass,
layoutNode,
@ -100,6 +101,7 @@ import {
} from "./utils.js";
import { stringToBytes, Util, warn } from "../../shared/util.js";
import { getMetrics } from "./fonts.js";
import { recoverJsURL } from "../core_utils.js";
import { searchNode } from "./som.js";
const TEMPLATE_NS_ID = NamespaceIds.template.id;
@ -1066,7 +1068,10 @@ class Button extends XFAObject {
[$toHTML](availableSpace) {
// TODO: highlight.
return HTMLResult.success({
const parent = this[$getParent]();
const grandpa = parent[$getParent]();
const htmlButton = {
name: "button",
attributes: {
id: this[$uid],
@ -1074,7 +1079,38 @@ class Button extends XFAObject {
style: {},
},
children: [],
});
};
for (const event of grandpa.event.children) {
// if (true) break;
if (event.activity !== "click" || !event.script) {
continue;
}
const jsURL = recoverJsURL(event.script[$content]);
if (!jsURL) {
continue;
}
const href = fixURL(jsURL.url);
if (!href) {
continue;
}
const target = jsURL.newWindow ? "_blank" : undefined;
// we've an url so generate a <a>
htmlButton.children.push({
name: "a",
attributes: {
id: "link" + this[$uid],
href,
target,
class: ["xfaLink"],
style: {},
},
children: [],
});
}
return HTMLResult.success(htmlButton);
}
}
@ -2897,7 +2933,12 @@ class Field extends XFAObject {
ui.attributes.style = Object.create(null);
}
let aElement = null;
if (this.ui.button) {
if (ui.children.length === 1) {
[aElement] = ui.children.splice(0, 1);
}
Object.assign(ui.attributes.style, borderStyle);
} else {
Object.assign(style, borderStyle);
@ -2955,6 +2996,10 @@ class Field extends XFAObject {
}
}
if (aElement) {
ui.children.push(aElement);
}
if (!caption) {
if (ui.attributes.class) {
// Even if no caption this class will help to center the ui.

View file

@ -30,12 +30,12 @@ import {
} from "./xfa_object.js";
import { $buildXFAObject, NamespaceIds } from "./namespaces.js";
import {
addDefaultProtocolToUrl,
tryConvertUrlEncoding,
} from "../core_utils.js";
import { fixTextIndent, measureToString, setFontFamily } from "./html_utils.js";
fixTextIndent,
fixURL,
measureToString,
setFontFamily,
} from "./html_utils.js";
import { getMeasurement, HTMLResult, stripQuotes } from "./utils.js";
import { createValidAbsoluteUrl } from "../../shared/util.js";
const XHTML_NS_ID = NamespaceIds.xhtml.id;
@ -326,16 +326,7 @@ class XhtmlObject extends XmlObject {
class A extends XhtmlObject {
constructor(attributes) {
super(attributes, "a");
let href = "";
if (typeof attributes.href === "string") {
let url = addDefaultProtocolToUrl(attributes.href);
url = tryConvertUrlEncoding(url);
const absoluteUrl = createValidAbsoluteUrl(url);
if (absoluteUrl) {
href = absoluteUrl.href;
}
}
this.href = href;
this.href = fixURL(attributes.href) || "";
}
}