w3c
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/messages/MessageId.java
‎src/main/java/com/adobe/epubcheck/messages/MessageId.java‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/messages/MessageId.java
‎src/main/java/com/adobe/epubcheck/messages/MessageId.java‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/ocf/EncryptionHandler.java
‎src/main/java/com/adobe/epubcheck/ocf/EncryptionHandler.java‎
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/ocf/EncryptionHandler.java
‎src/main/java/com/adobe/epubcheck/ocf/EncryptionHandler.java‎
Copy file name to clipboard
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/ocf/OCFChecker.java
‎src/main/java/com/adobe/epubcheck/ocf/OCFChecker.java‎
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion b/Collapse file: src/main/java/com/adobe/epubcheck/ocf/OCFChecker.java
‎src/main/java/com/adobe/epubcheck/ocf/OCFChecker.java‎
Copy file name to clipboard
+25-1Lines changed: 25 additions & 1 deletion
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/ocf/OCFPackage.java
‎src/main/java/com/adobe/epubcheck/ocf/OCFPackage.java‎
Copy file name to clipboard
+28-6Lines changed: 28 additions & 6 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/ocf/OCFPackage.java
‎src/main/java/com/adobe/epubcheck/ocf/OCFPackage.java‎
Copy file name to clipboard
+28-6Lines changed: 28 additions & 6 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/opf/OPFHandler.java
‎src/main/java/com/adobe/epubcheck/opf/OPFHandler.java‎
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/opf/OPFHandler.java
‎src/main/java/com/adobe/epubcheck/opf/OPFHandler.java‎
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/Collapse file: src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties
‎src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties‎
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file: src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties
‎src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties‎
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/Collapse file: src/test/resources/epub3/container-publication.feature
‎src/test/resources/epub3/container-publication.feature‎
Copy file name to clipboard
+14-8Lines changed: 14 additions & 8 deletions b/Collapse file: src/test/resources/epub3/container-publication.feature
‎src/test/resources/epub3/container-publication.feature‎
Copy file name to clipboard
+14-8Lines changed: 14 additions & 8 deletions
diff --git a/Collapse file: src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/content_001.xhtml
‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-error/EPUB/content_001.xhtml‎ renamed to ‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/content_001.xhtml‎
Copy file name to clipboard b/Collapse file: src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/content_001.xhtml
‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-error/EPUB/content_001.xhtml‎ renamed to ‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/content_001.xhtml‎
Copy file name to clipboard
diff --git a/Collapse file: src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/nav.xhtml
‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-error/EPUB/nav.xhtml‎ renamed to ‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/nav.xhtml‎
Copy file name to clipboard b/Collapse file: src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/nav.xhtml
‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-error/EPUB/nav.xhtml‎ renamed to ‎src/test/resources/epub3/files/epub/ocf-encryption-unknown-valid/EPUB/nav.xhtml‎
Copy file name to clipboard
@@ -302,6 +302,7 @@ private void initialize()
     severities.put(MessageId.PKG_023, Severity.USAGE);
     severities.put(MessageId.PKG_024, Severity.INFO);
     severities.put(MessageId.PKG_025, Severity.ERROR);
+    severities.put(MessageId.PKG_026, Severity.ERROR);
 
     // Resources
     severities.put(MessageId.RSC_001, Severity.ERROR);
 
@@ -296,6 +296,7 @@ public enum MessageId implements Comparable<MessageId>
   PKG_023("PKG-023"),
   PKG_024("PKG-024"),
   PKG_025("PKG-025"),
+  PKG_026("PKG-026"),
 
   // Messages relating to resources
   RSC_001("RSC-001"),
 
