violent: bug fix

stowmyy · Oct 24, 2023 · 53cc3d9 · 53cc3d9
1 parent 287da20
commit 53cc3d9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/dropship/src/DashboardManager.cpp b/dropship/src/DashboardManager.cpp
@@ -276,6 +276,17 @@ DashboardManager::DashboardManager() :
         }).detach();
 
     //::global_message = done ? "done cover_browser.jpg" : "D: failed.";
+
+    {
+        // 1) load rules from wf.msc
+        firewallManager._syncFirewallWithEndpoints(&(this->endpoints));
+
+        // 2) reset all rules
+        firewallManager.flushRules(&(this->endpoints));
+
+        // 3) sync with endpoints
+        firewallManager._syncEndpointsWithFirewall(&(this->endpoints));
+    }
 }
 
 void DashboardManager::loadAssets() {
@@ -326,6 +337,8 @@ void DashboardManager::loadAssets() {
 void DashboardManager::RenderInline(/* bool* p_open */)
 {
 
+
+
     if (ImGui::GetCurrentContext() != nullptr && ImGui::IsWindowAppearing())
     {
         this->loadAssets();

diff --git a/dropship/src/DashboardManager.h b/dropship/src/DashboardManager.h
@@ -58,7 +58,6 @@ class DashboardManager : public manager
 
         bool active = { false };
 
-
         float __date_new_selection = 0;
 
         std::unordered_map<std::string, Process> processes;

diff --git a/dropship/src/FirewallManager.cpp b/dropship/src/FirewallManager.cpp
@@ -34,8 +34,8 @@ void FirewallManager::_syncFirewallWithEndpoints(std::vector<Endpoint>* endpoint
 void FirewallManager::sync(std::vector<Endpoint>* endpoints)
 {
     printf("sync()\n");
-    this->_syncFirewallWithEndpoints(endpoints);
     this->_syncEndpointsWithFirewall(endpoints);
+    this->_syncFirewallWithEndpoints(endpoints);
 }
 
 // destroys previous rules

diff --git a/dropship/src/_WindowsFirewallUtil.h b/dropship/src/_WindowsFirewallUtil.h
@@ -1317,10 +1317,13 @@ class _WindowsFirewallUtil : public failable
                                 {
                                     if (!e.selected != ruleEnabled)
                                     {
+
                                         // if endpointDominant, set firewall to mirror endpoint state
                                         if (endpointDominant)
                                         {
-                                            printf(std::format("firewall rule \"{0}\" was {1} but endpoint was {2}. turning {2}.\n", s_ruleName, ruleEnabled ? "on" : "off", e.selected ? "on" : "off").c_str());
+
+                                            std::string s_ruleEnabled = ruleEnabled ? "block" : "allow";
+                                            printf(std::format("({0}) firewall: {1}, ui: {2} . Setting firewall rule to match UI state\n", s_ruleName, ruleEnabled ? "block" : "allow", e.selected ? "selected" : "not selected").c_str());
                                             if (FAILED(pFwRule->put_Enabled(e.selected ? VARIANT_FALSE : VARIANT_TRUE)))
                                                 continue;
 
@@ -1331,8 +1334,8 @@ class _WindowsFirewallUtil : public failable
                                         else
 
                                         {
-                                            printf(std::format("endpoint \"{0}\" was {2} but firewall rule was {1}. turning {1}.\n", s_ruleName, ruleEnabled ? "on" : "off", e.selected ? "on" : "off").c_str());
-                                            e.selected = ruleEnabled;
+                                            printf(std::format("({0}) firewall: {1}, ui: {2}. Setting UI state to match firewall state\n", s_ruleName, ruleEnabled ? "block" : "allow", e.selected ? "selected" : "not selected").c_str());
+                                            e.selected = !ruleEnabled;
                                             // e.unsynced = false;
                                         }
                                     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,7 +58,6 @@ class DashboardManager : public manager

		bool active = { false };


		float __date_new_selection = 0;

		std::unordered_map<std::string, Process> processes;
Expand Down