Removed administartor manifest

Author: Zaczero

DNSChanger/DNSChangeDetectedForm.cs

@@ -43,9 +43,9 @@ private void manualBtn_Click(object sender, EventArgs e)
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = Process.GetCurrentProcess().MainModule.FileName,
+                    FileName = Utilities.GetProcessPath(),
+                    UseShellExecute = true,
                     Verb = "runas",
-                    UseShellExecute = false,
                 },
             };
 

DNSChanger/DNSChanger.csproj

@@ -94,6 +94,7 @@
     <Compile Include="Structs\DNSEntry.cs" />
     <Compile Include="Structs\DNSServerEntry.cs" />
     <Compile Include="Structs\Interface.cs" />
+    <Compile Include="Utilities.cs" />
     <EmbeddedResource Include="DNSChangeDetectedForm.resx">
       <DependentUpon>DNSChangeDetectedForm.cs</DependentUpon>
     </EmbeddedResource>

DNSChanger/DNSValidate.cs

@@ -1,19 +1,18 @@
 using DNSChanger.Structs;
 using Microsoft.Win32.TaskScheduler;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace DNSChanger
 {
 	public static class DNSValidate
     {
-	    private const string TaskPath = "DNSChanger-ValidationTask";
+	    private static readonly string TaskPath = GlobalVars.Name + "-ValidationTask";
 
         static DNSValidate()
         {
-            if (!VerifyProcessPath())
+            if (!ValidateAutoStartProcessPath())
             {
                 var @interface = GetInterfaceToValidate();
                 if (@interface.HasValue)
@@ -52,14 +51,14 @@ private static Task Get()
 	        return TaskService.Instance.GetTask(TaskPath);
         }
 
-        private static bool VerifyProcessPath()
+        private static bool ValidateAutoStartProcessPath()
         {
             var tsk = Get();
             if (tsk == null) return true;
 
             var action = (ExecAction) tsk.Definition.Actions[0];
 
-            return action.Path == Process.GetCurrentProcess().MainModule.FileName;
+            return action.Path == Utilities.GetProcessPath();
         }
 
         public static Interface? GetInterfaceToValidate()
@@ -111,8 +110,9 @@ public static void Enable(Interface @interface)
 	        var task = ts.NewTask();
 	        task.Principal.RunLevel = TaskRunLevel.Highest;
 	        task.RegistrationInfo.Description = "Performs DNS validation procedure on boot";
+	        task.RegistrationInfo.Author = GlobalVars.Name;
 	        task.Triggers.Add(new BootTrigger());
-	        task.Actions.Add(Process.GetCurrentProcess().MainModule.FileName, $"-validate \"{@interface.Name}\" \"{AggregateDnsEntries(@interface)}\"");
+	        task.Actions.Add(Utilities.GetProcessPath(), $"-validate \"{@interface.Name}\" \"{AggregateDnsEntries(@interface)}\"");
 
 	        ts.RootFolder.RegisterTaskDefinition(TaskPath, task);
         }

DNSChanger/Program.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
+using System.Security.Principal;
 using System.Windows.Forms;
 
 namespace DNSChanger
@@ -9,6 +11,22 @@ public static class Program
         [STAThread]
         public static void Main(string[] args)
         {
+	        if (!Utilities.IsAdministrator())
+	        {
+		        var proc = new Process
+		        {
+			        StartInfo = new ProcessStartInfo
+			        {
+				        FileName = Utilities.GetProcessPath(),
+				        UseShellExecute = true,
+				        Verb = "runas",
+			        },
+		        };
+
+		        proc.Start();
+				return;
+	        }
+
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 

DNSChanger/Utilities.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics;
+using System.Security.Principal;
+
+namespace DNSChanger
+{
+	public static class Utilities
+	{
+		public static bool IsAdministrator()
+		{
+			using (var identity = WindowsIdentity.GetCurrent())
+			{
+				var principal = new WindowsPrincipal(identity);
+				return principal.IsInRole(WindowsBuiltInRole.Administrator);
+			}
+		}
+
+		public static string GetProcessPath()
+		{
+			return Process.GetCurrentProcess().MainModule.FileName;
+		}
+	}
+}

DNSChanger/app.manifest

@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>