Add uninstaller

2trvl · 2trvl · commit 105837788524 · 2022-01-16T04:51:18.000+03:00
diff --git a/Clab.sln b/Clab.sln
@@ -4,6 +4,8 @@ VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clab", "Clab\Clab.csproj", "{A1DAA0BC-658A-4091-BBAC-87B7F95E41EE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClabUninstall", "ClabUninstall\ClabUninstall.csproj", "{7BAC2917-ED21-47EA-91A4-05E04D648EDA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -14,6 +16,10 @@ Global
 		{A1DAA0BC-658A-4091-BBAC-87B7F95E41EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1DAA0BC-658A-4091-BBAC-87B7F95E41EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1DAA0BC-658A-4091-BBAC-87B7F95E41EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BAC2917-ED21-47EA-91A4-05E04D648EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BAC2917-ED21-47EA-91A4-05E04D648EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BAC2917-ED21-47EA-91A4-05E04D648EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BAC2917-ED21-47EA-91A4-05E04D648EDA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Clab/Clab.csproj b/Clab/Clab.csproj
@@ -5,6 +5,8 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Version>0.0.1</Version>
+    <ApplicationIcon>images\icons\app\plastic-cup.ico</ApplicationIcon>
+    <StartupObject />
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Clab/network/network.cs b/Clab/network/network.cs
@@ -35,11 +35,11 @@ public static void grant_firewall_rules()
 
             INetFwPolicy2 firewallPolicy = (INetFwPolicy2)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FwPolicy2"));
 
-            INetFwRule firewallRules = firewallPolicy.Rules.OfType<INetFwRule>().Where(x => (x.Name == "ClabSignals") && 
-                                                                                            (x.Name == "ClabMessages") && 
-                                                                                            (x.Name == "ClabFiles")).FirstOrDefault();
+            bool firewallRules = firewallPolicy.Rules.OfType<INetFwRule>().Where(x => (x.Name == "ClabSignals") || 
+                                                                                      (x.Name == "ClabMessages") || 
+                                                                                      (x.Name == "ClabFiles")).Count() == 3;
 
-            if (firewallRules == null)
+            if (!firewallRules)
             {
                 Common.run_as_admin();
 
@@ -95,32 +95,41 @@ public static partial class Common
     {
         public static bool is_admin()
         {
-            WindowsIdentity id = WindowsIdentity.GetCurrent();
-            WindowsPrincipal principal = new WindowsPrincipal(id);
+            bool admin;
 
-            return principal.IsInRole(WindowsBuiltInRole.Administrator);
+            try
+            {
+                WindowsIdentity id = WindowsIdentity.GetCurrent();
+                WindowsPrincipal principal = new WindowsPrincipal(id);
+                admin = principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch (Exception)
+            {
+                admin = false;
+            }
+
+            return admin;
         }
 
         public static void run_as_admin()
         {
             if (!is_admin())
             {
-                ProcessStartInfo proc = new ProcessStartInfo();
-                proc.UseShellExecute = false;
-                proc.WorkingDirectory = Environment.CurrentDirectory;
-                proc.FileName = Assembly.GetEntryAssembly().CodeBase;
-                proc.Verb = "runas";
+                Process proc = new Process();
+                proc.StartInfo.Verb = "runas";
+                proc.StartInfo.UseShellExecute = true;
+                proc.StartInfo.FileName = Path.ChangeExtension(Assembly.GetEntryAssembly().Location, ".exe");
 
                 try
                 {
-                    Process.Start(proc);
+                    proc.Start();
                 }
                 catch (Exception)
                 {
-                    MessageBox.Show("Please run Clab as administrator this time. This is required to configure the firewall");
+                    MessageBox.Show("Please run Clab as administrator next time. This is required to configure the firewall");
                 }
 
-                Application.Exit();
+                Environment.Exit(0);
             }
         }
 
diff --git a/Clab/network/signals.cs b/Clab/network/signals.cs
@@ -33,16 +33,13 @@ public static partial class Network
         static List<TcpClient> files;
         static readonly object filesLock = new object();
 
-        static Network()
+        public static void run()
         {
             signals = new UdpClient();
             signals.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
             signals.Client.Bind(new IPEndPoint(IPAddress.Any, ports["signals"]));
             signals.JoinMulticastGroup(signalsIP, IPAddress.Parse(Network.IP));
-        }
 
-        public static void run()
-        {
             //  if the network is silent for 5 seconds, the PC becomes a server
             Task.Delay(5000).ContinueWith(timer => run_server());
 
diff --git a/ClabUninstall/ClabUninstall.csproj b/ClabUninstall/ClabUninstall.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Version>0.0.1</Version>
+    <ApplicationIcon>icon\uninstall.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <COMReference Include="NetFwTypeLib">
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>58fbcf7c-e7a9-467c-80b3-fc65e8fcca08</Guid>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
+
+</Project>
diff --git a/ClabUninstall/app.manifest b/ClabUninstall/app.manifest
@@ -0,0 +1,15 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+    </application>
+  </compatibility>
+</assembly>
diff --git a/ClabUninstall/icon/uninstall.ico b/ClabUninstall/icon/uninstall.ico
diff --git a/ClabUninstall/icon/uninstall.svg b/ClabUninstall/icon/uninstall.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.5, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Uninstaller" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="1024px" height="1024px" viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;"
+	 xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E03834;}
+	.st1{fill:#FFFFFF;}
+</style>
+<circle id="Ellipse" class="st0" cx="512" cy="512" r="451.4"/>
+<path id="Cross" class="st1" d="M504.6,571.6c4.1-4.1,10.7-4.1,14.8,0l0.1,0.1c24.4,24.6,49,49.1,73.5,73.6
+	c10.2,10.2,20.2,20.7,30.7,30.5c11.6,10.9,25.5,13.4,40.1,7.3c14-5.9,21.4-17.2,22.3-32.4c0.7-12-4.5-21.7-12.9-30
+	c-34-33.8-67.9-67.8-101.7-101.7c-0.1-0.1-0.3-0.3-0.4-0.4c-3.6-3.7-3.6-9.6,0-13.3c0,0,0,0,0.1-0.1c21.6-21.7,43.3-43.3,64.9-65
+	c13.1-13.1,26.4-25.9,39.1-39.3c16.1-16.9,14.4-42-3.4-55.7c-15.1-11.7-35.5-9.9-50.2,4.8c-34.2,34-68.2,68.2-102.4,102.3
+	c0,0,0,0-0.1,0.1c-3.9,3.9-10.3,3.9-14.2,0c0,0-0.1-0.1-0.1-0.1c-34.1-34.1-68.2-68.3-102.4-102.3c-13.4-13.3-31.1-16.1-45.9-7.7
+	c-22,12.5-25.3,40.9-6.6,59.8c34.2,34.4,68.6,68.7,102.9,103l0.1,0.1c3.8,3.8,3.7,10.1-0.3,13.8c-0.2,0.2-0.4,0.4-0.6,0.6
+	c-33.9,33.9-67.9,67.7-101.7,101.7c-16.2,16.3-16.9,39.1-1.8,54.1s37.7,14.4,54.1-1.8c16.5-16.2,32.7-32.6,49-49
+	C469,607.5,486.1,590.2,504.6,571.6z"/>
+</svg>
diff --git a/ClabUninstall/uninstall.cmd b/ClabUninstall/uninstall.cmd
@@ -0,0 +1,4 @@
+@echo off
+set filepath=%1
+cd ..
+start cmd.exe /k "timeout 2 > NUL && rmdir /s /q %filepath%"
diff --git a/ClabUninstall/uninstall.cs b/ClabUninstall/uninstall.cs
@@ -0,0 +1,51 @@
+﻿using System;
+using System.IO;
+using NetFwTypeLib;
+using System.Reflection;
+using System.Diagnostics;
+
+namespace ClabUninstall
+{
+    class Uninstaller
+    {
+        static void remove_firewall_rules()
+        {
+            Type tNetFwPolicy2 = Type.GetTypeFromProgID("HNetCfg.FwPolicy2");
+            INetFwPolicy2 fwPolicy2 = (INetFwPolicy2)Activator.CreateInstance(tNetFwPolicy2);
+            var currentProfiles = fwPolicy2.CurrentProfileTypes;
+
+            INetFwPolicy2 firewallPolicy = (INetFwPolicy2)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FwPolicy2"));
+
+            foreach (INetFwRule rule in fwPolicy2.Rules)
+            {                    
+                if (rule.Name == "ClabSignals" || rule.Name == "ClabMessages" || rule.Name == "ClabFiles")
+                {
+                    try
+                    {
+                        firewallPolicy.Rules.Remove(rule.Name);
+                        Console.WriteLine($"{rule.Name} has been remove from Firewall Policy");
+                    }
+                    catch (Exception) { }
+                }
+            }
+        }
+
+        static void run_cmd_uninstaller()
+        {
+            string directory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+
+            Process proc = new Process();
+            proc.StartInfo.Verb = "runas";
+            proc.StartInfo.UseShellExecute = true;
+            proc.StartInfo.Arguments = $"{directory}";
+            proc.StartInfo.FileName = Path.Combine(directory, "uninstall.cmd");
+            proc.Start();
+        }
+
+        static void Main()
+        {
+            remove_firewall_rules();
+            run_cmd_uninstaller();
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ public static void grant_firewall_rules()`
`35`	`35`
`36`	`36`	`INetFwPolicy2 firewallPolicy = (INetFwPolicy2)Activator.CreateInstance(Type.GetTypeFromProgID("HNetCfg.FwPolicy2"));`
`37`	`37`
`38`		`- INetFwRule firewallRules = firewallPolicy.Rules.OfType<INetFwRule>().Where(x => (x.Name == "ClabSignals") &&`
`39`		`- (x.Name == "ClabMessages") &&`
`40`		`- (x.Name == "ClabFiles")).FirstOrDefault();`
	`38`	`+ bool firewallRules = firewallPolicy.Rules.OfType<INetFwRule>().Where(x => (x.Name == "ClabSignals") \|\|`
	`39`	`+ (x.Name == "ClabMessages") \|\|`
	`40`	`+ (x.Name == "ClabFiles")).Count() == 3;`
`41`	`41`
`42`		`- if (firewallRules == null)`
	`42`	`+ if (!firewallRules)`
`43`	`43`	`{`
`44`	`44`	`Common.run_as_admin();`
`45`	`45`
`@@ -95,32 +95,41 @@ public static partial class Common`
`95`	`95`	`{`
`96`	`96`	`public static bool is_admin()`
`97`	`97`	`{`
`98`		`- WindowsIdentity id = WindowsIdentity.GetCurrent();`
`99`		`- WindowsPrincipal principal = new WindowsPrincipal(id);`
	`98`	`+ bool admin;`
`100`	`99`
`101`		`- return principal.IsInRole(WindowsBuiltInRole.Administrator);`
	`100`	`+ try`
	`101`	`+ {`
	`102`	`+ WindowsIdentity id = WindowsIdentity.GetCurrent();`
	`103`	`+ WindowsPrincipal principal = new WindowsPrincipal(id);`
	`104`	`+ admin = principal.IsInRole(WindowsBuiltInRole.Administrator);`
	`105`	`+ }`
	`106`	`+ catch (Exception)`
	`107`	`+ {`
	`108`	`+ admin = false;`
	`109`	`+ }`
	`110`	`+`
	`111`	`+ return admin;`
`102`	`112`	`}`
`103`	`113`
`104`	`114`	`public static void run_as_admin()`
`105`	`115`	`{`
`106`	`116`	`if (!is_admin())`
`107`	`117`	`{`
`108`		`- ProcessStartInfo proc = new ProcessStartInfo();`
`109`		`- proc.UseShellExecute = false;`
`110`		`- proc.WorkingDirectory = Environment.CurrentDirectory;`
`111`		`- proc.FileName = Assembly.GetEntryAssembly().CodeBase;`
`112`		`- proc.Verb = "runas";`
	`118`	`+ Process proc = new Process();`
	`119`	`+ proc.StartInfo.Verb = "runas";`
	`120`	`+ proc.StartInfo.UseShellExecute = true;`
	`121`	`+ proc.StartInfo.FileName = Path.ChangeExtension(Assembly.GetEntryAssembly().Location, ".exe");`
`113`	`122`
`114`	`123`	`try`
`115`	`124`	`{`
`116`		`- Process.Start(proc);`
	`125`	`+ proc.Start();`
`117`	`126`	`}`
`118`	`127`	`catch (Exception)`
`119`	`128`	`{`
`120`		`- MessageBox.Show("Please run Clab as administrator this time. This is required to configure the firewall");`
	`129`	`+ MessageBox.Show("Please run Clab as administrator next time. This is required to configure the firewall");`
`121`	`130`	`}`
`122`	`131`
`123`		`- Application.Exit();`
	`132`	`+ Environment.Exit(0);`
`124`	`133`	`}`
`125`	`134`	`}`
`126`	`135`