@@ -22,14 +22,15 @@
 
 package com.adobe.epubcheck.ocf;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import com.adobe.epubcheck.api.EPUBLocation;
 import com.adobe.epubcheck.util.HandlerUtil;
 import com.adobe.epubcheck.xml.XMLElement;
 import com.adobe.epubcheck.xml.XMLHandler;
 import com.adobe.epubcheck.xml.XMLParser;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
 public class EncryptionHandler implements XMLHandler
 {
   private final OCFPackage ocf;
@@ -83,6 +84,7 @@ public void startElement()
       if (algorithm.equals("https://www.idpf.org/2008/embedding"))
       {
         ocf.setEncryption(entryName, new IDPFFontManglingFilter(null));
+        ocf.setObfuscated(entryName, parser.getLocation());
       }
       else if (algorithm.equals("https://ns.adobe.com/pdf/enc#RC"))
       {
 
@@ -51,9 +51,11 @@
 import com.adobe.epubcheck.api.Report;
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.opf.OPFChecker;
+import com.adobe.epubcheck.opf.OPFChecker30;
 import com.adobe.epubcheck.opf.OPFData;
 import com.adobe.epubcheck.opf.OPFHandler;
 import com.adobe.epubcheck.opf.OPFHandler30;
+import com.adobe.epubcheck.opf.OPFItem;
 import com.adobe.epubcheck.opf.ValidationContext;
 import com.adobe.epubcheck.opf.ValidationContext.ValidationContextBuilder;
 import com.adobe.epubcheck.util.CheckUtil;
@@ -64,6 +66,7 @@
 import com.adobe.epubcheck.xml.XMLParser;
 import com.adobe.epubcheck.xml.XMLValidator;
 import com.adobe.epubcheck.xml.XMLValidators;
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -349,7 +352,7 @@ else if (!normalizedEntriesSet.add(Normalizer.normalize(entry, Form.NFC)))
       for (final String entry : ocf.getFileEntries())
       {
         ocf.reportMetadata(entry, report);
-
+        
         // if the entry is not in the whitelist (META-INF/* + mimetype)
         // and not declared in (one of) the OPF document(s)
         if (!entry.startsWith("META-INF/") && !entry.startsWith("META-INF\\")
@@ -371,6 +374,27 @@ public boolean apply(OPFHandler opfHandler)
           report.message(MessageId.OPF_003, EPUBLocation.create(ocf.getName()), entry);
         }
         OCFFilenameChecker.checkCompatiblyEscaped(entry, report, validationVersion);
+        
+        // check obfuscated resource are Font Core Media Types
+        if (ocf.isObfuscatedFont(entry))
+        {
+          for (OPFHandler opf : opfHandlers)
+          {
+            // try to find the first Package Document where the entry is
+            // declared
+            Optional<OPFItem> item = opf.getItemByPath(entry);
+            if (item.isPresent())
+            {
+              // report if it is not a font core media type
+              if (!OPFChecker30.isBlessedFontType(item.get().getMimeType()))
+              {
+                report.message(MessageId.PKG_026, ocf.getObfuscationDeclarationLocation(entry),
+                    item.get().getMimeType(), opf.getPath());
+              }
+              break;
+            }
+          }
+        }
       }
 
       // check all directory entries without duplicates
 
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -26,7 +25,8 @@
 
 public abstract class OCFPackage implements GenericResourceProvider
 {
-  final Hashtable<String, EncryptionFilter> enc;
+  final Map<String, EncryptionFilter> enc = new HashMap<>();
+  final Map<String, EPUBLocation> obfuscated = new HashMap<>();
   String uniqueIdentifier;
   private Report reporter;
   private final Supplier<OCFData> ocfData = Suppliers.memoize(new Supplier<OCFData>()
@@ -72,16 +72,17 @@ public Map<String, OPFData> get()
         }
       });
 
-  public OCFPackage()
-  {
-    this.enc = new Hashtable<String, EncryptionFilter>();
-  }
 
   public void setEncryption(String name, EncryptionFilter encryptionFilter)
   {
     enc.put(name, encryptionFilter);
   }
 
+  public void setObfuscated(String name, EPUBLocation location)
+  {
+    obfuscated.put(name, location);
+  }
+
   /**
    * @param name
    *          the name of a relative file that is possibly in the container
@@ -133,6 +134,27 @@ public boolean canDecrypt(String fileName)
     return filter == null || filter.canDecrypt();
   }
 
+  /**
+   * @param path path of the resource to test
+   * @return true if that resource is encrypted with the font obfuscation algorithm
+   */
+  public boolean isObfuscatedFont(String path)
+  {
+    return obfuscated.containsKey(path);
+  }
+
+  /**
+   * Returns the location in META-INF/encryption.xml where the given resource
+   * is declared as an obfuscated font, or <code>null</code> if it is not.
+   * 
+   * @param path path of the resource to test
+   * @return the location in META-INF/encryption.xml, or null
+   */
+  public EPUBLocation getObfuscationDeclarationLocation(String path)
+  {
+    return obfuscated.get(path);
+  }
+
   /**
    * This method parses the container entry and stores important data, but does
    * /not/ validate the container against a schema definition.
 
@@ -127,6 +127,10 @@ public OPFHandler(ValidationContext context, XMLParser parser)
     this.report = context.report;
     this.parser = parser;
   }
+  
+  public String getPath() {
+    return path;
+  }
 
   public boolean getOpf12PackageFile()
   {
 
@@ -313,7 +313,8 @@ PKG_022=Wrong file extension for image. The image is a "%1$s" file but has the f
 PKG_023=Validating the EPUB against version 2.0, default validation profile will be used.
 PKG_024=Uncommon EPUB file extension.
 PKG_024_SUG=For maximum compatibility, use ".epub".
-PKG_025=Publication resource must not be located in the META-INF directory 
+PKG_025=Publication resource must not be located in the META-INF directory
+PKG_026=Obfuscated resource must be a Font Core Media Type (was declared as "%1$s" in "%2$s").  
 
 #Resources
 RSC_001=File "%1$s" could not be found.
 
@@ -119,9 +119,10 @@ Feature: EPUB 3 ▸ Open Container Format ▸ Full Publication Checks
     And the message contains 'expected element "encryption"'
     And no other errors or warnings are reported
 
-  Scenario: Report an unknown encryption scheme
+  Scenario: Verify encryption can be used
+    (but file will not be parsed)
     Given the reporting level is set to INFO
-    When checking EPUB 'ocf-encryption-unknown-error'
+    When checking EPUB 'ocf-encryption-unknown-valid'
     Then info RSC-004 is reported
     And no other errors or warnings are reported
 
@@ -180,16 +181,21 @@ Feature: EPUB 3 ▸ Open Container Format ▸ Full Publication Checks
 
 
   ## 5. Resource Obfuscation
-  
-  Scenario: Verify a publication with obfuscated resource (here a font file)
+
+  Scenario: Verify a publication with obfuscated font
     When checking EPUB 'ocf-obfuscation-valid'
     Then no errors or warnings are reported
 
-  Scenario: Verify a publication with obfuscation of a usually-parsed resource (here an SVG image)
-    When checking EPUB 'ocf-obfuscation-svg-valid'
-    Then info RSC-004 is reported
+  Scenario: Report an obfuscated font that is not a Core Media Type
+    When checking EPUB 'ocf-obfuscation-not-cmt-error'
+    Then error PKG-026 is reported
     And no errors or warnings are reported
-    
+
+  Scenario: Report an obfuscated font that is not a font
+    When checking EPUB 'ocf-obfuscation-not-font-error'
+    Then error PKG-026 is reported
+    And no errors or warnings are reported
+
 
   ## C. the 'application/epub+zip' Media Type
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,15 @@`
`22`	`22`
`23`	`23`	`package com.adobe.epubcheck.ocf;`
`24`	`24`
	`25`	`+import java.io.UnsupportedEncodingException;`
	`26`	`+import java.net.URLDecoder;`
	`27`	`+`
	`28`	`+import com.adobe.epubcheck.api.EPUBLocation;`
`25`	`29`	`import com.adobe.epubcheck.util.HandlerUtil;`
`26`	`30`	`import com.adobe.epubcheck.xml.XMLElement;`
`27`	`31`	`import com.adobe.epubcheck.xml.XMLHandler;`
`28`	`32`	`import com.adobe.epubcheck.xml.XMLParser;`
`29`	`33`
`30`		`-import java.io.UnsupportedEncodingException;`
`31`		`-import java.net.URLDecoder;`
`32`		`-`
`33`	`34`	`public class EncryptionHandler implements XMLHandler`
`34`	`35`	`{`
`35`	`36`	`private final OCFPackage ocf;`
`@@ -83,6 +84,7 @@ public void startElement()`
`83`	`84`	`if (algorithm.equals("https://www.idpf.org/2008/embedding"))`
`84`	`85`	`{`
`85`	`86`	`ocf.setEncryption(entryName, new IDPFFontManglingFilter(null));`
	`87`	`+ ocf.setObfuscated(entryName, parser.getLocation());`
`86`	`88`	`}`
`87`	`89`	`else if (algorithm.equals("https://ns.adobe.com/pdf/enc#RC"))`
`88`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,10 @@ public OPFHandler(ValidationContext context, XMLParser parser)`
`127`	`127`	`this.report = context.report;`
`128`	`128`	`this.parser = parser;`
`129`	`129`	`}`
	`130`	`+`
	`131`	`+ public String getPath() {`
	`132`	`+ return path;`
	`133`	`+ }`
`130`	`134`
`131`	`135`	`public boolean getOpf12PackageFile()`
`132`	`136`	`{`