Add removing xray config file when it isn't active

censortracker · Mar 2, 2025 · 1270a68 · 1270a68
1 parent e938ab2
commit 1270a68
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/proxyserver/src/configmanager.cpp b/proxyserver/src/configmanager.cpp
@@ -142,6 +142,25 @@ bool ConfigManager::writeActiveConfig(const QJsonObject &config)
     return true;
 }
 
+bool ConfigManager::removeActiveConfigFile()
+{
+    Logger::getInstance().info("Removing active config file");
+    QFile file(getActiveConfigPath());
+
+    if (file.exists()) {
+        if (file.remove()) {
+            Logger::getInstance().debug("Successfully removed active config file");
+            return true;
+        } else {
+            Logger::getInstance().error(QString("Failed to remove active config file: %1").arg(file.errorString()));
+            return false;
+        }
+    }
+
+    Logger::getInstance().debug("Active config file does not exist, nothing to remove");
+    return true;
+}
+
 QString ConfigManager::generateUuid() const
 {
     return QUuid::createUuid().toString(QUuid::WithoutBraces);
@@ -379,7 +398,16 @@ bool ConfigManager::activateConfig(const QString &uuid)
         m_activeConfigUuid = QString();
         configsInfo["activeConfigUuid"] = QString();
         configsInfo["configs"] = configs;
-        return writeConfigsInfo(configsInfo);
+
+        // Write changes to the configs info file
+        if (!writeConfigsInfo(configsInfo)) {
+            Logger::getInstance().error("Failed to write configs info file");
+            return false;
+        }
+
+        // Remove the active config file
+        Logger::getInstance().debug("Removing active config file");
+        return removeActiveConfigFile();
     }
 
     // Check if config exists

diff --git a/proxyserver/src/configmanager.h b/proxyserver/src/configmanager.h
@@ -34,6 +34,7 @@ class ConfigManager {
     bool writeConfigsInfo(const QJsonObject &configsInfo);
     QJsonObject readActiveConfig() const;
     bool writeActiveConfig(const QJsonObject &config);
+    bool removeActiveConfigFile();
 
     // Helper methods
     QString generateUuid() const;