Added "ls" command and "echoFile" command.

brianb12321 · Feb 21, 2018 · 774785b · 774785b
1 parent ef711dc
commit 774785b
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 4 deletions.
diff --git a/src/Recon/ClientCallback.cs b/src/Recon/ClientCallback.cs
@@ -27,6 +27,11 @@ public void Disconnect(string Reason)
             ReconManager.Client.Close();
         }
 
+        public PromptBuilder GetCurrentPrompt()
+        {
+            return null;
+        }
+
         public ClientBuilder RegisterClient()
         {
             ClientBuilder cb = new ClientBuilder(ClientType.Headless);

diff --git a/src/RemotePlusClient/ClientCallback.cs b/src/RemotePlusClient/ClientCallback.cs
@@ -170,6 +170,11 @@ public void ChangePrompt(PromptBuilder newPrompt)
         {
             //TODO: Implement Prompt
         }
+
+        public PromptBuilder GetCurrentPrompt()
+        {
+            return null;
+        }
         #endregion
 
     }

diff --git a/src/RemotePlusClientCmd/ClientCallback.cs b/src/RemotePlusClientCmd/ClientCallback.cs
@@ -26,6 +26,11 @@ public void Disconnect(string Reason)
             //ClientCmdManager.WaitFlag = false;
         }
 
+        public PromptBuilder GetCurrentPrompt()
+        {
+            return ClientCmdManager.prompt;
+        }
+
         public ClientBuilder RegisterClient()
         {
             ClientBuilder cb = new ClientBuilder(ClientType.CommandLine);

diff --git a/src/RemotePlusLibrary.Extension/ILibraryBuilder.cs b/src/RemotePlusLibrary.Extension/ILibraryBuilder.cs
@@ -10,7 +10,6 @@ namespace RemotePlusLibrary.Extension
     public delegate void ServerHook(HookArguments args);
     public interface ILibraryBuilder
     {
-        Dictionary<string, List<ServerHook>> Hooks { get; }
         string FriendlyName { get; }
         string Name { get; }
         string Version { get; }

diff --git a/src/RemotePlusLibrary/IRemoteClient.cs b/src/RemotePlusLibrary/IRemoteClient.cs
@@ -13,9 +13,9 @@ public interface IRemoteClient : IClient
     {
         [OperationContract(IsOneWay = true)]
         void TellMessage(string Message, Logging.OutputLevel o);
-        [OperationContract(Name = "TellMessageToServerConsole", IsOneWay = true)]
+        [OperationContract(Name = "TellMessageToServerConsole")]
         void TellMessageToServerConsole(UILogItem li);
-        [OperationContract(Name = "TellMessageToServerConsoleUsingString", IsOneWay = true)]
+        [OperationContract(Name = "TellMessageToServerConsoleUsingString")]
         void TellMessageToServerConsole(string Message);
         [OperationContract]
         ClientBuilder RegisterClient();
@@ -35,5 +35,7 @@ public interface IRemoteClient : IClient
         void SendSignal(SignalMessage signal);
         [OperationContract(IsOneWay = true)]
         void ChangePrompt(PromptBuilder newPrompt);
+        [OperationContract]
+        PromptBuilder GetCurrentPrompt();
     }
 }
diff --git a/src/RemotePlusServer/Commands.cs b/src/RemotePlusServer/Commands.cs
@@ -531,5 +531,34 @@ public static CommandResponse deleteFile(CommandRequest args, CommandPipeline pi
                 return new CommandResponse((int)CommandStatus.Success);
             }
         }
+        [CommandHelp("Reads the specified file and prints the contents to the screen.")]
+        public static CommandResponse echoFile(CommandRequest args, CommandPipeline pipe)
+        {
+            if(File.Exists(args.Arguments[1].Value))
+            {
+                DefaultService.Remote.Client.ClientCallback.TellMessageToServerConsole(File.ReadAllText(args.Arguments[1].Value));
+                return new CommandResponse((int)CommandStatus.Success);
+            }
+            else
+            {
+                DefaultService.Remote.Client.ClientCallback.TellMessageToServerConsole(new UILogItem(OutputLevel.Error, "The file does not exist."));
+                return new CommandResponse((int)CommandStatus.Fail);
+            }
+        }
+        [CommandHelp("Lists all the files and directories in the current directory.")]
+        public static CommandResponse ls(CommandRequest args, CommandPipeline pipe)
+        {
+            StringBuilder builder = new StringBuilder();
+            foreach(string file in Directory.GetFiles(DefaultService.Remote.CurrentPath))
+            {
+                builder.Append(Path.GetFileName(file) + " ");
+            }
+            foreach (string directory in Directory.GetDirectories(DefaultService.Remote.CurrentPath))
+            {
+                builder.Append(Path.GetDirectoryName(directory) + " ");
+            }
+            DefaultService.Remote.Client.ClientCallback.TellMessageToServerConsole(builder.ToString());
+            return new CommandResponse((int)CommandStatus.Success);
+        }
     }
 }
diff --git a/src/RemotePlusServer/Program.cs b/src/RemotePlusServer/Program.cs
@@ -193,6 +193,8 @@ private static void InitializeCommands()
             DefaultService.Commands.Add("load-extensionLibrary", loadExtensionLibrary);
             DefaultService.Commands.Add("cp", cp);
             DefaultService.Commands.Add("deleteFile", deleteFile);
+            DefaultService.Commands.Add("echoFile", echoFile);
+            DefaultService.Commands.Add("ls", ls);
         }
 
         static bool CheckPrerequisites()

diff --git a/src/RemotePlusServer/RemotePlusServer.csproj b/src/RemotePlusServer/RemotePlusServer.csproj
@@ -165,7 +165,9 @@
       <DependentUpon>ServerControls.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>