fix: check trailing spaces in mimetype file

See w3c/epub-specs#1250
w3c · Apr 5, 2019 · 123c69f · 123c69f
1 parent 8a1b650
commit 123c69f
Show file tree

Hide file tree

Showing 138 changed files with 295 additions and 120 deletions.
diff --git a/src/main/java/com/adobe/epubcheck/util/CheckUtil.java b/src/main/java/com/adobe/epubcheck/util/CheckUtil.java
@@ -81,12 +81,7 @@ public static boolean checkTrailingSpaces(InputStream input,
     }
 
     int ch = input.read();
-    if (version == EPUBVersion.VERSION_2 && ch != -1)
-    {
-      return false;
-    }
-
-    if (version == EPUBVersion.VERSION_3 && ch != ' ' && ch != -1)
+    if (ch != -1)
     {
       return false;
     }

diff --git a/src/test/java/com/adobe/epubcheck/api/Epub30CheckExpandedTest.java b/src/test/java/com/adobe/epubcheck/api/Epub30CheckExpandedTest.java
@@ -92,11 +92,32 @@ public void testValidateEPUBPLoremBasicMathml()
   }
 
   @Test
-  public void testValidateEPUBPLoremMimetype()
+  public void testMimetypeHasCorrectValue()
   {
     Collections.addAll(expectedErrors, MessageId.PKG_007);
     testValidateDocument("invalid/mimetype-file-incorrect-value");
   }
+
+  @Test
+  public void testMimetypeHasNoLeadingSpaces()
+  {
+    Collections.addAll(expectedErrors, MessageId.PKG_007);
+    testValidateDocument("invalid/mimetype-file-leading-spaces");
+  }
+
+  @Test
+  public void testMimetypeHasNoTrailingNewline()
+  {
+    Collections.addAll(expectedErrors, MessageId.PKG_007);
+    testValidateDocument("invalid/mimetype-file-trailing-newline");
+  }
+
+  @Test
+  public void testMimetypeHasNoTrailingSpaces()
+  {
+    Collections.addAll(expectedErrors, MessageId.PKG_007);
+    testValidateDocument("invalid/mimetype-file-trailing-spaces");
+  }
 
   @Test
   public void testValidateEPUBPLoremLink()

diff --git a/src/test/java/com/adobe/epubcheck/api/Epub30CheckTest.java b/src/test/java/com/adobe/epubcheck/api/Epub30CheckTest.java
@@ -219,7 +219,7 @@ public void testDuplicateZipEntriesIssue265()
   {
     // duplicate entries should raise an error
     Collections.addAll(expectedErrors, MessageId.OPF_060);
-    testValidateDocument("invalid/issue265.epub");
+    testValidateDocument("invalid/zip-duplicate-entry.epub");
   }
 
   @Test
@@ -243,7 +243,7 @@ public void testDuplicateZipEntriesIssue265c()
   public void testExtendedFieldofZip()
   {
     Collections.addAll(expectedErrors, MessageId.PKG_005);
-    testValidateDocument("invalid/lorem-zip64.epub");
+    testValidateDocument("invalid/zip-extra-field.epub");
   }
 
   @Test

