Merge pull request #26 from qtc-de/develop

Prepare v3.1.1 Release

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [3.1.1] - Jan 19, 2022
+
+### Changed
+
+* Small bugfix in JarHandler that occured when using a file system jar during deployment
+
+
 ## [3.1.0] - Jan 19, 2022
 
 ### Added

README.md

@@ -8,7 +8,7 @@
 ![](https://github.com/qtc-de/beanshooter/workflows/develop%20maven%20CI/badge.svg?branch=develop)
 ![](https://img.shields.io/badge/java-8%2b-blue)
 [![](https://img.shields.io/badge/build%20system-maven-blue)](https://maven.apache.org/)
-[![](https://img.shields.io/badge/version-3.1.0-blue)](https://github.com/qtc-de/beanshooter/releases)
+[![](https://img.shields.io/badge/version-3.1.1-blue)](https://github.com/qtc-de/beanshooter/releases)
 [![](https://img.shields.io/badge/license-GPL%20v3.0-blue)](https://github.com/qtc-de/beanshooter/blob/master/LICENSE)
 
 

beanshooter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.qtc.beanshooter</groupId>
         <artifactId>reactor</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>beanshooter</artifactId>

beanshooter/src/de/qtc/beanshooter/mbean/MBean.java

@@ -86,7 +86,7 @@ public enum MBean implements IMBean
           "general purpose bean for executing commands and uploading or download files",
           Utils.getObjectName("MLetTonkaBean:name=TonkaBean,id=1"),
           "de.qtc.beanshooter.tonkabean.TonkaBean",
-          "tonka-bean-3.1.0-jar-with-dependencies.jar",
+          "tonka-bean-3.1.1-jar-with-dependencies.jar",
           TonkaBeanOperation.values(),
           TonkaBeanOption.values()
          );

beanshooter/src/de/qtc/beanshooter/networking/JarHandler.java

@@ -56,11 +56,16 @@ public JarHandler(String filename, StagerServer parent) throws IOException
      */
     private byte[] getJar(String filename) throws IOException
     {
+        byte[] content = null;
         InputStream stream = this.getClass().getResourceAsStream("/" + filename);
-        byte[] content = IOUtils.toByteArray(stream);
 
-        if (content.length != 0)
-            return content;
+        if (stream != null)
+        {
+            content = IOUtils.toByteArray(stream);
+
+            if (content.length != 0)
+                return content;
+        }
 
         File file = new File(filename);
 

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>reactor</artifactId>
     <name>reactor</name>
     <packaging>pom</packaging>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <description>JMX enumeration and attacking tool</description>
 
     <modules>

tests/jmx-example-server/deploy/rmi/tricot.yml

@@ -171,6 +171,10 @@ tests:
           values:
             - Exporting MBean jar file
             - Exporting MLet HTML file to
+      - file_exists:
+         files:
+             - tonka-bean-3.1.1-jar-with-dependencies.jar
+             - index.html
 
 
   - title: Deploy Tonka Bean
@@ -185,7 +189,7 @@ tests:
       - de.qtc.beanshooter.tonkabean.TonkaBean
       - 'de.qtc.beanshooter:type=Test'
       - --jar-file
-      - ./tonka-bean-3.0.0-jar-with-dependencies.jar
+      - ./tonka-bean-3.1.1-jar-with-dependencies.jar
       - --stager-url
       - http://${DOCKER-GW}:4444
 
@@ -208,7 +212,7 @@ tests:
       - file_exists:
          cleanup: True
          files:
-             - tonka-bean-3.0.0-jar-with-dependencies.jar
+             - tonka-bean-3.1.1-jar-with-dependencies.jar
              - index.html
 
 

tonka-bean/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.qtc.beanshooter</groupId>
         <artifactId>reactor</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>tonka-bean</artifactId>