Merge pull request #368 from cmu-sei/v8

V8
cmu-sei · Jun 14, 2024 · 8abf78c · 8abf78c
2 parents e2373d8 + 351ba12
commit 8abf78c
Show file tree

Hide file tree

Showing 19 changed files with 690 additions and 122 deletions.
diff --git a/src/Ghosts.Client/Ghosts.Client.csproj b/src/Ghosts.Client/Ghosts.Client.csproj
@@ -162,7 +162,8 @@
     <Compile Include="Comms\ClientSocket\BackgroundTaskQueue.cs" />
     <Compile Include="Comms\ClientSocket\ClientSocketConnection.cs" />
     <Compile Include="Comms\ClientSocket\QueueEntry.cs" />
-    <Compile Include="Handlers\AwsCli.cs" />
+    <Compile Include="Handlers\Aws.cs" />
+    <Compile Include="Handlers\Azure.cs" />
     <Compile Include="Handlers\BaseBrowserHandler.cs" />
     <Compile Include="Handlers\BlogHelper.cs" />
     <Compile Include="Handlers\BlogHelperDrupal.cs" />
@@ -280,6 +281,9 @@
     <None Include="kill-ghosts.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Sample Timelines\Aws.json" />
+    <None Include="Sample Timelines\Browser Crawl.json" />
+    <None Include="Sample Timelines\Browser upload.json" />
     <None Include="Sample Timelines\BrowserFirefoxSocial.json" />
     <None Include="Sample Timelines\Cron.json" />
     <None Include="Sample Timelines\Administrative Commands.json" />
@@ -301,6 +305,7 @@
     <Compile Include="TimelineManager\Orchestrator.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="Sample Timelines\NpcSystem.json" />
     <None Include="Sample Timelines\outlook.json" />
     <None Include="Sample Timelines\Outlookv2.json" />
     <None Include="Sample Timelines\Pidgin.json" />

