fix: prevent some internal URLs from leaking in messages

rdeltour · rdeltour · commit e1871e26ed94 · 2024-12-23T11:18:47.000+01:00
Fix #1542
diff --git a/src/main/java/com/adobe/epubcheck/opf/OPFChecker.java b/src/main/java/com/adobe/epubcheck/opf/OPFChecker.java
@@ -163,19 +163,18 @@ protected void checkGuide()
       Optional<OPFItem> item = opfHandler.getItemByURL(ref.getDocumentURL());
       if (!item.isPresent())
       {
-        // FIXME 2022 check how to report URL
         report.message(MessageId.OPF_031,
-            EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()), ref.getURL());
+            EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()),
+            context.relativize(ref.getURL()));
       }
       else
       {
         if (!isBlessedItemType(item.get().getMimeType(), version)
             && !isDeprecatedBlessedItemType(item.get().getMimeType()))
         {
-          // FIXME 2022 check how to report URL
           report.message(MessageId.OPF_032,
               EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()),
-              ref.getURL());
+              context.relativize(ref.getURL()));
         }
       }
     }
diff --git a/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java b/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
@@ -302,9 +302,8 @@ private void checkDictCollection(ResourceCollection collection)
         Optional<OPFItem> item = opfHandler.getItemByURL(resource.getDocumentURL());
         if (!item.isPresent())
         {
-          // FIXME 2022 check how to report the URL
           report.message(MessageId.OPF_081, EPUBLocation.of(context),
-              resource.getDocumentURL().path());
+              context.relativize(resource.getDocumentURL()));
         }
         else if ("application/vnd.epub.search-key-map+xml".equals(item.get().getMimeType()))
         {
@@ -317,9 +316,8 @@ else if ("application/vnd.epub.search-key-map+xml".equals(item.get().getMimeType
         }
         else if (!"application/xhtml+xml".equals(item.get().getMimeType()))
         {
-          // FIXME 2022 check how to report the URL
           report.message(MessageId.OPF_084, EPUBLocation.of(context),
-              resource.getDocumentURL().path());
+              context.relativize(resource.getDocumentURL()));
         }
       }
       if (!skmFound)

Original file line number	Diff line number	Diff line change
`@@ -163,19 +163,18 @@ protected void checkGuide()`
`163`	`163`	`Optional<OPFItem> item = opfHandler.getItemByURL(ref.getDocumentURL());`
`164`	`164`	`if (!item.isPresent())`
`165`	`165`	`{`
`166`		`- // FIXME 2022 check how to report URL`
`167`	`166`	`report.message(MessageId.OPF_031,`
`168`		`- EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()), ref.getURL());`
	`167`	`+ EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()),`
	`168`	`+ context.relativize(ref.getURL()));`
`169`	`169`	`}`
`170`	`170`	`else`
`171`	`171`	`{`
`172`	`172`	`if (!isBlessedItemType(item.get().getMimeType(), version)`
`173`	`173`	`&& !isDeprecatedBlessedItemType(item.get().getMimeType()))`
`174`	`174`	`{`
`175`		`- // FIXME 2022 check how to report URL`
`176`	`175`	`report.message(MessageId.OPF_032,`
`177`	`176`	`EPUBLocation.of(context).at(ref.getLineNumber(), ref.getColumnNumber()),`
`178`		`- ref.getURL());`
	`177`	`+ context.relativize(ref.getURL()));`
`179`	`178`	`}`
`180`	`179`	`}`
`181`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -302,9 +302,8 @@ private void checkDictCollection(ResourceCollection collection)`
`302`	`302`	`Optional<OPFItem> item = opfHandler.getItemByURL(resource.getDocumentURL());`
`303`	`303`	`if (!item.isPresent())`
`304`	`304`	`{`
`305`		`- // FIXME 2022 check how to report the URL`
`306`	`305`	`report.message(MessageId.OPF_081, EPUBLocation.of(context),`
`307`		`- resource.getDocumentURL().path());`
	`306`	`+ context.relativize(resource.getDocumentURL()));`
`308`	`307`	`}`
`309`	`308`	`else if ("application/vnd.epub.search-key-map+xml".equals(item.get().getMimeType()))`
`310`	`309`	`{`
`@@ -317,9 +316,8 @@ else if ("application/vnd.epub.search-key-map+xml".equals(item.get().getMimeType`
`317`	`316`	`}`
`318`	`317`	`else if (!"application/xhtml+xml".equals(item.get().getMimeType()))`
`319`	`318`	`{`
`320`		`- // FIXME 2022 check how to report the URL`
`321`	`319`	`report.message(MessageId.OPF_084, EPUBLocation.of(context),`
`322`		`- resource.getDocumentURL().path());`
	`320`	`+ context.relativize(resource.getDocumentURL()));`
`323`	`321`	`}`
`324`	`322`	`}`
`325`	`323`	`if (!skmFound)`