Version 1.9

pom.xml now removes certain files from the jar so it can run Added even more TODO comments to StatementFactory Added TODO comment to VBSParser Rewrote ApkSignersAnalyzer TODO comment
OpticFusion1 · Sep 30, 2022 · f4010de · f4010de
1 parent 823515c
commit f4010de
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>optic_fusion1</groupId>
     <artifactId>Kitsune</artifactId>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <build>
         <resources>
@@ -71,6 +71,32 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>truezip-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>remove-a-file-in-sub-archive</id>
+                        <goals>
+                            <goal>remove</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <fileset>
+                                <directory>target/Kitsune.jar/META-INF</directory>
+                                <includes>
+                                    <include>AL2.0</include>
+                                    <include>BC1024KE.DSA</include>
+                                    <include>BC1024KE.SF</include>
+                                    <include>BC2048KE.DSA</include>
+                                    <include>BC2048KE.SF</include>
+                                </includes>
+                            </fileset>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/java/optic_fusion1/kitsune/parser/vbs/StatementFactory.java b/src/main/java/optic_fusion1/kitsune/parser/vbs/StatementFactory.java
@@ -25,17 +25,40 @@ Sub SubName( param1, param2 ) || Sub SubName(param1,param2) // Or other variants
  */
 // TODO: Implement support for storing the values that variables get set to
 // TODO: Implement support for parsing operators (=, +, -, /, *, %)
-// TODO: Implement support for parsing things like Array(1,2) Array ()
+// TODO: Implement support for parsing things like Array(1,2) or Array ()
 // TODO: Implement support for parsing function calls like reader.ReadFromFile WScript.Arguments(0) or WScript.Echo "Found barcode with type '" & reader.GetFoundBarcodeType(i) & "' and value '" & reader.GetFoundBarcodeValue(i) & "'"
+// TODO: Implement support for parsing Classes
+/*
+TODO: Implement support for parsing Property
+
+Public Property Get Connection()
+    // Statements
+End Property
+
+Public Property Get Fields(strField)
+    // Statements
+End Property
+
+Public Property Let AutoPercentEntry(blnAutoPercentEntry)
+	AutoPercentEntry = p_Excel.AutoPercentEntry
+End Property
+
+Public Property Set AutomationSecurity(objMsoAutomationSecurity)
+	Set p_Excel.AutomationSecurity = objMsoAutomationSecurity
+End Property
+
+*/
 public class StatementFactory {
 
+
     /*
         TODO: Implement support for
         Function FUNCTIONNAME
             // Statements
         End Function
      */
     // TODO: Find a way to make a private static final Pattern variable for this classes's regex
+    // TODO: Add support for getting if the function is Public, Private, or neither
     public static Function buildFunctionStatements(int index, String line) {
         Pattern pattern = Pattern.compile("( +.*?)\\(", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(line);
@@ -66,10 +89,6 @@ public static Function buildFunctionStatements(int index, String line) {
         return func;
     }
 
-    /*
-        TODO: Implement support for
-        Dim dima : dima = Array("str", "str2",...)
-     */
     public static VariableInit buildVariableInitStatements(int index, String lineTrimmed) {
         VariableInit vinit = new VariableInit();
         vinit.setText(lineTrimmed);

diff --git a/src/main/java/optic_fusion1/kitsune/parser/vbs/VBSParser.java b/src/main/java/optic_fusion1/kitsune/parser/vbs/VBSParser.java
@@ -27,6 +27,7 @@
 import optic_fusion1.kitsune.parser.vbs.domain.ConstantPool;
 
 // TODO: Split this into a VBSFile class
+// TODO: Rewrite entire Parser to be something like https://github.com/Dapqu/Programming-Language/
 public class VBSParser {
 
     private static final ConstantPool CONSTANT_POOL = new ConstantPool();

diff --git a/...in/java/optic_fusion1/kitsune/tool/impl/analyze/analyzer/apk/file/ApkSignersAnalyzer.java b/...in/java/optic_fusion1/kitsune/tool/impl/analyze/analyzer/apk/file/ApkSignersAnalyzer.java
@@ -18,7 +18,7 @@ public void analyze(ApkFile apkFile) {
             for (ApkSigner signer : apkFile.getApkSingers()) {
                 LOGGER.info(signer.toString());
             }
-            // Currently not working
+            // TODO: Figure out why this throws exceptions
 //            for (ApkV2Signer signer : apkFile.getApkV2Singers()) {
 //                LOGGER.info(signer.toString());
 //            }