Adding upstream version 124.0.1.upstream/124.0.1

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

3 files changed, 145 insertions, 0 deletions

diff --git a/security/sandbox/win/src/sandboxtarget/moz.build b/security/sandbox/win/src/sandboxtarget/moz.build
new file mode 100644
index 0000000000..3c28eebba2
--- /dev/null
+++ b/security/sandbox/win/src/sandboxtarget/moz.build
@@ -0,0 +1,22 @@
+# -*- 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/.
+
+EXPORTS.mozilla += [
+    "sandboxTarget.h",
+]
+
+SOURCES += [
+    "sandboxTarget.cpp",
+]
+
+LOCAL_INCLUDES += [
+    "/security/sandbox/chromium",
+    "/security/sandbox/chromium-shim",
+]
+
+DEFINES["UNICODE"] = True
+
+FINAL_LIBRARY = "xul"
diff --git a/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp b/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp
new file mode 100644
index 0000000000..66497ce65d
--- /dev/null
+++ b/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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 "sandboxTarget.h"
+
+#include "sandbox/win/src/sandbox.h"
+
+namespace mozilla {
+
+// We need to define this function out of line so that clang-cl doesn't inline
+// it.
+/* static */
+SandboxTarget* SandboxTarget::Instance() {
+  static SandboxTarget sb;
+  return &sb;
+}
+
+void SandboxTarget::StartSandbox() {
+  if (mTargetServices) {
+    mTargetServices->LowerToken();
+    NotifyStartObservers();
+  }
+}
+
+void SandboxTarget::NotifyStartObservers() {
+  for (auto&& obs : mStartObservers) {
+    if (!obs) {
+      continue;
+    }
+
+    obs();
+  }
+
+  mStartObservers.clear();
+}
+
+bool SandboxTarget::GetComplexLineBreaks(const WCHAR* text, uint32_t length,
+                                         uint8_t* break_before) {
+  if (!mTargetServices) {
+    return false;
+  }
+
+  sandbox::ResultCode result =
+      mTargetServices->GetComplexLineBreaks(text, length, break_before);
+  return (sandbox::SBOX_ALL_OK == result);
+}
+
+}  // namespace mozilla
diff --git a/security/sandbox/win/src/sandboxtarget/sandboxTarget.h b/security/sandbox/win/src/sandboxtarget/sandboxTarget.h
new file mode 100644
index 0000000000..1aab1ef76a
--- /dev/null
+++ b/security/sandbox/win/src/sandboxtarget/sandboxTarget.h
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef __SECURITY_SANDBOX_SANDBOXTARGET_H__
+#define __SECURITY_SANDBOX_SANDBOXTARGET_H__
+
+#include <windows.h>
+
+#include <functional>
+#include <list>
+#include <utility>
+
+#include "mozilla/Assertions.h"
+
+namespace sandbox {
+class TargetServices;
+}
+
+namespace mozilla {
+
+class SandboxTarget {
+ public:
+  /**
+   * Obtains a pointer to the singleton instance
+   */
+  static SandboxTarget* Instance();
+
+  /**
+   * Used by the application to pass in the target services that provide certain
+   * functions to the sandboxed code.
+   * The target services must already be initialized.
+   *
+   * @param aTargetServices The target services that will be used
+   */
+  void SetTargetServices(sandbox::TargetServices* aTargetServices) {
+    MOZ_ASSERT(aTargetServices);
+    MOZ_ASSERT(!mTargetServices,
+               "Sandbox TargetServices must only be set once.");
+
+    mTargetServices = aTargetServices;
+  }
+
+  template <typename CallbackT>
+  void RegisterSandboxStartCallback(CallbackT&& aCallback) {
+    mStartObservers.push_back(std::forward<CallbackT>(aCallback));
+  }
+
+  /**
+   * Called by the library that wants to "start" the sandbox, i.e. change to the
+   * more secure delayed / lockdown policy.
+   */
+  void StartSandbox();
+
+  bool GetComplexLineBreaks(const WCHAR* text, uint32_t length,
+                            uint8_t* break_before);
+
+ protected:
+  SandboxTarget() : mTargetServices(nullptr) {}
+
+  sandbox::TargetServices* mTargetServices;
+
+ private:
+  void NotifyStartObservers();
+  std::list<std::function<void()>> mStartObservers;
+};
+
+}  // namespace mozilla
+
+#endif