Modify the VersionInfo in the release build to include the version. (V…

…elocidex#3353)
Genio40921 · Mar 19, 2024 · d8dc376 · d8dc376
1 parent 2a46b27
commit d8dc376
Show file tree

Hide file tree

Showing 12 changed files with 216 additions and 59 deletions.
diff --git a/artifacts/definitions/Server/Internal/ToolDependencies.yaml b/artifacts/definitions/Server/Internal/ToolDependencies.yaml
@@ -7,17 +7,17 @@ description: |
 
 tools:
   - name: VelociraptorWindows
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-v0.72-rc1-windows-amd64.exe
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-v0.72-rc1-windows-amd64.exe
     serve_locally: true
     version: 0.72-rc1
 
   - name: VelociraptorWindows_x86
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-v0.72-rc1-windows-386.exe
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-v0.72-rc1-windows-386.exe
     serve_locally: true
     version: 0.72-rc1
 
   - name: VelociraptorLinux
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-v0.72-rc1-linux-amd64-musl
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-v0.72-rc1-linux-amd64-musl
     serve_locally: true
     version: 0.72-rc1
 
@@ -27,15 +27,15 @@ tools:
 
   # A Generic collector to be used with the --embedded_config flag.
   - name: VelociraptorCollector
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-collector
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-collector
     serve_locally: true
 
   - name: VelociraptorWindowsMSI
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-v0.72-rc1-windows-amd64.msi
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-v0.72-rc1-windows-amd64.msi
     serve_locally: true
     version: 0.72-rc1
 
   - name: VelociraptorWindows_x86MSI
-    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72.0/velociraptor-v0.72-rc1-windows-386.msi
+    url: https://github.com/Velocidex/velociraptor/releases/download/v0.72/velociraptor-v0.72-rc1-windows-386.msi
     serve_locally: true
     version: 0.72-rc1
diff --git a/artifacts/testdata/server/testcases/mft.out.yaml b/artifacts/testdata/server/testcases/mft.out.yaml
@@ -214,39 +214,44 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
      "Id": 0,
      "Inode": "49-16-0",
      "Size": 72,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$FILE_NAME",
      "TypeId": 48,
      "Id": 2,
      "Inode": "49-48-2",
      "Size": 96,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 1,
      "Inode": "49-128-1",
      "Size": 12,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA_INFORMATION",
      "TypeId": 208,
      "Id": 3,
      "Inode": "49-208-3",
      "Size": 8,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA",
      "TypeId": 224,
      "Id": 4,
      "Inode": "49-224-4",
      "Size": 10268,
-     "Name": ""
+     "Name": "",
+     "Resident": false
     }
    ],
    "Hardlinks": [

diff --git a/artifacts/testdata/server/testcases/ntfs_ea.out.yaml b/artifacts/testdata/server/testcases/ntfs_ea.out.yaml
@@ -35,39 +35,44 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
      "Id": 0,
      "Inode": "37-16-0",
      "Size": 72,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$FILE_NAME",
      "TypeId": 48,
      "Id": 2,
      "Inode": "37-48-2",
      "Size": 98,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 1,
      "Inode": "37-128-1",
      "Size": 14,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA_INFORMATION",
      "TypeId": 208,
      "Id": 3,
      "Inode": "37-208-3",
      "Size": 8,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA",
      "TypeId": 224,
      "Id": 4,
      "Inode": "37-224-4",
      "Size": 92,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     }
    ],
    "Hardlinks": [
@@ -88,7 +93,8 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
    "Id": 4,
    "Inode": "37-224-4",
    "Size": 92,
-   "Name": ""
+   "Name": "",
+   "Resident": true
   },
   "_Source": "Windows.NTFS.ExtendedAttributes"
  },
@@ -128,39 +134,44 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
      "Id": 0,
      "Inode": "37-16-0",
      "Size": 72,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$FILE_NAME",
      "TypeId": 48,
      "Id": 2,
      "Inode": "37-48-2",
      "Size": 98,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 1,
      "Inode": "37-128-1",
      "Size": 14,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA_INFORMATION",
      "TypeId": 208,
      "Id": 3,
      "Inode": "37-208-3",
      "Size": 8,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA",
      "TypeId": 224,
      "Id": 4,
      "Inode": "37-224-4",
      "Size": 92,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     }
    ],
    "Hardlinks": [
@@ -181,7 +192,8 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
    "Id": 4,
    "Inode": "37-224-4",
    "Size": 92,
-   "Name": ""
+   "Name": "",
+   "Resident": true
   },
   "_Source": "Windows.NTFS.ExtendedAttributes"
  }
