Merge pull request #60 from Gozala/content-sniff

Use nsIContentSniffer for content type detection
mozilla · Aug 8, 2018 · 2d831d5 · 2d831d5
2 parents 5147fcf + b712d80
commit 2d831d5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/flow-typed/npm/gecko_vx.x.x.js b/flow-typed/npm/gecko_vx.x.x.js
@@ -2737,6 +2737,15 @@ declare module "gecko" {
     exists(name: AString): boolean;
   }
 
+  // https://github.com/mozilla/gecko-dev/blob/86897859913403b68829dbf9a154f5a87c4b0638/netwerk/base/nsIContentSniffer.idl
+  declare export interface nsIContentSniffer {
+    getMIMETypeFromContent(
+      nsIRequest,
+      Uint8Array | ArrayBuffer,
+      number
+    ): ACString;
+  }
+
   // -------------------------
   declare export type JSM<url: string, jsm> = (url, {}) => jsm
 
@@ -3052,7 +3061,8 @@ declare module "gecko" {
       nsIListNetworkAddressesListener: nsIJSCID<
         nsIListNetworkAddressesListener
       >,
-      nsIEnvironment: nsIJSCID<nsIEnvironment>
+      nsIEnvironment: nsIJSCID<nsIEnvironment>,
+      nsIContentSniffer: nsIJSCID<nsIContentSniffer>
     },
     classes: {
       "@mozilla.org/nss_errors_service;1": nsIJSCID<nsINSSErrorsService>,
@@ -3119,7 +3129,8 @@ declare module "gecko" {
       >,
       "@mozilla.org/hash-property-bag;1": nsIJSCID<nsIWritablePropertyBag2>,
       "@mozilla.org/network-info-service;1": nsIJSCID<nsINetworkInfoService>,
-      "@mozilla.org/process/environment;1": nsIJSCID<nsIEnvironment>
+      "@mozilla.org/process/environment;1": nsIJSCID<nsIEnvironment>,
+      "@mozilla.org/network/content-sniffer;1": nsIJSCID<nsIContentSniffer>
     },
     utils: {
       Sandbox(

diff --git a/src/protocol/router.js b/src/protocol/router.js
@@ -54,6 +54,10 @@ const contentSecManager = Cc[
   "@mozilla.org/contentsecuritymanager;1"
 ].getService(Ci.nsIContentSecurityManager)
 
+const contentSniffer = Cc[
+  "@mozilla.org/network/content-sniffer;1"
+].createInstance(Ci.nsIContentSniffer)
+
 const isParent = appinfo.processType === appinfo.PROCESS_TYPE_DEFAULT
 const { ID } = Components
 
@@ -110,10 +114,6 @@ const registerProtocol = ({ scheme, uuid }, handler) => {
     )
 }
 
-const Channel$QueryInterface = XPCOMUtils.generateQI([
-  Ci.nsIChannel,
-  Ci.nsIRequest
-])
 const LOAD_NORMAL = 0
 
 const IDLE = 0
@@ -184,6 +184,7 @@ class TransportSecurityInfo /*::implements nsITransportSecurityInfo*/ {
 }
 
 const MAX_UNKNOWN = 0xffffffffffffffff
+const UNKNOWN_CONTENT_TYPE = "application/x-unknown-content-type"
 
 class Channel /*::implements nsIChannel, nsIRequest*/ {
   /*::
@@ -204,7 +205,6 @@ class Channel /*::implements nsIChannel, nsIRequest*/ {
   name: string
   status: nsresult
   readyState: ReadyState
-  QueryInterface: typeof Channel$QueryInterface
   contentDisposition: number
   contentDispositionFilename: string
   contentDispositionHeader: string
@@ -228,7 +228,7 @@ class Channel /*::implements nsIChannel, nsIRequest*/ {
     this.originalURI = uri
     this.contentCharset = "utf-8"
     this.contentLength = -1
-    this.contentType = "application/x-unknown-content-type"
+    this.contentType = UNKNOWN_CONTENT_TYPE
     this.contentDispositionFilename = ""
     this.contentDispositionHeader = ""
     this.byteOffset = 0
@@ -241,9 +241,20 @@ class Channel /*::implements nsIChannel, nsIRequest*/ {
     this.name = uri.spec
     this.status = Cr.NS_ERROR_NOT_INITIALIZED
     this.readyState = IDLE
-    this.QueryInterface = Channel$QueryInterface
     this.handler = handler
   }
+  QueryInterface(iid) {
+    const isSupported =
+      false ||
+      iid.equals(Ci.nsISupports) ||
+      iid.equals(Ci.nsIChannel) ||
+      iid.equals(Ci.nsIRequest)
+    if (isSupported) {
+      return this
+    } else {
+      throw Cr.NS_ERROR_NO_INTERFACE
+    }
+  }
   toJSON() {
     return {
       scheme: this.URI.scheme,
@@ -402,6 +413,14 @@ class Channel /*::implements nsIChannel, nsIRequest*/ {
     const { byteLength } = content
     stream.setData(content, 0, byteLength)
 
+    if (this.contentType === UNKNOWN_CONTENT_TYPE) {
+      this.contentType = contentSniffer.getMIMETypeFromContent(
+        this,
+        new Uint8Array(content),
+        byteLength
+      )
+    }
+
     debug &&
       console.log(
         `body${pid} ${JSON.stringify(