Skip to content

Commit 0f6b509

Browse files
rdeltourrdeltour
committed
feat: report 'file' URLs as errors
Report `file:` URLs as a new error RSC-030 Fixes #1270
1 parent a3c736d commit 0f6b509

15 files changed

Lines changed: 70 additions & 19 deletions

File tree

‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private void initialize()
136136
severities.put(MessageId.HTM_050, Severity.SUPPRESSED);
137137
severities.put(MessageId.HTM_051, Severity.WARNING);
138138
severities.put(MessageId.HTM_052, Severity.ERROR);
139-
severities.put(MessageId.HTM_053, Severity.INFO);
139+
severities.put(MessageId.HTM_053, Severity.SUPPRESSED);
140140
severities.put(MessageId.HTM_054, Severity.ERROR);
141141
severities.put(MessageId.HTM_055, Severity.WARNING);
142142
severities.put(MessageId.HTM_056, Severity.ERROR);
@@ -343,6 +343,7 @@ private void initialize()
343343
severities.put(MessageId.RSC_027, Severity.WARNING);
344344
severities.put(MessageId.RSC_028, Severity.ERROR);
345345
severities.put(MessageId.RSC_029, Severity.ERROR);
346+
severities.put(MessageId.RSC_030, Severity.ERROR);
346347

347348
// Scripting
348349
severities.put(MessageId.SCP_001, Severity.SUPPRESSED); // checking scripts is out of scope

‎src/main/java/com/adobe/epubcheck/messages/MessageId.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ public enum MessageId implements Comparable<MessageId>
337337
RSC_027("RSC-027"),
338338
RSC_028("RSC-028"),
339339
RSC_029("RSC-029"),
340+
RSC_030("RSC-030"),
340341

341342
// Messages relating to scripting
342343
SCP_001("SCP-001"),

‎src/main/java/com/adobe/epubcheck/ops/OPSHandler.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,6 @@ else if (".".equals(href))
142142
// If the URL was not properly parsed, return early
143143
if (url == null) return;
144144

145-
if ("file".equals(url.scheme()))
146-
{
147-
// FIXME next disallow file URLs
148-
report.message(MessageId.HTM_053, location(), url);
149-
}
150145
if (context.isRemote(url))
151146
{
152147
report.info(path, FeatureEnum.REFERENCE, href);

‎src/main/java/org/w3c/epubcheck/url/URLChecker.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ private URL resolveURL(String string, boolean isBase, EPUBLocation location)
7272
if (string == null) return null;
7373
try
7474
{
75+
// Report file URLs
76+
if (string.startsWith("file:"))
77+
{
78+
report.message(MessageId.RSC_030, location, string);
79+
}
80+
7581
// Collapse formatting whitespace in data URLs
7682
if (string.startsWith("data:"))
7783
{

‎src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ HTM_049_SUG=Add xmlns="http://www.w3.org/1999/xhtml" to the html element.
121121
HTM_050=Found epub:type="pagebreak" attribute in content document.
122122
HTM_051=Found Microdata semantic enrichments but no RDFa. EDUPUB recommends using RDFa Lite.
123123
HTM_052=The property "region-based" is only allowed on nav elements in Data Navigation Documents.
124-
HTM_053=Found an external file link (file://) in file: "%1$s".
125124
HTM_054=Custom attribute namespace ("%1$s") must not include the string "%2$s" in its domain.
126125
HTM_055=The "%1$s" element should not be used (discouraged construct)
127126
HTM_056=Viewport metadata has no "%1$s" dimension (both "width" and "height" properties are required)
@@ -353,6 +352,7 @@ RSC_026=URL "%1$s" leaks outside the container (it is not a valid-relative-ocf-U
353352
RSC_027=XML document is encoded in UTF-16. It should be encoded in UTF-8 instead.
354353
RSC_028=XML documents must be encoded in UTF-8, but %1%s was detected.
355354
RSC_029=Data URL is not allowed in this context.
355+
RSC_030=File URLs are not allowed in EPUB, but found "%1$s".
356356

357357
#Scripting
358358
SCP_001=Use of Javascript eval() function in EPUB scripts is a security risk.

src/test/resources/epub3/06-content-document/files/content-xhtml-link-to-local-file-valid/EPUB/content_001.xhtml renamed to src/test/resources/epub3/03-resources/files/file-url-in-css-error/EPUB/content_001.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<head>
44
<meta charset="utf-8"/>
55
<title>Minimal EPUB</title>
6+
<link type="text/css" rel="stylesheet" href="style.css" />
67
</head>
78
<body>
89
<h1>Loomings</h1>
910
<p>Call me Ishmael.</p>
10-
<a class="external" href="file:///C:/path/file.pdf">link to local file</a>
1111
</body>
1212
</html>

src/test/resources/epub3/06-content-document/files/content-xhtml-link-to-local-file-valid/EPUB/nav.xhtml renamed to src/test/resources/epub3/03-resources/files/file-url-in-css-error/EPUB/nav.xhtml

File renamed without changes.

‎src/test/resources/epub3/03-resources/files/file-url-in-css-error/EPUB/package.opf‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
3+
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
4+
<dc:title id="title">Minimal EPUB 3.0</dc:title>
5+
<dc:language>en</dc:language>
6+
<dc:identifier id="q">NOID</dc:identifier>
7+
<meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
8+
</metadata>
9+
<manifest>
10+
<item id="content_001" href="content_001.xhtml" media-type="application/xhtml+xml"/>
11+
<item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
12+
<item id="css" href="style.css" media-type="text/css" properties="remote-resources"/>
13+
<item id="font" href="file:///font.woff" media-type="font/woff"/>
14+
</manifest>
15+
<spine>
16+
<itemref idref="content_001"/>
17+
</spine>
18+
</package>

‎src/test/resources/epub3/03-resources/files/file-url-in-css-error/EPUB/style.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@font-face {
2+
font-family: "myfont";
3+
src: url('file:/font.woff');
4+
}

src/test/resources/epub3/06-content-document/files/content-xhtml-link-to-local-file-valid/META-INF/container.xml renamed to src/test/resources/epub3/03-resources/files/file-url-in-css-error/META-INF/container.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8" ?>
2-
<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
33
<rootfiles>
44
<rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
55
</rootfiles>

0 commit comments

Comments
 (0)
⌂ 换网址