Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 282 insertions, 0 deletions

diff --git a/toolkit/components/mediasniffer/test/unit/data/bug1079747.mp4 b/toolkit/components/mediasniffer/test/unit/data/bug1079747.mp4
new file mode 100644
index 0000000000..f00731d7e2
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/bug1079747.mp4
diff --git a/toolkit/components/mediasniffer/test/unit/data/bug1725190.cr3 b/toolkit/components/mediasniffer/test/unit/data/bug1725190.cr3
new file mode 100644
index 0000000000..4e46f36b1d
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/bug1725190.cr3
diff --git a/toolkit/components/mediasniffer/test/unit/data/detodos.mp3 b/toolkit/components/mediasniffer/test/unit/data/detodos.mp3
new file mode 100644
index 0000000000..12e3f89c20
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/detodos.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/data/ff-inst.exe b/toolkit/components/mediasniffer/test/unit/data/ff-inst.exe
new file mode 100644
index 0000000000..0f02f36e1a
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/ff-inst.exe
diff --git a/toolkit/components/mediasniffer/test/unit/data/file.mkv b/toolkit/components/mediasniffer/test/unit/data/file.mkv
new file mode 100644
index 0000000000..4618cda032
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/file.mkv
diff --git a/toolkit/components/mediasniffer/test/unit/data/file.webm b/toolkit/components/mediasniffer/test/unit/data/file.webm
new file mode 100644
index 0000000000..7bc738b8b4
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/file.webm
diff --git a/toolkit/components/mediasniffer/test/unit/data/fl10.mp2 b/toolkit/components/mediasniffer/test/unit/data/fl10.mp2
new file mode 100644
index 0000000000..bf84d73675
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/fl10.mp2
diff --git a/toolkit/components/mediasniffer/test/unit/data/he_free.mp3 b/toolkit/components/mediasniffer/test/unit/data/he_free.mp3
new file mode 100644
index 0000000000..e3da8e6a72
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/he_free.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/data/id3tags.mp3 b/toolkit/components/mediasniffer/test/unit/data/id3tags.mp3
new file mode 100644
index 0000000000..23091e6667
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/id3tags.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/data/mp3-in-riff.wav b/toolkit/components/mediasniffer/test/unit/data/mp3-in-riff.wav
new file mode 100644
index 0000000000..5ccaf351f3
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/mp3-in-riff.wav
diff --git a/toolkit/components/mediasniffer/test/unit/data/notags-bad.mp3 b/toolkit/components/mediasniffer/test/unit/data/notags-bad.mp3
new file mode 100644
index 0000000000..5ad89786fa
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/notags-bad.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/data/notags-scan.mp3 b/toolkit/components/mediasniffer/test/unit/data/notags-scan.mp3
new file mode 100644
index 0000000000..949b7c4687
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/notags-scan.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/data/notags.mp3 b/toolkit/components/mediasniffer/test/unit/data/notags.mp3
new file mode 100644
index 0000000000..c7db943617
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/data/notags.mp3
diff --git a/toolkit/components/mediasniffer/test/unit/test_mediasniffer.js b/toolkit/components/mediasniffer/test/unit/test_mediasniffer.js
new file mode 100644
index 0000000000..12aa56a855
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/test_mediasniffer.js
@@ -0,0 +1,125 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const { HttpServer } = ChromeUtils.importESModule(
+  "resource://testing-common/httpd.sys.mjs"
+);
+const { NetUtil } = ChromeUtils.importESModule(
+  "resource://gre/modules/NetUtil.sys.mjs"
+);
+
+const PATH = "/file.meh";
+var httpserver = new HttpServer();
+
+// Each time, the data consist in a string that should be sniffed as Ogg.
+const data = "OggS\0meeeh.";
+var testRan = 0;
+
+// If the content-type is not present, or if it's application/octet-stream, it
+// should be sniffed to application/ogg by the media sniffer. Otherwise, it
+// should not be changed.
+const tests = [
+  // Those three first case are the case of a media loaded in a media element.
+  // All three should be sniffed.
+  {
+    contentType: "",
+    expectedContentType: "application/ogg",
+    flags:
+      Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS |
+      Ci.nsIChannel.LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE,
+  },
+  {
+    contentType: "application/octet-stream",
+    expectedContentType: "application/ogg",
+    flags:
+      Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS |
+      Ci.nsIChannel.LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE,
+  },
+  {
+    contentType: "application/something",
+    expectedContentType: "application/ogg",
+    flags:
+      Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS |
+      Ci.nsIChannel.LOAD_MEDIA_SNIFFER_OVERRIDES_CONTENT_TYPE,
+  },
+  // This last cases test the case of a channel opened while allowing content
+  // sniffers to override the content-type, like in the docshell.
+  {
+    contentType: "application/octet-stream",
+    expectedContentType: "application/ogg",
+    flags: Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS,
+  },
+  {
+    contentType: "",
+    expectedContentType: "application/ogg",
+    flags: Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS,
+  },
+  {
+    contentType: "application/something",
+    expectedContentType: "application/ogg",
+    flags: Ci.nsIChannel.LOAD_CALL_CONTENT_SNIFFERS,
+  },
+];
+
+// A basic listener that reads checks the if we sniffed properly.
+var listener = {
+  onStartRequest(request) {
+    Assert.equal(
+      request.QueryInterface(Ci.nsIChannel).contentType,
+      tests[testRan].expectedContentType
+    );
+  },
+
+  onDataAvailable(request, stream, offset, count) {
+    try {
+      var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+        Ci.nsIBinaryInputStream
+      );
+      bis.setInputStream(stream);
+      bis.readByteArray(bis.available());
+    } catch (ex) {
+      do_throw("Error in onDataAvailable: " + ex);
+    }
+  },
+
+  onStopRequest(request, status) {
+    testRan++;
+    runNext();
+  },
+};
+
+function setupChannel(url, flags) {
+  let uri = "http://localhost:" + httpserver.identity.primaryPort + url;
+  var chan = NetUtil.newChannel({
+    uri,
+    loadUsingSystemPrincipal: true,
+    contentPolicyType: Ci.nsIContentPolicy.TYPE_MEDIA,
+  });
+  chan.loadFlags |= flags;
+  var httpChan = chan.QueryInterface(Ci.nsIHttpChannel);
+  return httpChan;
+}
+
+function runNext() {
+  if (testRan == tests.length) {
+    do_test_finished();
+    return;
+  }
+  var channel = setupChannel(PATH, tests[testRan].flags);
+  httpserver.registerPathHandler(PATH, function (request, response) {
+    response.setHeader("Content-Type", tests[testRan].contentType, false);
+    response.bodyOutputStream.write(data, data.length);
+  });
+  channel.asyncOpen(listener);
+}
+
+function run_test() {
+  httpserver.start(-1);
+  do_test_pending();
+  try {
+    runNext();
+  } catch (e) {
+    print("ERROR - " + e + "\n");
+  }
+}
diff --git a/toolkit/components/mediasniffer/test/unit/test_mediasniffer_ext.js b/toolkit/components/mediasniffer/test/unit/test_mediasniffer_ext.js
new file mode 100644
index 0000000000..f48ffbb75a
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/test_mediasniffer_ext.js
@@ -0,0 +1,135 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var CC = Components.Constructor;
+
+var BinaryOutputStream = CC(
+  "@mozilla.org/binaryoutputstream;1",
+  "nsIBinaryOutputStream",
+  "setOutputStream"
+);
+
+const { HttpServer } = ChromeUtils.importESModule(
+  "resource://testing-common/httpd.sys.mjs"
+);
+const { NetUtil } = ChromeUtils.importESModule(
+  "resource://gre/modules/NetUtil.sys.mjs"
+);
+
+var httpserver = new HttpServer();
+
+var testRan = 0;
+
+// The tests files we want to test, and the type we should have after sniffing.
+const tests = [
+  // Real webm and mkv files truncated to 512 bytes.
+  { path: "data/file.webm", expected: "video/webm" },
+  { path: "data/file.mkv", expected: "application/octet-stream" },
+  // MP3 files with and without id3 headers truncated to 512 bytes.
+  // NB these have 208/209 byte frames, but mp3 can require up to
+  // 1445 bytes to detect with our method.
+  { path: "data/id3tags.mp3", expected: "audio/mpeg" },
+  { path: "data/notags.mp3", expected: "audio/mpeg" },
+  // MPEG-2 mp3 files.
+  { path: "data/detodos.mp3", expected: "audio/mpeg" },
+  // Padding bit flipped in the first header: sniffing should fail.
+  { path: "data/notags-bad.mp3", expected: "application/octet-stream" },
+  // Garbage before header: sniffing should fail.
+  { path: "data/notags-scan.mp3", expected: "application/octet-stream" },
+  // VBR from the layer III test patterns. We can't sniff this.
+  { path: "data/he_free.mp3", expected: "application/octet-stream" },
+  // Make sure we reject mp2, which has a similar header.
+  { path: "data/fl10.mp2", expected: "application/octet-stream" },
+  // Truncated ff installer regression test for bug 875769.
+  { path: "data/ff-inst.exe", expected: "application/octet-stream" },
+  // MP4 with invalid box size (0) for "ftyp".
+  { path: "data/bug1079747.mp4", expected: "application/octet-stream" },
+  // An MP3 bytestream in a RIFF container, truncated to 512 bytes.
+  { path: "data/mp3-in-riff.wav", expected: "audio/mpeg" },
+  // The sniffing-relevant portion of a Canon raw image
+  { path: "data/bug1725190.cr3", expected: "application/octet-stream" },
+];
+
+// A basic listener that reads checks the if we sniffed properly.
+var listener = {
+  onStartRequest(request) {
+    info("Sniffing " + tests[testRan].path);
+    Assert.equal(
+      request.QueryInterface(Ci.nsIChannel).contentType,
+      tests[testRan].expected
+    );
+  },
+
+  onDataAvailable(request, stream, offset, count) {
+    try {
+      var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+        Ci.nsIBinaryInputStream
+      );
+      bis.setInputStream(stream);
+      bis.readByteArray(bis.available());
+    } catch (ex) {
+      do_throw("Error in onDataAvailable: " + ex);
+    }
+  },
+
+  onStopRequest(request, status) {
+    testRan++;
+    runNext();
+  },
+};
+
+function setupChannel(url) {
+  var chan = NetUtil.newChannel({
+    uri: "http://localhost:" + httpserver.identity.primaryPort + url,
+    loadUsingSystemPrincipal: true,
+    contentPolicyType: Ci.nsIContentPolicy.TYPE_MEDIA,
+  });
+  var httpChan = chan.QueryInterface(Ci.nsIHttpChannel);
+  return httpChan;
+}
+
+function runNext() {
+  if (testRan == tests.length) {
+    do_test_finished();
+    return;
+  }
+  var channel = setupChannel("/");
+  channel.asyncOpen(listener);
+}
+
+function getFileContents(aFile) {
+  var fileStream = Cc[
+    "@mozilla.org/network/file-input-stream;1"
+  ].createInstance(Ci.nsIFileInputStream);
+  fileStream.init(aFile, 1, -1, null);
+  var bis = Cc["@mozilla.org/binaryinputstream;1"].createInstance(
+    Ci.nsIBinaryInputStream
+  );
+  bis.setInputStream(fileStream);
+
+  var data = bis.readByteArray(bis.available());
+
+  return data;
+}
+
+function handler(metadata, response) {
+  response.setStatusLine(metadata.httpVersion, 200, "OK");
+  // Send an empty Content-Type, so we are guaranteed to sniff.
+  response.setHeader("Content-Type", "", false);
+  var body = getFileContents(do_get_file(tests[testRan].path));
+  var bos = new BinaryOutputStream(response.bodyOutputStream);
+  bos.writeByteArray(body);
+}
+
+function run_test() {
+  // We use a custom handler so we can change the header to force sniffing.
+  httpserver.registerPathHandler("/", handler);
+  httpserver.start(-1);
+  do_test_pending();
+  try {
+    runNext();
+  } catch (e) {
+    print("ERROR - " + e + "\n");
+  }
+}
diff --git a/toolkit/components/mediasniffer/test/unit/xpcshell.toml b/toolkit/components/mediasniffer/test/unit/xpcshell.toml
new file mode 100644
index 0000000000..196e6cea6c
--- /dev/null
+++ b/toolkit/components/mediasniffer/test/unit/xpcshell.toml
@@ -0,0 +1,22 @@
+[DEFAULT]
+head = ""
+skip-if = ["os == 'android'"]
+support-files = [
+  "data/bug1079747.mp4",
+  "data/bug1725190.cr3",
+  "data/detodos.mp3",
+  "data/ff-inst.exe",
+  "data/file.mkv",
+  "data/file.webm",
+  "data/fl10.mp2",
+  "data/he_free.mp3",
+  "data/id3tags.mp3",
+  "data/mp3-in-riff.wav",
+  "data/notags-bad.mp3",
+  "data/notags-scan.mp3",
+  "data/notags.mp3",
+]
+
+["test_mediasniffer.js"]
+
+["test_mediasniffer_ext.js"]