replace the single-file obfuscator with an abstract one and add a no-op obfuscator for wasm and ios, on desktop platform use qprocessobfusctator on wasm use the dummy one

Author: encrypt94

src/cmake/ios.cmake

@@ -104,6 +104,8 @@ target_sources(mozillavpn PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos/macospingsender.h
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/purchase/taskpurchase.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/purchase/taskpurchase.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/dummyobfuscator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/dummyobfuscator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosauthenticationlistener.mm
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosauthenticationlistener.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios/iosiaphandler.swift

src/cmake/macos-daemon.cmake

@@ -35,10 +35,11 @@ target_sources(daemon PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemon.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemon.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemonerrors.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/dnsutils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/iputils.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/obfuscator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/qprocessobfuscator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/qprocessobfuscator.cpp    
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/wireguardutils.h
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos/daemon/dnsutilsmacos.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos/daemon/dnsutilsmacos.h

src/cmake/sources.cmake

@@ -70,8 +70,7 @@ target_sources(mozillavpn-sources INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/controller_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemon.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemon.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/obfuscator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemonlocalserverconnection.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/daemonlocalserverconnection.h
     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/dnsutils.h
@@ -196,11 +195,19 @@ if(NOT QT_FEATURE_zstd)
     set_property(SOURCE  ${CMAKE_CURRENT_SOURCE_DIR}/resources/public_keys/public_keys.qrc PROPERTY AUTORCC_OPTIONS "--no-zstd")
 endif()
 
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten" AND
+   NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
+    target_sources(mozillavpn-sources INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/qprocessobfuscator.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/qprocessobfuscator.h
+       )
+endif()
+
 # Sources for desktop platforms.
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
    ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR
    ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-     target_sources(mozillavpn-sources INTERFACE
+    target_sources(mozillavpn-sources INTERFACE
         ${CMAKE_CURRENT_SOURCE_DIR}/systemtraynotificationhandler.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/systemtraynotificationhandler.h
        )

src/cmake/wasm.cmake

@@ -15,6 +15,8 @@ target_sources(mozillavpn PRIVATE
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/wasm/wasmwindowcontroller.h
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/wasm/wasmiaphandler.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/wasm/wasmiaphandler.h
+     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/dummyobfuscator.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/daemon/obfuscator/dummyobfuscator.h
      ${CMAKE_CURRENT_SOURCE_DIR}/systemtraynotificationhandler.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/systemtraynotificationhandler.h
      ${CMAKE_CURRENT_SOURCE_DIR}/tasks/purchase/taskpurchase.cpp

src/daemon/daemon.cpp

@@ -18,9 +18,15 @@
 #include "leakdetector.h"
 #include "logger.h"
 #include "loghandler.h"
-#include "obfuscator.h"
+#include "obfuscator/obfuscator.h"
 #include "wireguardutils.h"
 
+#if defined(MZ_WASM) || defined(MZ_IOS)
+#  include "obfuscator/dummyobfuscator.h"
+#else
+#  include "obfuscator/qprocessobfuscator.h"
+#endif
+
 constexpr const char* JSON_ALLOWEDIPADDRESSRANGES = "allowedIPAddressRanges";
 constexpr int HANDSHAKE_POLL_MSEC = 250;
 
@@ -145,7 +151,7 @@ bool Daemon::activate(const InterfaceConfig& config) {
   InterfaceConfig peerConfig = config;
   if (config.m_obfuscationMethod != Server::ObfuscationMethod::NoObfuscation &&
       config.m_hopType != InterfaceConfig::MultiHopExit) {
-    obfuscator = std::make_unique<Obfuscator>(config);
+    obfuscator = createObfuscator(config);
     if (!obfuscator->start()) {
       logger.error() << "Failed to start obfuscator"
                      << config.m_obfuscationMethod;
@@ -431,6 +437,15 @@ QString Daemon::logs() {
 
 void Daemon::cleanLogs() { LogHandler::instance()->cleanupLogs(); }
 
+std::unique_ptr<Obfuscator> Daemon::createObfuscator(
+    const InterfaceConfig& config) {
+#if defined(MZ_WASM) || defined(MZ_IOS)
+  return std::make_unique<DummyObfuscator>(config);
+#else
+  return std::make_unique<QProcessObfuscator>(config);
+#endif
+}
+
 bool Daemon::supportServerSwitching(const InterfaceConfig& config) const {
   if (!m_connections.contains(config.m_hopType)) {
     return false;
@@ -459,7 +474,7 @@ bool Daemon::switchServer(const InterfaceConfig& config) {
   InterfaceConfig peerConfig = config;
   if (config.m_obfuscationMethod != Server::ObfuscationMethod::NoObfuscation &&
       config.m_hopType != InterfaceConfig::MultiHopExit) {
-    obfuscator = std::make_unique<Obfuscator>(config);
+    obfuscator = createObfuscator(config);
     if (!obfuscator->start()) {
       logger.error() << "Failed to start obfuscator on switch"
                      << config.m_obfuscationMethod;

src/daemon/daemon.h

@@ -12,6 +12,7 @@
 #include "daemon/daemonerrors.h"
 #include "daemonerrors.h"
 #include "interfaceconfig.h"
+#include "obfuscator/obfuscator.h"
 
 class DnsUtils;
 class IPUtils;
@@ -58,6 +59,7 @@ class Daemon : public QObject {
 
  private:
   bool maybeUpdateResolvers(const InterfaceConfig& config);
+  std::unique_ptr<Obfuscator> createObfuscator(const InterfaceConfig& config);
 
  protected:
   virtual bool run(Op op, const InterfaceConfig& config) {

src/daemon/obfuscator/dummyobfuscator.cpp

@@ -0,0 +1,24 @@
+/* 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 "dummyobfuscator.h"
+
+#include "leakdetector.h"
+#include "logger.h"
+
+namespace {
+Logger logger("DummyObfuscator");
+}
+
+DummyObfuscator::DummyObfuscator(const InterfaceConfig& config) {
+  MZ_COUNT_CTOR(DummyObfuscator);
+  Q_UNUSED(config);
+}
+
+bool DummyObfuscator::start() {
+  logger.warning() << "Obfuscation is not supported on this platform";
+  return false;
+}
+
+DummyObfuscator::~DummyObfuscator() { MZ_COUNT_DTOR(DummyObfuscator); }

src/daemon/obfuscator/dummyobfuscator.h

@@ -0,0 +1,26 @@
+/* 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 DUMMYOBFUSCATOR_H
+#define DUMMYOBFUSCATOR_H
+
+#include <QtGlobal>
+
+#include "../utils/interfaceconfig.h"
+#include "obfuscator.h"
+
+// No-op obfuscator used on WASM
+class DummyObfuscator final : public Obfuscator {
+ public:
+  explicit DummyObfuscator(const InterfaceConfig& config);
+  ~DummyObfuscator() override;
+
+  bool start() override;
+  quint16 localPort() const override { return m_localPort; }
+
+ private:
+  quint16 m_localPort = 0;
+};
+
+#endif  // DUMMYOBFUSCATOR_H

src/daemon/obfuscator/obfuscator.h

@@ -0,0 +1,26 @@
+/* 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 OBFUSCATOR_H
+#define OBFUSCATOR_H
+
+#include <QtGlobal>
+
+// Generic obfuscator interface.
+class Obfuscator {
+ public:
+  virtual ~Obfuscator() = default;
+
+  Obfuscator(const Obfuscator&) = delete;
+  Obfuscator& operator=(const Obfuscator&) = delete;
+
+  virtual bool start() = 0;
+
+  virtual quint16 localPort() const = 0;
+
+ protected:
+  Obfuscator() = default;
+};
+
+#endif  // OBFUSCATOR_H

src/daemon/obfuscator.cpp …daemon/obfuscator/qprocessobfuscator.cppsrc/daemon/obfuscator.cpp renamed to src/daemon/obfuscator/qprocessobfuscator.cpp src/daemon/obfuscator.cpp renamed to src/daemon/obfuscator/qprocessobfuscator.cpp

@@ -2,7 +2,7 @@
  * 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 "obfuscator.h"
+#include "qprocessobfuscator.h"
 
 #include <QByteArray>
 #include <QCoreApplication>
@@ -19,11 +19,11 @@ constexpr uint32_t WG_FIREWALL_MARK = 0xca6c;
 #endif
 
 namespace {
-Logger logger("Obfuscator");
+Logger logger("QProcessObfuscator");
 }
 
-Obfuscator::Obfuscator(const InterfaceConfig& config) {
-  MZ_COUNT_CTOR(Obfuscator);
+QProcessObfuscator::QProcessObfuscator(const InterfaceConfig& config) {
+  MZ_COUNT_CTOR(QProcessObfuscator);
 
   const QStringList args = buildArgs(config);
   if (args.isEmpty()) {
@@ -39,7 +39,7 @@ Obfuscator::Obfuscator(const InterfaceConfig& config) {
   m_process.setProcessChannelMode(QProcess::MergedChannels);
 }
 
-bool Obfuscator::start() {
+bool QProcessObfuscator::start() {
   logger.debug() << "Starting obfuscator";
   m_process.start();
   if (!m_process.waitForStarted(OBFUSCATOR_PROC_TIMEOUT_MS)) {
@@ -72,7 +72,7 @@ bool Obfuscator::start() {
   return false;
 }
 
-quint16 Obfuscator::parseListeningPort(const QByteArray& line) const {
+quint16 QProcessObfuscator::parseListeningPort(const QByteArray& line) const {
   static const QByteArray prefix = "listening on 127.0.0.1:";
   const int idx = line.indexOf(prefix);
   if (idx < 0) {
@@ -83,7 +83,7 @@ quint16 Obfuscator::parseListeningPort(const QByteArray& line) const {
   return ok ? port : 0;
 }
 
-QStringList Obfuscator::buildArgs(const InterfaceConfig& config) {
+QStringList QProcessObfuscator::buildArgs(const InterfaceConfig& config) {
   QStringList args;
   switch (config.m_obfuscationMethod) {
     case Server::ObfuscationMethod::UdpOverTcp:
@@ -105,7 +105,7 @@ QStringList Obfuscator::buildArgs(const InterfaceConfig& config) {
   return args;
 }
 
-QString Obfuscator::binaryName() const {
+QString QProcessObfuscator::binaryName() const {
 #if defined(MZ_WINDOWS)
   return QStringLiteral("mozillavpn-obfuscator.exe");
 #elif defined(MZ_LINUX)
@@ -116,8 +116,8 @@ QString Obfuscator::binaryName() const {
 #endif
 }
 
-Obfuscator::~Obfuscator() {
-  MZ_COUNT_DTOR(Obfuscator);
+QProcessObfuscator::~QProcessObfuscator() {
+  MZ_COUNT_DTOR(QProcessObfuscator);
   if (m_process.state() == QProcess::NotRunning) {
     return;
   }