w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/ocf/OCFContainer.java
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/main/java/com/adobe/epubcheck/ocf/OCFContainer.java
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker.java
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker.java
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFItem.java
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎src/main/java/com/adobe/epubcheck/opf/OPFItem.java
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/ValidationContext.java
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/main/java/com/adobe/epubcheck/opf/ValidationContext.java
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -340,6 +340,7 @@ private void initialize()
     severities.put(MessageId.RSC_026, Severity.ERROR);
     severities.put(MessageId.RSC_027, Severity.WARNING);
     severities.put(MessageId.RSC_028, Severity.ERROR);
+    severities.put(MessageId.RSC_029, Severity.ERROR);
 
     // Scripting
     severities.put(MessageId.SCP_001, Severity.SUPPRESSED); // checking scripts is out of scope
 
@@ -334,6 +334,7 @@ public enum MessageId implements Comparable<MessageId>
   RSC_026("RSC-026"),
   RSC_027("RSC-027"),
   RSC_028("RSC-028"),
+  RSC_029("RSC-029"),
 
   // Messages relating to scripting
   SCP_001("SCP-001"),
 
@@ -130,8 +130,9 @@ public boolean isRemote(URL url)
     }
     else
     {
-      return !(URLUtils.isSameOrigin(url, rootURL));
+      return URLUtils.isRemote(url, rootURL);
     }
   }
 
+
 }
@@ -210,7 +210,7 @@ protected boolean checkContent()
       // only check the filename in single-file mode
       // (it is checked by the container checker in full-publication mode)
       // and for local resources (i.e. computed to a file URL)
-      if (!context.container.isPresent() && !item.isRemote())
+      if (!context.container.isPresent() && !item.isRemote() && !item.hasDataURL())
       {
         new OCFFilenameChecker(item.getPath(), context, item.getLocation()).check();
       }
@@ -378,6 +378,10 @@ else if (isBlessedStyleType(mimeType))
 
   protected void checkItemContent(OPFItem item)
   {
+    // We do not currently support checking resources defined as data URLs
+    if (item.hasDataURL()) {
+      return;
+    }
     // Create a new validation context for the OPF item
     // FIXME 2022 set context OPFItem here
     // (instead of from XRefChecker in the builder code)
 
@@ -186,6 +186,12 @@ else if (!overlayTextChecker.isCorrectOverlay(docURL, mo))
   @Override
   protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)
   {
+    // Items with `data:` URLs are not allowed in the spine 
+    if (item.hasDataURL()) {
+      report.message(MessageId.RSC_029, item.getLocation());
+      return;
+    }
+    
     String mimeType = item.getMimeType();
 
     if (item.getProperties()
 
@@ -109,6 +109,13 @@ private OPFItem(Builder builder)
       {
         this.path = url.toHumanString();
       }
+      // If the item is defined with a data URL, return
+      // the URL string truncated arbitrarily to 30 chars
+      else if ("data".equals(url.scheme()))
+      {
+        String urlString = url.toString();
+        this.path = url.toString().substring(0, Math.min(urlString.length(), 30)) + "…";
+      }
       // If a container is present (full-publication check)
       // the item path is relative to the root of the container
       else if (builder.container.isPresent())
@@ -289,6 +296,16 @@ public boolean isFixedLayout()
     return fixedLayout;
   }
 
+  /**
+   * Returns <code>true</code> iff this item is a remote resource.
+   * 
+   * @return <code>true</code> iff this item is a remote resource.
+   */
+  public boolean hasDataURL()
+  {
+    return "data".equals(url.scheme());
+  }
+
   /**
    * Returns <code>true</code> iff this item is a remote resource.
    * 
 
@@ -141,7 +141,7 @@ private String computePath()
   {
     if (container.isPresent() && !container.get().isRemote(url))
     {
-      if (!url.path().isEmpty())
+      if (url.path() != null && !url.path().isEmpty())
       {
         return url.path().substring(1);
       }
@@ -181,7 +181,7 @@ public boolean isRemote(URL url)
     }
     else
     {
-      return !(URLUtils.isSameOrigin(url, this.url));
+      return URLUtils.isRemote(url, this.url);
     }
   }
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,9 @@ public boolean isRemote(URL url)`
`130`	`130`	`}`
`131`	`131`	`else`
`132`	`132`	`{`
`133`		`- return !(URLUtils.isSameOrigin(url, rootURL));`
	`133`	`+ return URLUtils.isRemote(url, rootURL);`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
	`137`	`+`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ protected boolean checkContent()`
`210`	`210`	`// only check the filename in single-file mode`
`211`	`211`	`// (it is checked by the container checker in full-publication mode)`
`212`	`212`	`// and for local resources (i.e. computed to a file URL)`
`213`		`- if (!context.container.isPresent() && !item.isRemote())`
	`213`	`+ if (!context.container.isPresent() && !item.isRemote() && !item.hasDataURL())`
`214`	`214`	`{`
`215`	`215`	`new OCFFilenameChecker(item.getPath(), context, item.getLocation()).check();`
`216`	`216`	`}`
`@@ -378,6 +378,10 @@ else if (isBlessedStyleType(mimeType))`
`378`	`378`
`379`	`379`	`protected void checkItemContent(OPFItem item)`
`380`	`380`	`{`
	`381`	`+ // We do not currently support checking resources defined as data URLs`
	`382`	`+ if (item.hasDataURL()) {`
	`383`	`+ return;`
	`384`	`+ }`
`381`	`385`	`// Create a new validation context for the OPF item`
`382`	`386`	`// FIXME 2022 set context OPFItem here`
`383`	`387`	`// (instead of from XRefChecker in the builder code)`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private String computePath()`
`141`	`141`	`{`
`142`	`142`	`if (container.isPresent() && !container.get().isRemote(url))`
`143`	`143`	`{`
`144`		`- if (!url.path().isEmpty())`
	`144`	`+ if (url.path() != null && !url.path().isEmpty())`
`145`	`145`	`{`
`146`	`146`	`return url.path().substring(1);`
`147`	`147`	`}`
`@@ -181,7 +181,7 @@ public boolean isRemote(URL url)`
`181`	`181`	`}`
`182`	`182`	`else`
`183`	`183`	`{`
`184`		`- return !(URLUtils.isSameOrigin(url, this.url));`
	`184`	`+ return URLUtils.isRemote(url, this.url);`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`