w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java‎
Lines changed: 7 additions & 2 deletions b/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFHandler30.java‎
Lines changed: 10 additions & 5 deletions b/‎src/main/java/com/adobe/epubcheck/opf/OPFHandler30.java‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/content_001.xhtml‎
Lines changed: 0 additions & 37 deletions b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/content_001.xhtml‎
Lines changed: 0 additions & 37 deletions
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/image.jpeg‎
-1.92 KB b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/image.jpeg‎
-1.92 KB
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/nav.xhtml‎
Lines changed: 0 additions & 14 deletions b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/nav.xhtml‎
Lines changed: 0 additions & 14 deletions
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/package.opf‎
Lines changed: 0 additions & 45 deletions b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/EPUB/package.opf‎
Lines changed: 0 additions & 45 deletions
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/META-INF/container.xml‎
Lines changed: 0 additions & 6 deletions b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/META-INF/container.xml‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/mimetype‎
Lines changed: 0 additions & 1 deletion b/‎src/test/resources/epub3/03-resources/files/data-url-in-html-img-foreign-manifest-fallback-valid/mimetype‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎…iles/data-url-in-manifest-item-valid.opf‎ ‎…iles/data-url-in-manifest-item-error.opf‎src/test/resources/epub3/03-resources/files/data-url-in-manifest-item-valid.opf renamed to src/test/resources/epub3/03-resources/files/data-url-in-manifest-item-error.opf b/‎…iles/data-url-in-manifest-item-valid.opf‎ ‎…iles/data-url-in-manifest-item-error.opf‎src/test/resources/epub3/03-resources/files/data-url-in-manifest-item-valid.opf renamed to src/test/resources/epub3/03-resources/files/data-url-in-manifest-item-error.opf
diff --git a/‎src/test/resources/epub3/03-resources/files/data-url-in-package-link-error.opf‎
Lines changed: 17 additions & 0 deletions b/‎src/test/resources/epub3/03-resources/files/data-url-in-package-link-error.opf‎
Lines changed: 17 additions & 0 deletions
@@ -85,6 +85,12 @@ protected boolean checkContent()
   @Override
   protected void checkItem(OPFItem item, OPFHandler opfHandler)
   {
+    // Items with `data:` URLs are not allowed in EPUB 3
+    if (item.hasDataURL())
+    {
+      report.message(MessageId.RSC_029, item.getLocation());
+      return;
+    }
     if (item.getPath().startsWith("META-INF/"))
     {
       report.message(MessageId.PKG_025, item.getLocation());
@@ -182,10 +188,9 @@ else if (!overlayTextChecker.isCorrectOverlay(docURL, mo))
   @Override
   protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)
   {
-    // Items with `data:` URLs are not allowed in the spine
+    // Items with `data:` URLs are not allowed and reported earlier
     if (item.hasDataURL())
     {
-      report.message(MessageId.RSC_029, item.getLocation());
       return;
     }
 
 
@@ -393,12 +393,17 @@ private void processLink()
   {
     XMLElement e = currentElement();
 
+    // check the 'href' URL
+    // href presence is checked by schema
     String href = e.getAttribute("href");
-    if (href != null)
-    { // href presence is checked by schema
-
-      // check the 'href' URL
-      URL url = checkURL(href);
+    URL url = checkURL(href);
+    if (url != null)
+    {
+      // Data URLs are not allowed on `link` elements
+      if ("data".equals(url.scheme())) {
+        report.message(MessageId.RSC_029, location());
+        return;
+      }
       if (context.isRemote(url))
       {
         report.info(path, FeatureEnum.REFERENCE, href);
 
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <dc:title id="title">Minimal EPUB 3.0</dc:title>
+    <dc:language>en</dc:language>
+    <dc:identifier id="q">NOID</dc:identifier>
+    <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+    <link rel="alternate" href="data:application/xhtml+xml,%3Ch1%3EHello%3C%2Fh1%3E" media-type="application/xhtml+xml"/>
+  </metadata>
+  <manifest>
+    <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+    <item id="content_001" href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  </manifest>
+  <spine>
+    <itemref idref="content_001"/>
+  </spine>
+</package>
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,12 @@ protected boolean checkContent()`
`85`	`85`	`@Override`
`86`	`86`	`protected void checkItem(OPFItem item, OPFHandler opfHandler)`
`87`	`87`	`{`
	`88`	+ // Items with `data:` URLs are not allowed in EPUB 3
	`89`	`+ if (item.hasDataURL())`
	`90`	`+ {`
	`91`	`+ report.message(MessageId.RSC_029, item.getLocation());`
	`92`	`+ return;`
	`93`	`+ }`
`88`	`94`	`if (item.getPath().startsWith("META-INF/"))`
`89`	`95`	`{`
`90`	`96`	`report.message(MessageId.PKG_025, item.getLocation());`
`@@ -182,10 +188,9 @@ else if (!overlayTextChecker.isCorrectOverlay(docURL, mo))`
`182`	`188`	`@Override`
`183`	`189`	`protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)`
`184`	`190`	`{`
`185`		- // Items with `data:` URLs are not allowed in the spine
	`191`	+ // Items with `data:` URLs are not allowed and reported earlier
`186`	`192`	`if (item.hasDataURL())`
`187`	`193`	`{`
`188`		`- report.message(MessageId.RSC_029, item.getLocation());`
`189`	`194`	`return;`
`190`	`195`	`}`
`191`	`196`