Adds browsing variables to windows client

sei-dupdyke · sei-dupdyke · commit 01aa57495849 · 2022-06-21T18:42:28.000-04:00
diff --git a/src/Ghosts.Client/Ghosts.Client.csproj b/src/Ghosts.Client/Ghosts.Client.csproj
@@ -549,7 +549,6 @@
     <Compile Include="Handlers\BrowserCrawl.cs" />
     <Compile Include="Handlers\Print.cs" />
     <Compile Include="Infrastructure\Browser\ExtendedConfiguration.cs" />
-    <Compile Include="Infrastructure\Browser\RequestConfiguration.cs" />
     <Compile Include="Infrastructure\DebugManager.cs" />
     <Compile Include="Infrastructure\GuestInfoVars.cs" />
     <Compile Include="Infrastructure\CommandLineFlagManager.cs" />
diff --git a/src/Ghosts.Client/Handlers/BaseBrowserHandler.cs b/src/Ghosts.Client/Handlers/BaseBrowserHandler.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Ghosts.Client.Infrastructure.Browser;
 using Ghosts.Domain;
 using Ghosts.Domain.Code;
 using Ghosts.Domain.Code.Helpers;
@@ -53,7 +52,7 @@ public void ExecuteEvents(TimelineHandler handler)
                             var taskMax = 1;
                             if (handler.HandlerArgs.ContainsKey("crawl-tasks-maximum"))
                             {
-                                int.TryParse(handler.HandlerArgs["crawl-tasks-maximum"], out taskMax);
+                                int.TryParse(handler.HandlerArgs["crawl-tasks-maximum"].ToString(), out taskMax);
                             }
 
                             var i = 0;
@@ -75,19 +74,19 @@ public void ExecuteEvents(TimelineHandler handler)
                             // setup
                             if (handler.HandlerArgs.ContainsKey("stickiness"))
                             {
-                                int.TryParse(handler.HandlerArgs["stickiness"], out _stickiness);
+                                int.TryParse(handler.HandlerArgs["stickiness"].ToString(), out _stickiness);
                             }
                             if (handler.HandlerArgs.ContainsKey("stickiness-depth-min"))
                             {
-                                int.TryParse(handler.HandlerArgs["stickiness-depth-min"], out _depthMin);
+                                int.TryParse(handler.HandlerArgs["stickiness-depth-min"].ToString(), out _depthMin);
                             }
                             if (handler.HandlerArgs.ContainsKey("stickiness-depth-max"))
                             {
-                                int.TryParse(handler.HandlerArgs["stickiness-depth-max"], out _depthMax);
+                                int.TryParse(handler.HandlerArgs["stickiness-depth-max"].ToString(), out _depthMax);
                             }
                             if (handler.HandlerArgs.ContainsKey("visited-remember"))
                             {
-                                int.TryParse(handler.HandlerArgs["visited-remember"], out _visitedRemember);
+                                int.TryParse(handler.HandlerArgs["visited-remember"].ToString(), out _visitedRemember);
                             }
 
                             this._linkManager = new LinkManager(_visitedRemember);
@@ -99,7 +98,7 @@ public void ExecuteEvents(TimelineHandler handler)
                                     throw new Exception("Browser window handle not available");
                                 }
 
-                                config = RequestConfiguration.Load(timelineEvent.CommandArgs[_random.Next(0, timelineEvent.CommandArgs.Count)]);
+                                config = RequestConfiguration.Load(handler, timelineEvent.CommandArgs[_random.Next(0, timelineEvent.CommandArgs.Count)]);
                                 if (config.Uri.IsWellFormedOriginalString())
                                 {
                                     this._linkManager.SetCurrent(config.Uri);
@@ -145,7 +144,7 @@ public void ExecuteEvents(TimelineHandler handler)
                                 Thread.Sleep(timelineEvent.DelayAfter);
                             }
                         case "browse":
