Address review comments

mozilla-mobile · Oct 18, 2023 · 24c36ad · 24c36ad
1 parent ab2e18c
commit 24c36ad
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -57,6 +57,8 @@ Daemon* Daemon::instance() {
 bool Daemon::activate(const InterfaceConfig& config) {
   Q_ASSERT(wgutils() != nullptr);
 
+  m_state = Activating;
+
   // There are 3 possible scenarios in which this method is called:
   //
   // 1. the VPN is off: the method tries to enable the VPN.
@@ -69,7 +71,10 @@ bool Daemon::activate(const InterfaceConfig& config) {
   // If the activation abort's for any reason `the `activationFailure` signal is
   // emitted.
   logger.debug() << "Activating interface";
-  auto emit_failure_guard = qScopeGuard([this] { emit activationFailure(); });
+  auto emit_failure_guard = qScopeGuard([this] {
+    m_state = Inactive;
+    emit activationFailure();
+  });
 
   if (m_connections.contains(config.m_hopType)) {
     if (supportServerSwitching(config)) {
@@ -155,6 +160,7 @@ bool Daemon::activate(const InterfaceConfig& config) {
     m_connections[config.m_hopType] = ConnectionState(config);
     m_handshakeTimer.start(HANDSHAKE_POLL_MSEC);
     emit_failure_guard.dismiss();
+    m_state = Active;
     return true;
   }
   return false;
@@ -335,6 +341,8 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
 bool Daemon::deactivate(bool emitSignals) {
   Q_ASSERT(wgutils() != nullptr);
 
+  m_state = Inactive;
+
   // Deactivate the main interface.
   if (!m_connections.isEmpty()) {
     const ConnectionState& state = m_connections.first();

diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
@@ -23,13 +23,17 @@ class Daemon : public QObject {
     Switch,
   };
 
+  enum State { Activating, Active, Inactive };
+
   explicit Daemon(QObject* parent);
   ~Daemon();
 
   static Daemon* instance();
 
   static bool parseConfig(const QJsonObject& obj, InterfaceConfig& config);
 
+  State state() { return m_state; };
+
   virtual bool activate(const InterfaceConfig& config);
   virtual bool deactivate(bool emitSignals = true);
   virtual QJsonObject getStatus();
@@ -82,6 +86,8 @@ class Daemon : public QObject {
   };
   QMap<InterfaceConfig::HopType, ConnectionState> m_connections;
   QTimer m_handshakeTimer;
+
+  State m_state = Inactive;
 };
 
 #endif  // DAEMON_H
diff --git a/src/daemon/daemonlocalserverconnection.cpp b/src/daemon/daemonlocalserverconnection.cpp
@@ -179,7 +179,8 @@ bool DaemonLocalServerConnection::isCallerAuthorized(const QString& command) {
   int result = getpeereid(m_socket->socketDescriptor(), &uid, &gid);
   if (result == -1) {
     logger.error() << "Unable to determine if caller is authorized."
-                      "Assuming unauthorized.";
+                      "Assuming unauthorized. Error:"
+                   << errno;
     return false;
   }
 
@@ -189,10 +190,8 @@ bool DaemonLocalServerConnection::isCallerAuthorized(const QString& command) {
     return true;
   }
 
-  QJsonObject status = Daemon::instance()->getStatus();
-  bool isConnected = status.value("connected").toBool();
-
-  if (isConnected) {
+  Daemon::State state = Daemon::instance()->state();
+  if (state != Daemon::Inactive) {
     if (m_sessionUid == uid) {
       // Case: VPN is currently active and caller is the one who activated it.
       // Caller can access the APIs.