Merge pull request #680 from Ana06/android_java

Merge Java and Android categories
mandiant · Oct 12, 2023 · 3f7926c · 3f7926c
2 parents 2891eed + b94b3c8
commit 3f7926c
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/new_metapackage.yml b/.github/ISSUE_TEMPLATE/new_metapackage.yml
@@ -51,7 +51,6 @@ body:
       description: Which category should this tool be installed to?
       options:
         - Active Directory
-        - Android
         - Cloud
         - Command & Control
         - Credential Access
@@ -65,7 +64,7 @@ body:
         - Hex Editors
         - Information Gathering
         - InnoSetup
-        - Java
+        - Java/Android
         - Javascript
         - Lateral Movement
         - Networking

diff --git a/.github/ISSUE_TEMPLATE/new_package.yml b/.github/ISSUE_TEMPLATE/new_package.yml
@@ -70,7 +70,6 @@ body:
       description: Which category should this tool be installed to?
       options:
         - Active Directory
-        - Android
         - Cloud
         - Command & Control
         - Credential Access
@@ -84,7 +83,7 @@ body:
         - Hex Editors
         - Information Gathering
         - InnoSetup
-        - Java
+        - Java/Android
         - Javascript
         - Lateral Movement
         - Networking

diff --git a/categories.txt b/categories.txt
@@ -1,5 +1,4 @@
 Active Directory
-Android
 Cloud
 Command & Control
 Credential Access
@@ -13,7 +12,7 @@ Forensic
 Hex Editors
 Information Gathering
 InnoSetup
-Java
+Java/Android
 Javascript
 Lateral Movement
 Networking

diff --git a/packages/apktool.vm/apktool.vm.nuspec b/packages/apktool.vm/apktool.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>apktool.vm</id>
-    <version>2.8.1</version>
+    <version>2.8.1.20231006</version>
     <authors>Connor Tumbleson, Ryszard Wisniewski</authors>
     <description>A tool for reverse engineering 3rd party, closed, binary Android apps.</description>
     <dependencies>

diff --git a/packages/apktool.vm/tools/chocolateyinstall.ps1 b/packages/apktool.vm/tools/chocolateyinstall.ps1
@@ -3,7 +3,7 @@ Import-Module vm.common -Force -DisableNameChecking
 
 try {
   $toolName = 'apktool'
-  $category = 'Android'
+  $category = 'Java/Android'
   $shimPath = 'bin\apktool.exe'
 
   $shortcutDir = Join-Path ${Env:TOOL_LIST_DIR} $category

diff --git a/packages/apktool.vm/tools/chocolateyuninstall.ps1 b/packages/apktool.vm/tools/chocolateyuninstall.ps1
@@ -2,6 +2,6 @@ $ErrorActionPreference = 'Continue'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'apktool'
-$category = 'Android'
+$category = 'Java/Android'
 
 VM-Remove-Tool-Shortcut $toolName $category
diff --git a/packages/bytecodeviewer.vm/bytecodeviewer.vm.nuspec b/packages/bytecodeviewer.vm/bytecodeviewer.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>bytecodeviewer.vm</id>
-    <version>2.11.2</version>
+    <version>2.11.2.20231006</version>
     <authors>Konloch</authors>
     <description>A lightweight user-friendly Java/Android Bytecode Viewer, Decompiler and more.</description>
     <dependencies>

diff --git a/packages/bytecodeviewer.vm/tools/chocolateyinstall.ps1 b/packages/bytecodeviewer.vm/tools/chocolateyinstall.ps1
@@ -2,7 +2,7 @@ $ErrorActionPreference = 'Stop'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'Bytecode Viewer'
-$category = 'Java'
+$category = 'Java/Android'
 
 $exeUrl = 'https://github.com/Konloch/bytecode-viewer/releases/download/v2.11.2/Bytecode-Viewer-2.11.2.jar'
 $exeSha256 = '536ad387424106083f76cd0cb7c051a22aff21f08663ba2539c11f1ddef9147f'

diff --git a/packages/bytecodeviewer.vm/tools/chocolateyuninstall.ps1 b/packages/bytecodeviewer.vm/tools/chocolateyuninstall.ps1
@@ -2,6 +2,6 @@ $ErrorActionPreference = 'Continue'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'Bytecode Viewer'
-$category = 'Java'
+$category = 'Java/Android'
 
 VM-Uninstall $toolName $category
diff --git a/packages/dex2jar.vm/dex2jar.vm.nuspec b/packages/dex2jar.vm/dex2jar.vm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>dex2jar.vm</id>
-    <version>2.3</version>
+    <version>2.3.0.20231006</version>
     <authors>@pxb1988</authors>
     <description>Tools to work with android .dex and java .class files.</description>
     <dependencies>

diff --git a/packages/dex2jar.vm/tools/chocolateyinstall.ps1 b/packages/dex2jar.vm/tools/chocolateyinstall.ps1
@@ -2,7 +2,7 @@ $ErrorActionPreference = 'Stop'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'd2j-dex2jar'
-$category = 'Java'
+$category = 'Java/Android'
 
 $zipUrl = 'https://github.com/pxb1988/dex2jar/releases/download/v2.3/dex2jar-v2.zip'
 $zipSha256 = 'd0507b6277193476ae29351905b5fa9b20d1a9a5ce119b46d87e5b188edf859e'

diff --git a/packages/dex2jar.vm/tools/chocolateyuninstall.ps1 b/packages/dex2jar.vm/tools/chocolateyuninstall.ps1
@@ -2,6 +2,6 @@ $ErrorActionPreference = 'Continue'
 Import-Module vm.common -Force -DisableNameChecking
 
 $toolName = 'd2j-dex2jar'
-$category = 'Java'
+$category = 'Java/Android'
 
 VM-Uninstall $toolName $category
diff --git a/scripts/test/lint.py b/scripts/test/lint.py
@@ -337,7 +337,7 @@ def check(self, path):
         # utf-8-sig ignores BOM
         file_content = open(path, "r", encoding="utf-8-sig").read()
 
-        match = re.search("\$category = ['\"](?P<category>[\w &]+)['\"]", file_content)
+        match = re.search("\$category = ['\"](?P<category>[\w &/]+)['\"]", file_content)
         if not match or match.group("category") not in self.CATEGORIES:
             return True
         return False