-                            config = RequestConfiguration.Load(timelineEvent.CommandArgs[0]);
+                            config = RequestConfiguration.Load(handler, timelineEvent.CommandArgs[0]);
                             if (config.Uri.IsWellFormedOriginalString())
                             {
                                 MakeRequest(config);
diff --git a/src/Ghosts.Client/Handlers/BrowserChrome.cs b/src/Ghosts.Client/Handlers/BrowserChrome.cs
@@ -80,9 +80,9 @@ internal static IWebDriver GetDriver(TimelineHandler handler)
             if (handler.HandlerArgs != null)
             {
                 if (handler.HandlerArgs.ContainsKey("executable-location") &&
-                    !string.IsNullOrEmpty(handler.HandlerArgs["executable-location"]))
+                    !string.IsNullOrEmpty(handler.HandlerArgs["executable-location"].ToString()))
                 {
-                    options.BinaryLocation = handler.HandlerArgs["executable-location"];
+                    options.BinaryLocation = handler.HandlerArgs["executable-location"].ToString();
                 }
 
                 if (handler.HandlerArgs.ContainsKeyWithOption("isheadless", "true"))
diff --git a/src/Ghosts.Client/Handlers/BrowserCrawl.cs b/src/Ghosts.Client/Handlers/BrowserCrawl.cs
@@ -38,21 +38,21 @@ internal Task Crawl(TimelineHandler handler, TimelineEvent timelineEvent, string
 
             if (handler.HandlerArgs.ContainsKey("stickiness"))
             {
-                int.TryParse(handler.HandlerArgs["stickiness"], out _stickiness);
+                int.TryParse(handler.HandlerArgs["stickiness"].ToString(), out _stickiness);
             }
 
             if (handler.HandlerArgs.ContainsKey("crawl-site-depth"))
             {
-                int.TryParse(handler.HandlerArgs["crawl-site-depth"], out _siteDepthMax);
+                int.TryParse(handler.HandlerArgs["crawl-site-depth"].ToString(), out _siteDepthMax);
             }
 
             if (handler.HandlerArgs.ContainsKey("crawl-proxy-local-url"))
             {
-                _proxyLocalUrl = handler.HandlerArgs["crawl-proxy-local-url"];
+                _proxyLocalUrl = handler.HandlerArgs["crawl-proxy-local-url"].ToString();
             }
 
             this._pageBrowseCount = 0;
-            var config = RequestConfiguration.Load(site);
+            var config = RequestConfiguration.Load(handler, site);
             this._linkManager = new LinkManager(0);
             if (config.Uri.IsWellFormedOriginalString())
             {
diff --git a/src/Ghosts.Client/Infrastructure/Browser/RequestConfiguration.cs b/src/Ghosts.Client/Infrastructure/Browser/RequestConfiguration.cs
diff --git a/src/Ghosts.Client/config/timeline.json b/src/Ghosts.Client/config/timeline.json
@@ -145,7 +145,13 @@
         "stickiness-depth-max": "15",
         "incognito": "true",
         "javascript-enable": "true",
-        "visited-remember": "10"
+        "visited-remember": "10",
+        "url-replace": [
+          { "verb": [ "order", "enable", "engage" ] },
+          { "group": [ "operations", "logistics", "medical" ] },
+          { "org": [ "army", "command", "brigade", "battalion" ] },
+          { "type": [ "document", "doc", "files", "vault", "filevault" ] }
+        ]
       },
       "Initial": "about:blank",
       "UtcTimeOn": "00:00:00",
@@ -155,6 +161,7 @@
         {
           "Command": "random",
           "CommandArgs": [
+            "http://craigslist.org/{org}/{group}/{uuid}/{verb}/{type}/{n}?{c}={now}",
             "http://www.ceoexpress.com",
             "http://wikipedia.org",
             "http://ebay.com",

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Threading;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using Ghosts.Client.Infrastructure.Browser;`
`7`	`6`	`using Ghosts.Domain;`
`8`	`7`	`using Ghosts.Domain.Code;`
`9`	`8`	`using Ghosts.Domain.Code.Helpers;`
`@@ -53,7 +52,7 @@ public void ExecuteEvents(TimelineHandler handler)`
`53`	`52`	`var taskMax = 1;`
`54`	`53`	`if (handler.HandlerArgs.ContainsKey("crawl-tasks-maximum"))`
`55`	`54`	`{`
`56`		`- int.TryParse(handler.HandlerArgs["crawl-tasks-maximum"], out taskMax);`
	`55`	`+ int.TryParse(handler.HandlerArgs["crawl-tasks-maximum"].ToString(), out taskMax);`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`var i = 0;`
`@@ -75,19 +74,19 @@ public void ExecuteEvents(TimelineHandler handler)`
`75`	`74`	`// setup`
`76`	`75`	`if (handler.HandlerArgs.ContainsKey("stickiness"))`
`77`	`76`	`{`
`78`		`- int.TryParse(handler.HandlerArgs["stickiness"], out _stickiness);`
	`77`	`+ int.TryParse(handler.HandlerArgs["stickiness"].ToString(), out _stickiness);`
`79`	`78`	`}`
`80`	`79`	`if (handler.HandlerArgs.ContainsKey("stickiness-depth-min"))`
`81`	`80`	`{`
`82`		`- int.TryParse(handler.HandlerArgs["stickiness-depth-min"], out _depthMin);`
	`81`	`+ int.TryParse(handler.HandlerArgs["stickiness-depth-min"].ToString(), out _depthMin);`
`83`	`82`	`}`
`84`	`83`	`if (handler.HandlerArgs.ContainsKey("stickiness-depth-max"))`
`85`	`84`	`{`
`86`		`- int.TryParse(handler.HandlerArgs["stickiness-depth-max"], out _depthMax);`
	`85`	`+ int.TryParse(handler.HandlerArgs["stickiness-depth-max"].ToString(), out _depthMax);`
`87`	`86`	`}`
`88`	`87`	`if (handler.HandlerArgs.ContainsKey("visited-remember"))`
`89`	`88`	`{`
`90`		`- int.TryParse(handler.HandlerArgs["visited-remember"], out _visitedRemember);`
	`89`	`+ int.TryParse(handler.HandlerArgs["visited-remember"].ToString(), out _visitedRemember);`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`this._linkManager = new LinkManager(_visitedRemember);`
`@@ -99,7 +98,7 @@ public void ExecuteEvents(TimelineHandler handler)`
`99`	`98`	`throw new Exception("Browser window handle not available");`
`100`	`99`	`}`
`101`	`100`
`102`		`- config = RequestConfiguration.Load(timelineEvent.CommandArgs[_random.Next(0, timelineEvent.CommandArgs.Count)]);`
	`101`	`+ config = RequestConfiguration.Load(handler, timelineEvent.CommandArgs[_random.Next(0, timelineEvent.CommandArgs.Count)]);`
`103`	`102`	`if (config.Uri.IsWellFormedOriginalString())`
`104`	`103`	`{`
`105`	`104`	`this._linkManager.SetCurrent(config.Uri);`
`@@ -145,7 +144,7 @@ public void ExecuteEvents(TimelineHandler handler)`
`145`	`144`	`Thread.Sleep(timelineEvent.DelayAfter);`
`146`	`145`	`}`
`147`	`146`	`case "browse":`
`148`		`- config = RequestConfiguration.Load(timelineEvent.CommandArgs[0]);`
	`147`	`+ config = RequestConfiguration.Load(handler, timelineEvent.CommandArgs[0]);`
`149`	`148`	`if (config.Uri.IsWellFormedOriginalString())`
`150`	`149`	`{`
`151`	`150`	`MakeRequest(config);`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ internal static IWebDriver GetDriver(TimelineHandler handler)`
`80`	`80`	`if (handler.HandlerArgs != null)`
`81`	`81`	`{`
`82`	`82`	`if (handler.HandlerArgs.ContainsKey("executable-location") &&`
`83`		`- !string.IsNullOrEmpty(handler.HandlerArgs["executable-location"]))`
	`83`	`+ !string.IsNullOrEmpty(handler.HandlerArgs["executable-location"].ToString()))`
`84`	`84`	`{`
`85`		`- options.BinaryLocation = handler.HandlerArgs["executable-location"];`
	`85`	`+ options.BinaryLocation = handler.HandlerArgs["executable-location"].ToString();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if (handler.HandlerArgs.ContainsKeyWithOption("isheadless", "true"))`
Original file line number	Diff line number	Diff line change
`@@ -38,21 +38,21 @@ internal Task Crawl(TimelineHandler handler, TimelineEvent timelineEvent, string`
`38`	`38`
`39`	`39`	`if (handler.HandlerArgs.ContainsKey("stickiness"))`
`40`	`40`	`{`
`41`		`- int.TryParse(handler.HandlerArgs["stickiness"], out _stickiness);`
	`41`	`+ int.TryParse(handler.HandlerArgs["stickiness"].ToString(), out _stickiness);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (handler.HandlerArgs.ContainsKey("crawl-site-depth"))`
`45`	`45`	`{`
`46`		`- int.TryParse(handler.HandlerArgs["crawl-site-depth"], out _siteDepthMax);`
	`46`	`+ int.TryParse(handler.HandlerArgs["crawl-site-depth"].ToString(), out _siteDepthMax);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (handler.HandlerArgs.ContainsKey("crawl-proxy-local-url"))`
`50`	`50`	`{`
`51`		`- _proxyLocalUrl = handler.HandlerArgs["crawl-proxy-local-url"];`
	`51`	`+ _proxyLocalUrl = handler.HandlerArgs["crawl-proxy-local-url"].ToString();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`this._pageBrowseCount = 0;`
`55`		`- var config = RequestConfiguration.Load(site);`
	`55`	`+ var config = RequestConfiguration.Load(handler, site);`
`56`	`56`	`this._linkManager = new LinkManager(0);`
`57`	`57`	`if (config.Uri.IsWellFormedOriginalString())`
`58`	`58`	`{`