Merge pull request #374 from ION28/develop

Release v0.5.0 DEFCON release

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: BLUESPAWN client build
+name: BLUESPAWN-win-client build
 
 on:
   push:
@@ -20,27 +20,25 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup NuGet.exe
-      uses: warrenbuckley/Setup-Nuget@v1
+    - uses: actions/checkout@main
 
     - name: Update submodules
       run: git submodule update --init --recursive
 
-    - name: Install vcpkg
+    - name: Restore from cache, and install vcpkg and project dependencies
+      uses: lukka/run-vcpkg@v3
+      with:
+        vcpkgArguments: '@../vcpkg_response_file.txt'
+        vcpkgDirectory: 'vcpkg'
+        appendedCacheKey: ${{ hashFiles(env.vcpkgResponseFile) }}
+
+    - name: Integrate vcpkg packages
       shell: powershell
       run: |
         cd vcpkg
-        .\bootstrap-vcpkg.bat
-        .\vcpkg.exe install yara:${{ matrix.buildarch }}-windows-static
-        .\vcpkg.exe install libzip:${{ matrix.buildarch }}-windows-static
         .\vcpkg.exe integrate install
         cd ..
 
-    - name: Download NuGet packages
-      run: nuget restore BLUESPAWN.sln
-
     - name: Build BLUESPAWN-client
       run: |
         "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" BLUESPAWN.sln /p:Configuration=${{ matrix.buildtype }} /p:Platform=${{ matrix.buildarch }}
@@ -59,7 +57,7 @@ jobs:
       shell: powershell
 
     - name: Run BLUESPAWN Hunt
-      run: artifacts\${{ matrix.buildarch }}\${{ matrix.buildtype }}\BLUESPAWN-client.exe --hunt -l Normal --log=xml --reaction=log
+      run: artifacts\${{ matrix.buildarch }}\${{ matrix.buildtype }}\BLUESPAWN-client.exe --hunt -a Normal --log=xml
       shell: cmd
 
     - name: Rename BLUESPAWN XML output file
@@ -70,17 +68,17 @@ jobs:
       run: testing\run-hunt-results-comparison.ps1
       shell: powershell
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@main
       with:
         name: BLUESPAWN-client-${{ matrix.buildarch }}-${{ matrix.buildtype }}
         path: artifacts\${{ matrix.buildarch }}\${{ matrix.buildtype }}\BLUESPAWN-client.exe
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@main
       with:
         name: AtomicTestsResults-${{ matrix.buildarch }}-${{ matrix.buildtype }}.csv
         path: AtomicTestsResults.csv
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@main
       with:
         name: BLUESPAWNHuntResults-${{ matrix.buildarch }}-${{ matrix.buildtype }}.xml
         path: BLUESPAWNHuntResults.xml

.gitignore

@@ -1,19 +1,22 @@
+# General
 .vs/
 build/
 artifacts/
 packages/
 vcpkg/
-BLUESPAWN-client/external/
-BLUESPAWN-client/resources/severe
-BLUESPAWN-client/resources/severe2
-BLUESPAWN-client/resources/indicators
 *.user
 *.filters
 *.cache
 *.bak
 *.lib
 *.aps
 
+# BLUESPAWN-win-client
+BLUESPAWN-win-client/external/
+BLUESPAWN-win-client/resources/severe
+BLUESPAWN-win-client/resources/severe2
+BLUESPAWN-win-client/resources/indicators
+
 # BLUESPAWN Project Site - docs/
 *.lock
 docs/db.sqlite3

.gitmodules

@@ -1,24 +1,15 @@
-[submodule "BLUESPAWN-client/external/cxxopts"]
-	path = BLUESPAWN-client/external/cxxopts
-	url = https://github.com/jarro2783/cxxopts
-[submodule "BLUESPAWN-client/external/krabsetw"]
-	path = BLUESPAWN-client/external/krabsetw
-	url = https://github.com/microsoft/krabsetw
-[submodule "BLUESPAWN-client/external/pe-sieve"]
-	path = BLUESPAWN-client/external/pe-sieve
-	url = https://github.com/hasherezade/pe-sieve
-[submodule "BLUESPAWN-client/external/yara"]
-	path = BLUESPAWN-client/external/yara
-	url = https://github.com/VirusTotal/yara
-[submodule "BLUESPAWN-client/external/yara-rules"]
-	path = BLUESPAWN-client/external/yara-rules
-	url = https://github.com/Yara-Rules/rules.git
-[submodule "BLUESPAWN-client/external/tinyxml2"]
-	path = BLUESPAWN-client/external/tinyxml2
-	url = https://github.com/leethomason/tinyxml2
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/Microsoft/vcpkg.git
-[submodule "BLUESPAWN-client/external/signature-base"]
-	path = BLUESPAWN-client/external/signature-base
-	url = https://github.com/Neo23x0/signature-base
+[submodule "BLUESPAWN-win-client/external/pe-sieve"]
+	path = BLUESPAWN-win-client/external/pe-sieve
+	url = https://github.com/Jack-McDowell/pe-sieve
+[submodule "BLUESPAWN-win-client/external/yara-rules"]
+	path = BLUESPAWN-win-client/external/yara-rules
+	url = https://github.com/Jack-McDowell/rules
+[submodule "BLUESPAWN-win-client/external/signature-base"]
+	path = BLUESPAWN-win-client/external/signature-base
+	url = https://github.com/Jack-McDowell/signature-base
+[submodule "BLUESPAWN-win-client/external/tinyxml2"]
+	path = BLUESPAWN-win-client/external/tinyxml2
+	url = https://github.com/Jack-McDowell/tinyxml2