diff --git a/src/test/resources/30/epub/invalid/issue239.epub.bak b/src/test/resources/30/epub/invalid/issue239.epub.bak
diff --git a/src/test/resources/30/epub/invalid/issue265.epub b/src/test/resources/30/epub/invalid/issue265.epub
diff --git a/src/test/resources/30/epub/invalid/issue265b.epub b/src/test/resources/30/epub/invalid/issue265b.epub
diff --git a/src/test/resources/30/epub/invalid/issue265c.epub b/src/test/resources/30/epub/invalid/issue265c.epub
diff --git a/src/test/resources/30/epub/invalid/lorem-zip64.epub b/src/test/resources/30/epub/invalid/lorem-zip64.epub
diff --git a/src/test/resources/30/epub/invalid/zip-duplicate-entry.epub b/src/test/resources/30/epub/invalid/zip-duplicate-entry.epub
diff --git a/src/test/resources/30/epub/invalid/zip-extra-field.epub b/src/test/resources/30/epub/invalid/zip-extra-field.epub
diff --git a/src/test/resources/30/epub/valid/epub30-spec.epub.bak b/src/test/resources/30/epub/valid/epub30-spec.epub.bak
diff --git a/src/test/resources/30/epub/valid/issue271_xpgt_correctFallback.epub b/src/test/resources/30/epub/valid/issue271_xpgt_correctFallback.epub
diff --git a/src/test/resources/30/expanded/invalid/data-nav-inspine/mimetype b/src/test/resources/30/expanded/invalid/data-nav-inspine/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-missing-type/mimetype b/src/test/resources/30/expanded/invalid/data-nav-missing-type/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-multiple/mimetype b/src/test/resources/30/expanded/invalid/data-nav-multiple/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-notxhtml/mimetype b/src/test/resources/30/expanded/invalid/data-nav-notxhtml/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-regionbased-notfxl/mimetype b/src/test/resources/30/expanded/invalid/data-nav-regionbased-notfxl/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-regionbased-notindatanav/mimetype b/src/test/resources/30/expanded/invalid/data-nav-regionbased-notindatanav/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/data-nav-regionbased-struct/mimetype b/src/test/resources/30/expanded/invalid/data-nav-regionbased-struct/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-invalidcontent/mimetype b/src/test/resources/30/expanded/invalid/dict-invalidcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-multiple-nodictcontent/mimetype b/src/test/resources/30/expanded/invalid/dict-multiple-nodictcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-nodctype-2/mimetype b/src/test/resources/30/expanded/invalid/dict-nodctype-2/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-nodctype/mimetype b/src/test/resources/30/expanded/invalid/dict-nodctype/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-single-nodictcontent/mimetype b/src/test/resources/30/expanded/invalid/dict-single-nodictcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-skm-badextension/mimetype b/src/test/resources/30/expanded/invalid/dict-skm-badextension/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-skm-invalid/mimetype b/src/test/resources/30/expanded/invalid/dict-skm-invalid/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-skm-linktocss/mimetype b/src/test/resources/30/expanded/invalid/dict-skm-linktocss/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/dict-skm-linktonowhere/mimetype b/src/test/resources/30/expanded/invalid/dict-skm-linktonowhere/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/duplicate-id/mimetype b/src/test/resources/30/expanded/invalid/duplicate-id/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/duplicate-resource/mimetype b/src/test/resources/30/expanded/invalid/duplicate-resource/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/edu-microdata/mimetype b/src/test/resources/30/expanded/invalid/edu-microdata/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/edu-missing-lox/mimetype b/src/test/resources/30/expanded/invalid/edu-missing-lox/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/edu-pagination-nopagelist/mimetype b/src/test/resources/30/expanded/invalid/edu-pagination-nopagelist/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/edu-pagination-nopagesource/mimetype b/src/test/resources/30/expanded/invalid/edu-pagination-nopagesource/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/encryption-unknown/mimetype b/src/test/resources/30/expanded/invalid/encryption-unknown/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fallback-circular/mimetype b/src/test/resources/30/expanded/invalid/fallback-circular/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fallback-nonresolving/mimetype b/src/test/resources/30/expanded/invalid/fallback-nonresolving/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fallback-object-none/mimetype b/src/test/resources/30/expanded/invalid/fallback-object-none/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fallback-xpgt-none/mimetype b/src/test/resources/30/expanded/invalid/fallback-xpgt-none/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox-no-heightwidth/mimetype b/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox-no-heightwidth/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox-widthheight-in-percent/mimetype b/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox-widthheight-in-percent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox/mimetype b/src/test/resources/30/expanded/invalid/fxl-svg-no-viewbox/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/href-outofspine/mimetype b/src/test/resources/30/expanded/invalid/href-outofspine/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-collection-badidxcontent/mimetype b/src/test/resources/30/expanded/invalid/idx-collection-badidxcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-collection-noindex/mimetype b/src/test/resources/30/expanded/invalid/idx-collection-noindex/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-single-file-badidxcontent/mimetype b/src/test/resources/30/expanded/invalid/idx-single-file-badidxcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-single-file-noindex/mimetype b/src/test/resources/30/expanded/invalid/idx-single-file-noindex/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-whole-pub-badidxcontent/mimetype b/src/test/resources/30/expanded/invalid/idx-whole-pub-badidxcontent/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/idx-whole-pub-noindex/mimetype b/src/test/resources/30/expanded/invalid/idx-whole-pub-noindex/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/issue189/mimetype b/src/test/resources/30/expanded/invalid/issue189/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-basic-dual-base/mimetype b/src/test/resources/30/expanded/invalid/lorem-basic-dual-base/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-container/mimetype b/src/test/resources/30/expanded/invalid/lorem-container/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-enc/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-enc/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-import-1/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-import-1/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-import-2/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-import-2/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-urls-1/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-urls-1/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-urls-2/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-urls-2/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-urls-3/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-urls-3/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-css-wrongtype/mimetype b/src/test/resources/30/expanded/invalid/lorem-css-wrongtype/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-encryption/mimetype b/src/test/resources/30/expanded/invalid/lorem-encryption/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-signatures/mimetype b/src/test/resources/30/expanded/invalid/lorem-signatures/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/lorem-xrenditions-unmanifested/mimetype b/src/test/resources/30/expanded/invalid/lorem-xrenditions-unmanifested/mimetype
@@ -1 +1 @@
-application/epub+zip    
+application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/META-INF/container.xml b/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="OPS/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/content_001.xhtml b/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/content_001.xhtml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<title>Minimal EPUB</title>
+	</head>
+	<body epub:type="bodymatter">
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+	</body>
+</html>
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/nav.xhtml b/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/nav.xhtml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+		<nav epub:type="landmarks">
+			<ol>
+				<li><a href="content_001.xhtml" epub:type="bodymatter">Start Reading</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/package.opf b/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/OPS/package.opf
@@ -0,0 +1,16 @@
+<?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>
+</metadata>
+<manifest>
+  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+</manifest>
+<spine>
+  <itemref idref="content_001" />
+</spine>
+</package>
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/mimetype b/src/test/resources/30/expanded/invalid/mimetype-file-leading-spaces/mimetype
@@ -0,0 +1 @@
+ application/epub+zip
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-trailing-newline/META-INF/container.xml b/src/test/resources/30/expanded/invalid/mimetype-file-trailing-newline/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="OPS/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/30/expanded/invalid/mimetype-file-trailing-newline/OPS/content_001.xhtml b/src/test/resources/30/expanded/invalid/mimetype-file-trailing-newline/OPS/content_001.xhtml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<title>Minimal EPUB</title>
+	</head>
+	<body epub:type="bodymatter">
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+	</body>
+</html>