@@ -222,39 +234,44 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
      "Id": 0,
      "Inode": "49-16-0",
      "Size": 72,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$FILE_NAME",
      "TypeId": 48,
      "Id": 2,
      "Inode": "49-48-2",
      "Size": 96,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 1,
      "Inode": "49-128-1",
      "Size": 12,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA_INFORMATION",
      "TypeId": 208,
      "Id": 3,
      "Inode": "49-208-3",
      "Size": 8,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$EA",
      "TypeId": 224,
      "Id": 4,
      "Inode": "49-224-4",
      "Size": 10268,
-     "Name": ""
+     "Name": "",
+     "Resident": false
     }
    ],
    "Hardlinks": [
@@ -275,7 +292,8 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
    "Id": 4,
    "Inode": "49-224-4",
    "Size": 10268,
-   "Name": ""
+   "Name": "",
+   "Resident": false
   },
   "_Source": "Windows.NTFS.ExtendedAttributes"
  }

diff --git a/artifacts/testdata/server/testcases/remapping.out.yaml b/artifacts/testdata/server/testcases/remapping.out.yaml
@@ -127,39 +127,44 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
      "Id": 0,
      "Inode": "46-16-0",
      "Size": 72,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$FILE_NAME",
      "TypeId": 48,
      "Id": 3,
      "Inode": "46-48-3",
      "Size": 124,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$OBJECT_ID",
      "TypeId": 64,
      "Id": 4,
      "Inode": "46-64-4",
      "Size": 16,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 1,
      "Inode": "46-128-1",
      "Size": 12,
-     "Name": ""
+     "Name": "",
+     "Resident": true
     },
     {
      "Type": "$DATA",
      "TypeId": 128,
      "Id": 5,
      "Inode": "46-128-5",
      "Size": 20,
-     "Name": "goodbye.txt"
+     "Name": "goodbye.txt",
+     "Resident": true
     }
    ],
    "Hardlinks": [
@@ -190,9 +195,16 @@ LET _ <= remap(config=format(format=RemappingTemplate, args=[ srcDir+'/artifacts
  }
 ]SELECT * FROM parse_ntfs_ranges(accessor='ntfs', device='c:/$MFT', inode="46-128-5")[
  {
-  "Offset": 0,
+  "Type": "MappedReader",
+  "Level": 0,
+  "FromOffset": 0,
+  "ToOffset": 0,
   "Length": 20,
-  "IsSparse": false
+  "CompressedLength": 0,
+  "IsSparse": false,
+  "ClusterSize": 1,
+  "Reader": "*bytes.Reader",
+  "String": " 0 MappedReader: FileOffset 0 -\u003e DiskOffset 0 (Length 20,  Cluster 1) Delegate *bytes.Reader"
  }
 ]SELECT OSPath FROM glob(accessor='registry', globs="/HKLM/*/xbox*")[
  {

diff --git a/bin/rsrc_windows_386.syso b/bin/rsrc_windows_386.syso
diff --git a/bin/rsrc_windows_amd64.syso b/bin/rsrc_windows_amd64.syso
diff --git a/docs/winres/winres.json b/docs/winres/winres.json
@@ -11,10 +11,10 @@
       "0409": {
         "identity": {
           "name": "",
-          "version": ""
+          "version": "0.72.0.1"
         },
         "description": "Velociraptor: Digging deeper!",
-        "minimum-os": "win7",
+        "minimum-os": "win10",
         "execution-level": "highest",
         "ui-access": false,
         "auto-elevate": false,
@@ -35,22 +35,22 @@
     "#1": {
       "0000": {
         "fixed": {
-          "file_version": "0.0.0.0",
-          "product_version": "0.0.0.0"
+          "file_version": "0.72.0.1",
+          "product_version": "0.72.0.1"
         },
         "info": {
           "0409": {
             "Comments": "",
             "CompanyName": "Rapid 7 Inc",
             "FileDescription": "Velociraptor: Digging Deeper!",
-            "FileVersion": "",
+            "FileVersion": "0.72.0.1",
             "InternalName": "",
             "LegalCopyright": "Rapid 7 Inc",
             "LegalTrademarks": "",
             "OriginalFilename": "Velociraptor.exe",
             "PrivateBuild": "",
             "ProductName": "Velociraptor",
-            "ProductVersion": "",
+            "ProductVersion": "0.72.0.1",
             "SpecialBuild": ""
           }
         }