Linux client implementation of 'in office' timeblocks

cmu-sei · Nov 16, 2023 · f69ccd5 · f69ccd5
1 parent f11c175
commit f69ccd5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 73 deletions.
diff --git a/src/Ghosts.Domain/Code/WorkingHours.cs b/src/Ghosts.Domain/Code/WorkingHours.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using System.Threading;
+using Ghosts.Domain.Code.Helpers;
 using NLog;
 
 namespace Ghosts.Domain.Code
@@ -98,6 +99,7 @@ private static void Sleep(TimelineHandler handler, int msToSleep)
 
         private static void Sleep(TimelineHandler handler, TimeSpan sleep)
         {
+            // TODO: We need a way to kill this handler like handler.SafeKill();
             Sleep(handler, (int)sleep.TotalMilliseconds);
         }
     }

diff --git a/src/ghosts.client.linux/Handlers/Sftp.cs b/src/ghosts.client.linux/Handlers/Sftp.cs
@@ -6,7 +6,6 @@
 using Ghosts.Domain;
 using Newtonsoft.Json;
 using Ghosts.Domain.Code;
-using WorkingHours = ghosts.client.linux.Infrastructure.WorkingHours;
 
 namespace ghosts.client.linux.handlers
 {

diff --git a/src/ghosts.client.linux/Handlers/Ssh.cs b/src/ghosts.client.linux/Handlers/Ssh.cs
@@ -6,7 +6,6 @@
 using Ghosts.Domain;
 using Newtonsoft.Json;
 using Ghosts.Domain.Code;
-using WorkingHours = ghosts.client.linux.Infrastructure.WorkingHours;
 
 /*
  * Used Package Renci.sshNet
@@ -28,7 +27,6 @@ namespace ghosts.client.linux.handlers
     /// </summary>
     public class Ssh : BaseHandler
     {
-
         private Credentials CurrentCreds = null;
         private SshSupport CurrentSshSupport = null;   //current SshSupport for this object
         public int jitterfactor = 0;
@@ -216,11 +214,5 @@ public void Command(TimelineHandler handler, TimelineEvent timelineEvent, string
             }
 
         }
-
-
-
-
-
     }
-
 }
diff --git a/src/ghosts.client.linux/Infrastructure/WorkingHours.cs b/src/ghosts.client.linux/Infrastructure/WorkingHours.cs
diff --git a/src/ghosts.client.linux/config/timeline.json b/src/ghosts.client.linux/config/timeline.json
@@ -19,6 +19,7 @@
       "Initial": "about:blank",
       "UtcTimeOn": "00:00:00",
       "UtcTimeOff": "24:00:00",
+      "UtcTimeBlocks": [ "14:00:00", "17:00:00", "18:00:00", "22:00:00" ],
       "Loop": "True",
       "TimeLineEvents": [
         {

diff --git a/src/ghosts.client.linux/ghosts.client.linux.csproj b/src/ghosts.client.linux/ghosts.client.linux.csproj
@@ -4,10 +4,11 @@
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win7-x64;ubuntu.16.10-x64;osx.10.12-x64</RuntimeIdentifiers>
 
-    <Version>7.0.0.0</Version>
-    <AssemblyVersion>7.0.0.0</AssemblyVersion>
-    <ReleaseVersion>7.0.0.0</ReleaseVersion>
-    <FileVersion>7.0.236.0</FileVersion>
+    <Version>7.1.0.0</Version>
+    <AssemblyVersion>7.1.0.0</AssemblyVersion>
+    <ReleaseVersion>7.1.0.0</ReleaseVersion>
+    <FileVersion>7.1.0.0</FileVersion>
+
     <SynchReleaseVersion>false</SynchReleaseVersion>
 
     <Authors>Dustin Updyke for Carnegie Mellon University</Authors>