Merge pull request #11 from Microsoft/cleanup

Cleanup xxhash references and a few other minor cleanup items.

Author: gfs

Gui/Views/Home/Analyze.cshtml

@@ -1,10 +1,12 @@
 @using AttackSurfaceAnalyzer.ObjectTypes
 @using System.IO
 @model AttackSurfaceAnalyzer.Models.DataRunListModel
+
 @{
     var runList = new SelectList(Model.Runs, "Key", "Text");
     var monitorRunList = new SelectList(Model.MonitorRuns, "Key", "Text");
 }
+
 <link rel="stylesheet" href="~/css/Results.css" asp-append-version="true" />
 
 <br />
@@ -55,7 +57,7 @@
         else
         {
             <div class="explain card card-body warning">
-                        You must collect some results before performing analysis.
+                You must collect some results before performing analysis.
             </div>
         }
     }
@@ -323,6 +325,6 @@
         <tbody id="FileMonitorResultsTableBody"></tbody>
     </table>
 </div>
-    @section Scripts{
-        <script type="text/javascript" src="~/js/Analyze.js" asp-append-version="true"></script> @* Visual Studio insists that scripts have a separate closing tag rather than an inclusive /> tag*@
-    }
+@section Scripts{
+    <script type="text/javascript" src="~/js/Analyze.js" asp-append-version="true"></script> @* Visual Studio insists that scripts have a separate closing tag rather than an inclusive /> tag*@
+}

Gui/wwwroot/js/Collect.js

@@ -1,4 +1,6 @@
-$('#CollectLink').addClass('active');
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+$('#CollectLink').addClass('active');
 
 EnableCollectionFields();
 $("#StartCollectionButton").click(StartCollection);
@@ -218,4 +220,4 @@ function EnableCollectionFields() {
             second: '2-digit'
         }));
     }
-}
+}

Lib/AttackSurfaceAnalyzerLib.csproj

@@ -38,8 +38,12 @@ This NuGet contains the AttackSurfaceAnalyzer Library, which is used by the CLI
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="6.2.0-preview.4" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.0-preview.4" />
+    <PackageReference Include="docfx.console" Version="2.41.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="6.2.0" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0-preview.19073.11" />
     <PackageReference Include="murmurhash" Version="1.0.3" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.4.0" />
@@ -53,7 +57,7 @@ This NuGet contains the AttackSurfaceAnalyzer Library, which is used by the CLI
     <PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview.19073.11" />
     <PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview.19073.11" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NLog" Version="4.6.0-rc1" />
+    <PackageReference Include="NLog" Version="4.6.1" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.3" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="NuGet.Build.Packaging" Version="0.2.2">

Lib/Collectors/FileSystem/FileSystemCollector.cs

@@ -14,7 +14,7 @@
 namespace AttackSurfaceAnalyzer.Collectors.FileSystem
 {
     /// <summary>
-    /// Collects metadata from the local file system.
+    /// Collects Filesystem Data from the local file system.
     /// </summary>
     public class FileSystemCollector : BaseCollector
     {

Lib/Collectors/FileSystem/FileSystemUtils.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 using System;
 using System.Collections.Generic;
-using System.Data.HashFunction.xxHash;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;

Lib/Collectors/FileSystem/WindowsFileSystemUtils.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 using System;
-using System.Data.HashFunction.xxHash;
 using System.IO;
 using System.Security.AccessControl;
 using AttackSurfaceAnalyzer.Utils;
@@ -53,25 +52,5 @@ protected internal static string GetFilePermissions(FileSystemInfo fileInfo)
             else
                 return null;
         }
-
-        protected internal static string GetFileHash(FileSystemInfo fileInfo)
-        {
-            Logger.Instance.Info(fileInfo.FullName);
-
-            string hashValue = null;
-            try
-            {
-                var hashFunction = xxHashFactory.Instance.Create();
-                using (var stream = new FileStream(fileInfo.FullName, FileMode.Open, FileAccess.Read))
-                {
-                    hashValue = hashFunction.ComputeHash(stream).AsBase64String();
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.Instance.Warn("Unable to take hash of file: {0}: {1}", fileInfo.FullName, ex.Message);
-            }
-            return hashValue;
-        }
     }
 }

Lib/Utils/CryptoHelpers.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 using System;
-using System.Data.HashFunction.xxHash;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;