VPN-6647: Ensure the app is started with a systemd application scope

src/cmake/linux.cmake

@@ -11,12 +11,11 @@ target_link_libraries(mozillavpn PRIVATE Qt6::DBus)
 target_sources(mozillavpn PRIVATE
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/backendlogsobserver.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/backendlogsobserver.h
+    ${CMAKE_SOURCE_DIR}/src/platforms/linux/dbustypes.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxappimageprovider.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxappimageprovider.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxapplistprovider.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxapplistprovider.h
-    ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxdependencies.cpp
-    ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxdependencies.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxnetworkwatcher.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxnetworkwatcher.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxnetworkwatcherworker.cpp
@@ -25,6 +24,8 @@ target_sources(mozillavpn PRIVATE
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxpingsender.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxsystemtraynotificationhandler.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxsystemtraynotificationhandler.h
+    ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxutils.cpp
+    ${CMAKE_SOURCE_DIR}/src/platforms/linux/linuxutils.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/xdgcryptosettings.cpp
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/xdgcryptosettings.h
     ${CMAKE_SOURCE_DIR}/src/platforms/linux/xdgportal.cpp
@@ -70,7 +71,6 @@ if(NOT BUILD_FLATPAK)
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/apptracker.h
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/dbusservice.cpp
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/dbusservice.h
-        ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/dbustypeslinux.h
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/dnsutilslinux.cpp
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/dnsutilslinux.h
         ${CMAKE_SOURCE_DIR}/src/platforms/linux/daemon/iputilslinux.cpp

src/command.cpp

@@ -41,6 +41,10 @@
 #  include "platforms/macos/macosutils.h"
 #endif
 
+#ifdef MZ_LINUX
+#  include "platforms/linux/xdgportal.h"
+#endif
+
 #include <QApplication>
 #include <QIcon>
 #include <QTextStream>
@@ -100,6 +104,10 @@ bool Command::loadModels() {
 int Command::runCommandLineApp(std::function<int()>&& a_callback) {
   std::function<int()> callback = std::move(a_callback);
 
+#ifdef MZ_LINUX
+  XdgPortal::setupAppScope(Constants::LINUX_APP_ID);
+#endif
+
   SettingsHolder settingsHolder;
 
   if (settingsHolder.stagingServer()) {
@@ -124,6 +132,10 @@ int Command::runCommandLineApp(std::function<int()>&& a_callback) {
 int Command::runGuiApp(std::function<int()>&& a_callback) {
   std::function<int()> callback = std::move(a_callback);
 
+#ifdef MZ_LINUX
+  XdgPortal::setupAppScope(Constants::LINUX_APP_ID);
+#endif
+
   SettingsHolder settingsHolder;
 
   if (settingsHolder.stagingServer()) {
@@ -155,6 +167,10 @@ int Command::runGuiApp(std::function<int()>&& a_callback) {
 int Command::runQmlApp(std::function<int()>&& a_callback) {
   std::function<int()> callback = std::move(a_callback);
 
+#ifdef MZ_LINUX
+  XdgPortal::setupAppScope(Constants::LINUX_APP_ID);
+#endif
+
   SettingsHolder settingsHolder;
 
   if (settingsHolder.stagingServer()) {

src/feature/featurelistcallback.h

@@ -16,7 +16,7 @@
 #ifdef MZ_LINUX
 #  include <QProcessEnvironment>
 
-#  include "platforms/linux/linuxdependencies.h"
+#  include "platforms/linux/linuxutils.h"
 #  include "versionutils.h"
 #endif
 
@@ -123,7 +123,7 @@ bool FeatureCallback_splitTunnel() {
 
   /* Control groups v2 must be mounted for app/traffic classification
    */
-  if (LinuxDependencies::findCgroup2Path().isNull()) {
+  if (LinuxUtils::findCgroup2Path().isNull()) {
     return false;
   }
 
@@ -135,15 +135,15 @@ bool FeatureCallback_splitTunnel() {
   }
   QStringList desktop = pe.value("XDG_CURRENT_DESKTOP").split(":");
   if (desktop.contains("GNOME")) {
-    QString shellVersion = LinuxDependencies::gnomeShellVersion();
+    QString shellVersion = LinuxUtils::gnomeShellVersion();
     if (shellVersion.isNull()) {
       return false;
     }
     if (VersionUtils::compareVersions(shellVersion, "3.34") < 0) {
       return false;
     }
   } else if (desktop.contains("KDE")) {
-    QString kdeVersion = LinuxDependencies::kdeFrameworkVersion();
+    QString kdeVersion = LinuxUtils::kdeFrameworkVersion();
     if (kdeVersion.isNull()) {
       return false;
     }

src/platforms/linux/daemon/apptracker.cpp

@@ -12,10 +12,10 @@
 #include <QScopeGuard>
 #include <QtDBus/QtDBus>
 
-#include "../linuxdependencies.h"
-#include "dbustypeslinux.h"
 #include "leakdetector.h"
 #include "logger.h"
+#include "platforms/linux/dbustypes.h"
+#include "platforms/linux/linuxutils.h"
 
 constexpr const char* GTK_DESKTOP_APP_SERVICE = "org.gtk.gio.DesktopAppInfo";
 constexpr const char* GTK_DESKTOP_APP_PATH = "/org/gtk/gio/DesktopAppInfo";
@@ -34,7 +34,7 @@ AppTracker::AppTracker(QObject* parent) : QObject(parent) {
   logger.debug() << "AppTracker created.";
 
   /* Monitor for changes to the user's application control groups. */
-  m_cgroupMount = LinuxDependencies::findCgroup2Path();
+  m_cgroupMount = LinuxUtils::findCgroup2Path();
 }
 
 AppTracker::~AppTracker() {
@@ -208,7 +208,7 @@ QString AppTracker::findDesktopFileId(const QString& cgroup) {
                            this);
   QString source = interface.property("SourcePath").toString();
   if (!source.isEmpty() && source.endsWith(".desktop")) {
-    return LinuxDependencies::desktopFileId(source);
+    return LinuxUtils::desktopFileId(source);
   }
 
   // Otherwise, we don't know the desktop ID for this control group.

src/platforms/linux/daemon/dbusservice.cpp

@@ -19,7 +19,7 @@
 #include "leakdetector.h"
 #include "logger.h"
 #include "loghandler.h"
-#include "platforms/linux/linuxdependencies.h"
+#include "platforms/linux/linuxutils.h"
 
 namespace {
 Logger logger("DBusService");
@@ -139,7 +139,7 @@ bool DBusService::activate(const QString& jsonConfig) {
   if (obj.contains("vpnDisabledApps")) {
     QJsonArray disabledApps = obj["vpnDisabledApps"].toArray();
     for (const QJsonValue& app : disabledApps) {
-      setAppState(LinuxDependencies::desktopFileId(app.toString()), Excluded);
+      setAppState(LinuxUtils::desktopFileId(app.toString()), Excluded);
     }
   }
 
@@ -382,14 +382,3 @@ bool DBusService::isCallerAuthorized() {
   }
   return (flag == CAP_SET);
 }
-
-// Workaround for QTBUG-108822 by manually registering QDBusObjectPath with the
-// D-Bus meta-type system, otherwise we are unable to connect to some signals.
-#if QT_VERSION < 0x060403
-class QtbugRegistrationProxy {
- public:
-  QtbugRegistrationProxy() { qDBusRegisterMetaType<QDBusObjectPath>(); }
-};
-
-static QtbugRegistrationProxy s_qtbugRegistrationProxy;
-#endif

src/platforms/linux/daemon/dnsutilslinux.cpp

@@ -208,5 +208,3 @@ void DnsUtilsLinux::dnsDomainsReceived(QDBusPendingCallWatcher* call) {
   setLinkDomains(m_ifindex, newlist);
   delete call;
 }
-
-static DnsMetatypeRegistrationProxy s_dnsMetatypeProxy;

src/platforms/linux/daemon/dnsutilslinux.h

@@ -9,7 +9,7 @@
 #include <QDBusPendingCallWatcher>
 
 #include "daemon/dnsutils.h"
-#include "dbustypeslinux.h"
+#include "platforms/linux/dbustypes.h"
 
 class DnsUtilsLinux final : public DnsUtils {
   Q_OBJECT

src/platforms/linux/daemon/wireguardutilslinux.cpp

@@ -25,7 +25,7 @@
 
 #include "leakdetector.h"
 #include "logger.h"
-#include "platforms/linux/linuxdependencies.h"
+#include "platforms/linux/linuxutils.h"
 
 // Import wireguard C library for Linux
 #if defined(__cplusplus)
@@ -101,8 +101,8 @@ WireguardUtilsLinux::WireguardUtilsLinux(QObject* parent)
   // In this situation, you will likely see this kernel log warning:
   //   cgroup: disabling cgroup2 socket matching due to net_prio or net_cls
   //   activation
-  m_cgroupNetClass = LinuxDependencies::findCgroupPath("net_cls");
-  m_cgroupUnified = LinuxDependencies::findCgroup2Path();
+  m_cgroupNetClass = LinuxUtils::findCgroupPath("net_cls");
+  m_cgroupUnified = LinuxUtils::findCgroup2Path();
   if (!m_cgroupNetClass.isNull()) {
     if (setupCgroupClass(m_cgroupNetClass + VPN_EXCLUDE_CGROUP,
                          VPN_EXCLUDE_CLASS_ID)) {

src/platforms/linux/daemon/dbustypeslinux.h → src/platforms/linux/dbustypes.h

@@ -2,8 +2,8 @@
  * 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 DBUSTYPESLINUX_H
-#define DBUSTYPESLINUX_H
+#ifndef DBUSTYPES_H
+#define DBUSTYPES_H
 
 #include <sys/socket.h>
 
@@ -145,9 +145,61 @@ typedef QList<UserData> UserDataList;
 Q_DECLARE_METATYPE(UserData);
 Q_DECLARE_METATYPE(UserDataList);
 
-class DnsMetatypeRegistrationProxy {
+class SystemdUnitProp {
  public:
-  DnsMetatypeRegistrationProxy() {
+  SystemdUnitProp(){};
+  SystemdUnitProp(const QString& n, const QVariant& v) : name(n), value(v){};
+  QString name;
+  QVariant value;
+
+  friend QDBusArgument& operator<<(QDBusArgument& args,
+                                   const SystemdUnitProp& data) {
+    args.beginStructure();
+    args << data.name << QDBusVariant(data.value);
+    args.endStructure();
+    return args;
+  }
+  friend const QDBusArgument& operator>>(const QDBusArgument& args,
+                                         SystemdUnitProp& data) {
+    QDBusVariant dv;
+    args.beginStructure();
+    args >> data.name >> dv;
+    args.endStructure();
+    data.value = dv.variant();
+    return args;
+  }
+};
+typedef QList<SystemdUnitProp> SystemdUnitPropList;
+Q_DECLARE_METATYPE(SystemdUnitProp);
+Q_DECLARE_METATYPE(SystemdUnitPropList);
+
+class SystemdUnitAux {
+ public:
+  QString name;
+  SystemdUnitPropList prop;
+
+  friend QDBusArgument& operator<<(QDBusArgument& args,
+                                   const SystemdUnitAux& data) {
+    args.beginStructure();
+    args << data.name << data.prop;
+    args.endStructure();
+    return args;
+  }
+  friend const QDBusArgument& operator>>(const QDBusArgument& args,
+                                         SystemdUnitAux& data) {
+    args.beginStructure();
+    args >> data.name >> data.prop;
+    args.endStructure();
+    return args;
+  }
+};
+typedef QList<SystemdUnitAux> SystemdUnitAuxList;
+Q_DECLARE_METATYPE(SystemdUnitAux);
+Q_DECLARE_METATYPE(SystemdUnitAuxList);
+
+class DBusMetatypeRegistrationProxy {
+ public:
+  DBusMetatypeRegistrationProxy() {
     qRegisterMetaType<DnsResolver>();
     qDBusRegisterMetaType<DnsResolver>();
     qRegisterMetaType<DnsResolverList>();
@@ -164,6 +216,14 @@ class DnsMetatypeRegistrationProxy {
     qDBusRegisterMetaType<UserData>();
     qRegisterMetaType<UserDataList>();
     qDBusRegisterMetaType<UserDataList>();
+    qRegisterMetaType<SystemdUnitProp>();
+    qDBusRegisterMetaType<SystemdUnitProp>();
+    qRegisterMetaType<SystemdUnitPropList>();
+    qDBusRegisterMetaType<SystemdUnitPropList>();
+    qRegisterMetaType<SystemdUnitAux>();
+    qDBusRegisterMetaType<SystemdUnitAux>();
+    qRegisterMetaType<SystemdUnitAuxList>();
+    qDBusRegisterMetaType<SystemdUnitAuxList>();
   }
 };