diff --git a/src/Ghosts.Client/Handlers/Aws.cs b/src/Ghosts.Client/Handlers/Aws.cs
@@ -0,0 +1,116 @@
+// Copyright 2017 Carnegie Mellon University. All Rights Reserved. See LICENSE.md file for terms.
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Ghosts.Domain;
+using Ghosts.Domain.Code;
+using Ghosts.Domain.Code.Helpers;
+
+namespace Ghosts.Client.Handlers
+{
+    public class Aws : BaseHandler
+    {
+        private string Result { get; set; }
+        private readonly TimelineHandler _handler;
+
+        public Aws(TimelineHandler handler)
+        {
+            _handler = handler;
+
+            try
+            {
+                if (_handler.Loop)
+                {
+                    while (true)
+                    {
+                        Ex();
+                    }
+                }
+
+                Ex();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
+
+        private void Ex()
+        {
+            var handlerArgs = BuildHandlerArgVariables.BuildHandlerArgs(_handler);
+            foreach (var timelineEvent in _handler.TimeLineEvents)
+            {
+                WorkingHours.Is(_handler);
+
+                if (timelineEvent.DelayBeforeActual > 0)
+                    Thread.Sleep(timelineEvent.DelayBeforeActual);
+
+                switch (timelineEvent.Command)
+                {
+                    default:
+                        foreach (var cmdObj in timelineEvent.CommandArgs)
+                        {
+                            var cmd = cmdObj?.ToString();
+                            if (!string.IsNullOrEmpty(cmd))
+                            {
+                                cmd = BuildHandlerArgVariables.ReplaceCommandVariables(cmd, handlerArgs);
+                                this.Command(cmd);
+                            }
+                        }
+
+                        break;
+                }
+                if (timelineEvent.DelayAfterActual <= 0) continue;
+                Thread.Sleep(timelineEvent.DelayAfterActual);
+            }
+        }
+
+        private void Command(string command)
+        {
+            this.Result = string.Empty;
+
+            command = $"{command} --no-verify";
+
+            try
+            {
+                var p = new Process
+                {
+                    EnableRaisingEvents = false,
+                    StartInfo =
+                    {
+                        FileName = "aws",
+                        Arguments = command,
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true
+                    }
+                };
+                p.Start();
+
+                while (!p.StandardOutput.EndOfStream)
+                {
+                    this.Result += p.StandardOutput.ReadToEnd();
+                }
+
+                var err = string.Empty;
+                while (!p.StandardError.EndOfStream)
+                { 
+                    err += p.StandardError.ReadToEnd();
+                }
+                err = err.RemoveTextBetweenMarkers("urllib3/connectionpool", "#ssl-warnings");
+                if (err.Length > 0)
+                {
+                    Log.Error($"{err} on {command}");
+                }
+
+                Report(new ReportItem {Handler = HandlerType.Aws.ToString(), Command = command, Result = this.Result});
+            }
+            catch (Exception exc)
+            {
+                Log.Debug(exc);
+            }
+        }
+    }
+}
diff --git a/src/Ghosts.Client/Handlers/AwsCli.cs b/src/Ghosts.Client/Handlers/AwsCli.cs
diff --git a/src/Ghosts.Client/Handlers/Azure.cs b/src/Ghosts.Client/Handlers/Azure.cs
@@ -0,0 +1,112 @@
+// Copyright 2017 Carnegie Mellon University. All Rights Reserved. See LICENSE.md file for terms.
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Ghosts.Domain;
+using Ghosts.Domain.Code;
+
+namespace Ghosts.Client.Handlers
+{
+    public class Azure : BaseHandler
+    {
+        private string Result { get; set; }
+        private readonly TimelineHandler _handler;
+
+        public Azure(TimelineHandler handler)
+        {
+            _handler = handler;
+
+            try
+            {
+                if (_handler.Loop)
+                {
+                    while (true)
+                    {
+                        Ex();
+                    }
+                }
+
+                Ex();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
+
+        private void Ex()
+        {
+            var handlerArgs = BuildHandlerArgVariables.BuildHandlerArgs(_handler);
+            foreach (var timelineEvent in _handler.TimeLineEvents)
+            {
+                WorkingHours.Is(_handler);
+
+                if (timelineEvent.DelayBeforeActual > 0)
+                    Thread.Sleep(timelineEvent.DelayBeforeActual);
+
+                switch (timelineEvent.Command)
+                {
+                    default:
+                        foreach (var cmdObj in timelineEvent.CommandArgs)
+                        {
+                            var cmd = cmdObj?.ToString();
+                            if (!string.IsNullOrEmpty(cmd))
+                            {
+                                cmd = BuildHandlerArgVariables.ReplaceCommandVariables(cmd, handlerArgs);
+                                this.Command(cmd);
+                            }
+                        }
+
+                        break;
+                }
+                if (timelineEvent.DelayAfterActual <= 0) continue;
+                Thread.Sleep(timelineEvent.DelayAfterActual);
+            }
+        }
+
+        private void Command(string command)
+        {
+            this.Result = string.Empty;
+
+            try
+            {
+                var p = new Process
+                {
+                    EnableRaisingEvents = false,
+                    StartInfo =
+                    {
+                        FileName = "az",
+                        Arguments = command,
+                        UseShellExecute = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        CreateNoWindow = true
+                    }
+                };
+                p.Start();
+
+                while (!p.StandardOutput.EndOfStream)
+                {
+                    this.Result += p.StandardOutput.ReadToEnd();
+                }
+
+                var err = string.Empty;
+                while (!p.StandardError.EndOfStream)
+                { 
+                    err += p.StandardError.ReadToEnd();
+                }
+                if (err.Length > 0)
+                {
+                    Log.Error($"{err} on {command}");
+                }
+
+                Report(new ReportItem {Handler = HandlerType.Azure.ToString(), Command = command, Result = this.Result});
+            }
+            catch (Exception exc)
+            {
+                Log.Debug(exc);
+            }
+        }
+    }
+}
diff --git a/src/Ghosts.Client/Health/Check.cs b/src/Ghosts.Client/Health/Check.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using Ghosts.Client.Infrastructure;
 using Ghosts.Domain;
 using Ghosts.Domain.Code;
 using Newtonsoft.Json;
@@ -29,7 +28,7 @@ public Check()
     public void Run()
     {
         // now watch that file for changes
-        _watcher = new FileSystemWatcher(ApplicationDetails.ConfigurationFiles.Path);
+        _watcher = new FileSystemWatcher(ApplicationDetails.ConfigurationFiles.InstallPath);
         _watcher.Filter = Path.GetFileName(ApplicationDetails.ConfigurationFiles.Health);
         _log.Trace($"watching {_watcher.Path}");
         _watcher.NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.FileName | NotifyFilters.Size;

diff --git a/src/Ghosts.Client/Properties/AssemblyInfo.cs b/src/Ghosts.Client/Properties/AssemblyInfo.cs
@@ -34,4 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("8.0.0.0")]
 [assembly: AssemblyInformationalVersion("8.0.0.0")]
-[assembly: AssemblyFileVersion("8.0.51.50")]
+[assembly: AssemblyFileVersion("8.1.0.0")]