Adding upstream version 124.0.1.upstream/124.0.1

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

2 files changed, 518 insertions, 0 deletions

diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c
new file mode 100644
index 0000000000..a5cf7ba6eb
--- /dev/null
+++ b/modules/libmar/tool/mar.c
@@ -0,0 +1,446 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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/. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "mar.h"
+#include "mar_cmdline.h"
+
+#ifdef XP_WIN
+#  include <windows.h>
+#  include <direct.h>
+#  define chdir _chdir
+#else
+#  include <unistd.h>
+#endif
+
+#if !defined(NO_SIGN_VERIFY) && defined(MAR_NSS)
+#  include "cert.h"
+#  include "nss.h"
+#  include "pk11pub.h"
+int NSSInitCryptoContext(const char* NSSConfigDir);
+#endif
+
+int mar_repackage_and_sign(const char* NSSConfigDir,
+                           const char* const* certNames, uint32_t certCount,
+                           const char* src, const char* dest);
+
+static void print_version() {
+  printf("Version: %s\n", MOZ_APP_VERSION);
+  printf("Default Channel ID: %s\n", MAR_CHANNEL_ID);
+}
+
+static void print_usage() {
+  printf("usage:\n");
+  printf("Create a MAR file:\n");
+  printf(
+      "  mar -H MARChannelID -V ProductVersion [-C workingDir] "
+      "-c archive.mar [files...]\n");
+
+  printf("Extract a MAR file:\n");
+  printf("  mar [-C workingDir] -x archive.mar\n");
+#ifndef NO_SIGN_VERIFY
+  printf("Sign a MAR file:\n");
+  printf(
+      "  mar [-C workingDir] -d NSSConfigDir -n certname -s "
+      "archive.mar out_signed_archive.mar\n");
+
+  printf("Strip a MAR signature:\n");
+  printf(
+      "  mar [-C workingDir] -r "
+      "signed_input_archive.mar output_archive.mar\n");
+
+  printf("Extract a MAR signature:\n");
+  printf(
+      "  mar [-C workingDir] -n(i) -X "
+      "signed_input_archive.mar base_64_encoded_signature_file\n");
+
+  printf("Import a MAR signature:\n");
+  printf(
+      "  mar [-C workingDir] -n(i) -I "
+      "signed_input_archive.mar base_64_encoded_signature_file "
+      "changed_signed_output.mar\n");
+  printf("(i) is the index of the certificate to extract\n");
+#  if !defined(MAR_NSS)
+  printf("Verify a MAR file:\n");
+  printf("  mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n");
+  printf(
+      "At most %d signature certificate DER files are specified by "
+      "-D0 DERFilePath1 -D1 DERFilePath2, ...\n",
+      MAX_SIGNATURES);
+#  else
+  printf("Verify a MAR file:\n");
+  printf(
+      "  mar [-C workingDir] -d NSSConfigDir -n certname "
+      "-v signed_archive.mar\n");
+  printf(
+      "At most %d signature certificate names are specified by "
+      "-n0 certName -n1 certName2, ...\n",
+      MAX_SIGNATURES);
+#  endif
+  printf(
+      "At most %d verification certificate names are specified by "
+      "-n0 certName -n1 certName2, ...\n",
+      MAX_SIGNATURES);
+#endif
+  printf("Print information on a MAR file:\n");
+  printf("  mar -t archive.mar\n");
+
+  printf("Print detailed information on a MAR file including signatures:\n");
+  printf("  mar -T archive.mar\n");
+
+  printf("Refresh the product information block of a MAR file:\n");
+  printf(
+      "  mar -H MARChannelID -V ProductVersion [-C workingDir] "
+      "-i unsigned_archive_to_refresh.mar\n");
+
+  printf("Print executable version:\n");
+  printf("  mar --version\n");
+  printf("This program does not handle unicode file paths properly\n");
+}
+
+static int mar_test_callback(MarFile* mar, const MarItem* item, void* unused) {
+  printf("%u\t0%o\t%s\n", item->length, item->flags, item->name);
+  return 0;
+}
+
+static int mar_test(const char* path) {
+  MarFile* mar;
+
+  MarReadResult result = mar_open(path, &mar);
+  if (result != MAR_READ_SUCCESS) {
+    return -1;
+  }
+
+  printf("SIZE\tMODE\tNAME\n");
+  mar_enum_items(mar, mar_test_callback, NULL);
+
+  mar_close(mar);
+  return 0;
+}
+
+int main(int argc, char** argv) {
+  const char* certNames[MAX_SIGNATURES];
+  char* MARChannelID = NULL;
+  char* productVersion = NULL;
+  int rv = -1;
+#if !defined(NO_SIGN_VERIFY)
+  char* NSSConfigDir = NULL;
+  uint32_t k;
+  uint32_t certCount = 0;
+  int32_t sigIndex = -1;
+  uint32_t fileSizes[MAX_SIGNATURES];
+  const uint8_t* certBuffers[MAX_SIGNATURES];
+#  if !defined(MAR_NSS)
+  char* DERFilePaths[MAX_SIGNATURES];
+#  else
+  CERTCertificate* certs[MAX_SIGNATURES];
+#  endif
+#endif
+
+  memset((void*)certNames, 0, sizeof(certNames));
+#if !defined(NO_SIGN_VERIFY)
+  memset(fileSizes, 0, sizeof(fileSizes));
+  memset((void*)certBuffers, 0, sizeof(certBuffers));
+#  if !defined(MAR_NSS)
+  memset(DERFilePaths, 0, sizeof(DERFilePaths));
+#  else
+  memset(certs, 0, sizeof(certs));
+#  endif
+#endif
+
+  if (argc > 1 && 0 == strcmp(argv[1], "--version")) {
+    print_version();
+    return 0;
+  }
+
+  if (argc < 3) {
+    print_usage();
+    return -1;
+  }
+
+  while (argc > 0) {
+    if (argv[1][0] == '-' &&
+        (argv[1][1] == 'c' || argv[1][1] == 't' || argv[1][1] == 'x' ||
+         argv[1][1] == 'v' || argv[1][1] == 's' || argv[1][1] == 'i' ||
+         argv[1][1] == 'T' || argv[1][1] == 'r' || argv[1][1] == 'X' ||
+         argv[1][1] == 'I')) {
+      break;
+      /* -C workingdirectory */
+    }
+    if (argv[1][0] == '-' && argv[1][1] == 'C') {
+      if (chdir(argv[2]) != 0) {
+        return -1;
+      }
+      argv += 2;
+      argc -= 2;
+    }
+#if !defined(NO_SIGN_VERIFY)
+#  if !defined(MAR_NSS)
+    /* -D DERFilePath, also matches -D[index] DERFilePath
+       We allow an index for verifying to be symmetric
+       with the import and export command line arguments. */
+    else if (argv[1][0] == '-' && argv[1][1] == 'D' &&
+             (argv[1][2] == (char)('0' + certCount) || argv[1][2] == '\0')) {
+      if (certCount >= MAX_SIGNATURES) {
+        print_usage();
+        return -1;
+      }
+      DERFilePaths[certCount++] = argv[2];
+      argv += 2;
+      argc -= 2;
+    }
+#  endif
+    /* -d NSSConfigdir */
+    else if (argv[1][0] == '-' && argv[1][1] == 'd') {
+      NSSConfigDir = argv[2];
+      argv += 2;
+      argc -= 2;
+      /* -n certName, also matches -n[index] certName
+         We allow an index for verifying to be symmetric
+         with the import and export command line arguments. */
+    } else if (argv[1][0] == '-' && argv[1][1] == 'n' &&
+               (argv[1][2] == (char)('0' + certCount) || argv[1][2] == '\0' ||
+                !strcmp(argv[2], "-X") || !strcmp(argv[2], "-I"))) {
+      if (certCount >= MAX_SIGNATURES) {
+        print_usage();
+        return -1;
+      }
+      certNames[certCount++] = argv[2];
+      if (strlen(argv[1]) > 2 &&
+          (!strcmp(argv[2], "-X") || !strcmp(argv[2], "-I")) &&
+          argv[1][2] >= '0' && argv[1][2] <= '9') {
+        sigIndex = argv[1][2] - '0';
+        argv++;
+        argc--;
+      } else {
+        argv += 2;
+        argc -= 2;
+      }
+    }
+#endif
+    else if (argv[1][0] == '-' && argv[1][1] == 'H') {  // MAR channel ID
+      MARChannelID = argv[2];
+      argv += 2;
+      argc -= 2;
+    } else if (argv[1][0] == '-' && argv[1][1] == 'V') {  // Product Version
+      productVersion = argv[2];
+      argv += 2;
+      argc -= 2;
+    } else {
+      print_usage();
+      return -1;
+    }
+  }
+
+  if (argv[1][0] != '-') {
+    print_usage();
+    return -1;
+  }
+
+  switch (argv[1][1]) {
+    case 'c': {
+      struct ProductInformationBlock infoBlock;
+      if (!productVersion) {
+        fprintf(stderr,
+                "ERROR: Version not specified (pass `-V <version>`).\n");
+        return -1;
+      }
+      if (!MARChannelID) {
+        fprintf(stderr,
+                "ERROR: MAR channel ID not specified (pass `-H "
+                "<mar-channel-id>`).\n");
+        return -1;
+      }
+      infoBlock.MARChannelID = MARChannelID;
+      infoBlock.productVersion = productVersion;
+      return mar_create(argv[2], argc - 3, argv + 3, &infoBlock);
+    }
+    case 'i': {
+      if (!productVersion) {
+        fprintf(stderr,
+                "ERROR: Version not specified (pass `-V <version>`).\n");
+        return -1;
+      }
+      if (!MARChannelID) {
+        fprintf(stderr,
+                "ERROR: MAR channel ID not specified (pass `-H "
+                "<mar-channel-id>`).\n");
+        return -1;
+      }
+      struct ProductInformationBlock infoBlock;
+      infoBlock.MARChannelID = MARChannelID;
+      infoBlock.productVersion = productVersion;
+      return refresh_product_info_block(argv[2], &infoBlock);
+    }
+    case 'T': {
+      struct ProductInformationBlock infoBlock;
+      uint32_t numSignatures, numAdditionalBlocks;
+      int hasSignatureBlock, hasAdditionalBlock;
+      if (!get_mar_file_info(argv[2], &hasSignatureBlock, &numSignatures,
+                             &hasAdditionalBlock, NULL, &numAdditionalBlocks)) {
+        if (hasSignatureBlock) {
+          printf("Signature block found with %d signature%s\n", numSignatures,
+                 numSignatures != 1 ? "s" : "");
+        }
+        if (hasAdditionalBlock) {
+          printf("%d additional block%s found:\n", numAdditionalBlocks,
+                 numAdditionalBlocks != 1 ? "s" : "");
+        }
+
+        rv = read_product_info_block(argv[2], &infoBlock);
+        if (!rv) {
+          printf("  - Product Information Block:\n");
+          printf(
+              "    - MAR channel name: %s\n"
+              "    - Product version: %s\n",
+              infoBlock.MARChannelID, infoBlock.productVersion);
+          free((void*)infoBlock.MARChannelID);
+          free((void*)infoBlock.productVersion);
+        }
+      }
+      printf("\n");
+      /* The fall through from 'T' to 't' is intentional */
+    }
+    case 't':
+      return mar_test(argv[2]);
+
+    case 'x':  // Extract a MAR file
+      return mar_extract(argv[2]);
+
+#ifndef NO_SIGN_VERIFY
+    case 'X':  // Extract a MAR signature
+      if (sigIndex == -1) {
+        fprintf(stderr, "ERROR: Signature index was not passed.\n");
+        return -1;
+      }
+      if (sigIndex >= MAX_SIGNATURES || sigIndex < -1) {
+        fprintf(stderr, "ERROR: Signature index is out of range: %d.\n",
+                sigIndex);
+        return -1;
+      }
+      return extract_signature(argv[2], sigIndex, argv[3]);
+
+    case 'I':  // Import a MAR signature
+      if (sigIndex == -1) {
+        fprintf(stderr, "ERROR: signature index was not passed.\n");
+        return -1;
+      }
+      if (sigIndex >= MAX_SIGNATURES || sigIndex < -1) {
+        fprintf(stderr, "ERROR: Signature index is out of range: %d.\n",
+                sigIndex);
+        return -1;
+      }
+      if (argc < 5) {
+        print_usage();
+        return -1;
+      }
+      return import_signature(argv[2], sigIndex, argv[3], argv[4]);
+
+    case 'v':
+      if (certCount == 0) {
+        print_usage();
+        return -1;
+      }
+
+#  if defined(MAR_NSS)
+      if (!NSSConfigDir || certCount == 0) {
+        print_usage();
+        return -1;
+      }
+
+      if (NSSInitCryptoContext(NSSConfigDir)) {
+        fprintf(stderr, "ERROR: Could not initialize crypto library.\n");
+        return -1;
+      }
+#  endif
+
+      rv = 0;
+      for (k = 0; k < certCount; ++k) {
+#  if !defined(MAR_NSS)
+        rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE,
+                                  &certBuffers[k], &fileSizes[k]);
+
+        if (rv) {
+          fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]);
+          break;
+        }
+#  else
+        /* It is somewhat circuitous to look up a CERTCertificate and then pass
+         * in its DER encoding just so we can later re-create that
+         * CERTCertificate to extract the public key out of it. However, by
+         * doing things this way, we maximize the reuse of the
+         * mar_verify_signatures function and also we keep the control flow as
+         * similar as possible between programs and operating systems, at least
+         * for the functions that are critically important to security.
+         */
+        certs[k] = PK11_FindCertFromNickname(certNames[k], NULL);
+        if (certs[k]) {
+          certBuffers[k] = certs[k]->derCert.data;
+          fileSizes[k] = certs[k]->derCert.len;
+        } else {
+          rv = -1;
+          fprintf(stderr, "ERROR: could not find cert from nickname %s",
+                  certNames[k]);
+          break;
+        }
+#  endif
+      }
+
+      if (!rv) {
+        MarFile* mar;
+        MarReadResult result = mar_open(argv[2], &mar);
+        if (result == MAR_READ_SUCCESS) {
+          rv = mar_verify_signatures(mar, certBuffers, fileSizes, certCount);
+          mar_close(mar);
+        } else {
+          fprintf(stderr, "ERROR: Could not open MAR file.\n");
+          rv = -1;
+        }
+      }
+      for (k = 0; k < certCount; ++k) {
+#  if !defined(MAR_NSS)
+        free((void*)certBuffers[k]);
+#  else
+        /* certBuffers[k] is owned by certs[k] so don't free it */
+        CERT_DestroyCertificate(certs[k]);
+#  endif
+      }
+      if (rv) {
+        /* Determine if the source MAR file has the new fields for signing */
+        int hasSignatureBlock;
+        if (get_mar_file_info(argv[2], &hasSignatureBlock, NULL, NULL, NULL,
+                              NULL)) {
+          fprintf(stderr, "ERROR: could not determine if MAR is old or new.\n");
+        } else if (!hasSignatureBlock) {
+          fprintf(stderr,
+                  "ERROR: The MAR file is in the old format so has"
+                  " no signature to verify.\n");
+        }
+      }
+#  if defined(MAR_NSS)
+      (void)NSS_Shutdown();
+#  endif
+      return rv ? -1 : 0;
+
+    case 's':
+      if (!NSSConfigDir || certCount == 0 || argc < 4) {
+        print_usage();
+        return -1;
+      }
+      return mar_repackage_and_sign(NSSConfigDir, certNames, certCount, argv[2],
+                                    argv[3]);
+
+    case 'r':
+      return strip_signature_block(argv[2], argv[3]);
+#endif /* endif NO_SIGN_VERIFY disabled */
+
+    default:
+      print_usage();
+      return -1;
+  }
+}
diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build
new file mode 100644
index 0000000000..b2772544d5
--- /dev/null
+++ b/modules/libmar/tool/moz.build
@@ -0,0 +1,72 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+HOST_SOURCES += [
+    "/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp",
+    "mar.c",
+]
+
+HostProgram("mar")
+
+HOST_USE_LIBS += [
+    "hostmar",
+]
+
+if CONFIG["HOST_OS_ARCH"] == "WINNT":
+    HOST_OS_LIBS += [
+        "ws2_32",
+    ]
+
+# C11 for static_assert
+c11_flags = ["-std=gnu11"]
+if CONFIG["CC_TYPE"] == "clang-cl":
+    c11_flags.insert(0, "-Xclang")
+HOST_CFLAGS += c11_flags
+
+HOST_DEFINES["NO_SIGN_VERIFY"] = True
+
+if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging":
+    Program("signmar")
+
+    SOURCES += HOST_SOURCES
+
+    CFLAGS += c11_flags
+
+    USE_LIBS += [
+        "mar",
+        "nspr",
+        "nss",
+        "signmar",
+        "verifymar",
+    ]
+
+    if CONFIG["MOZ_USE_NSS_FOR_MAR"]:
+        DEFINES["MAR_NSS"] = True
+
+    if CONFIG["OS_ARCH"] == "WINNT":
+        USE_STATIC_LIBS = True
+
+        OS_LIBS += [
+            "ws2_32",
+        ]
+        if not CONFIG["MOZ_USE_NSS_FOR_MAR"]:
+            OS_LIBS += [
+                "crypt32",
+                "advapi32",
+            ]
+    elif CONFIG["OS_ARCH"] == "Darwin" and not CONFIG["MOZ_USE_NSS_FOR_MAR"]:
+        OS_LIBS += [
+            "-framework CoreFoundation",
+            "-framework Security",
+        ]
+
+    DisableStlWrapping()
+
+
+for var in ("MAR_CHANNEL_ID", "MOZ_APP_VERSION"):
+    HOST_DEFINES[var] = '"%s"' % CONFIG[var]
+    if SOURCES:
+        DEFINES[var] = HOST_DEFINES[var]