SendTo Bugfix JDK 11 only

raise-isayan · May 31, 2020 · cd35a24 · cd35a24
1 parent adede08
commit cd35a24
Show file tree

Hide file tree

Showing 18 changed files with 130 additions and 154 deletions.
diff --git a/Readme-ja.md b/Readme-ja.md
@@ -17,7 +17,7 @@ Burp Suiteにはアジアの文字エンコーディングの利用に欠点が
 
 ## 必須ライブラリ
 ビルドには別途 [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) のライブラリを必要とします。
-* BurpExtlib v2.0.4
+* BurpExtlib v2.0.10
 
 ## 注意事項
 このツールは、私個人が勝手に開発したもので、PortSwigger社は一切関係ありません。本ツールを使用したことによる不具合等についてPortSwiggerに問い合わせないようお願いします。

diff --git a/Readme.md b/Readme.md
@@ -17,8 +17,8 @@ If you are online, please refer to [help](https://github.com/raise-isayan/Yagura
 
 ## Required library
 Building requires a separate [BurpExtLib](https://github.com/raise-isayan/BurpExtLib) library.
-* BurpExtlib v2.0.4
+* BurpExtlib v2.0.10
 
-##Notes
+## Notes
 This tool was developed by myself and has nothing to do with PortSwigger. Please do not contact PortSwigger for any problems caused by using this tool.
 
diff --git a/help/help-ja.html b/help/help-ja.html
@@ -469,15 +469,15 @@ <h2 id="_動作環境">1. 動作環境</h2>
 <div class="title">Java</div>
 <ul>
 <li>
-<p>JRE(JDK) 8, 11 (Open JDK を推奨)(<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
+<p>JRE(JDK) 11 (Open JDK を推奨)(<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
 </li>
 </ul>
 </div>
 <div class="ulist">
 <div class="title">Burp suite</div>
 <ul>
 <li>
-<p>1.7以上 (<a href="http://www.portswigger.net/burp/" class="bare">http://www.portswigger.net/burp/</a>)</p>
+<p>v2020以上 (<a href="http://www.portswigger.net/burp/" class="bare">http://www.portswigger.net/burp/</a>)</p>
 </li>
 </ul>
 </div>
@@ -1829,7 +1829,7 @@ <h3 id="_version">3.9. Version</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-04-18 17:34:22 +0900
+Last updated 2020-05-30 00:16:59 +0900
 </div>
 </div>
 </body>

diff --git a/help/help.html b/help/help.html
@@ -469,15 +469,15 @@ <h2 id="_operating_environment">1. Operating environment</h2>
 <div class="title">Java</div>
 <ul>
 <li>
-<p>JRE (JDK) 8, 11 (Open JDK is recommended) (<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
+<p>JRE (JDK) 11 (Open JDK is recommended) (<a href="https://openjdk.java.net/" class="bare">https://openjdk.java.net/</a>)</p>
 </li>
 </ul>
 </div>
 <div class="ulist">
 <div class="title">Burp suite</div>
 <ul>
 <li>
-<p>1.7 or higher (<a href="http://www.portswigger.net/burp/" class="bare">http://www.portswigger.net/burp/</a>)</p>
+<p>v2020 or higher (<a href="http://www.portswigger.net/burp/" class="bare">http://www.portswigger.net/burp/</a>)</p>
 </li>
 </ul>
 </div>
@@ -1830,7 +1830,7 @@ <h3 id="_version">3.9. Version</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2020-04-18 09:28:27 +0900
+Last updated 2020-05-30 00:16:29 +0900
 </div>
 </div>
 </body>

diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>burp</groupId>
     <artifactId>YaguraExtender</artifactId>
-    <version>1.9</version>
+    <version>2.0</version>
     <packaging>jar</packaging>
     <properties>
-        <releaseVersion>${project.version}.25.0</releaseVersion>
+        <releaseVersion>${project.version}.0.0</releaseVersion>
         <compilerArgument>-Xlint:unchecked</compilerArgument>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <!-- ビルド設定 -->
     <build>
@@ -36,7 +36,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.6.1</version>
                 <configuration>
                     <compilerArgument>${compilerArgument}</compilerArgument>
                     <showDeprecation>true</showDeprecation>
@@ -127,7 +127,7 @@
         <dependency>
             <groupId>burp</groupId>
             <artifactId>BurpExtlib</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.10</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/release/YaguraExtender-v2.0.jar b/release/YaguraExtender-v2.0.jar
diff --git a/src/main/help/help-ja.adoc b/src/main/help/help-ja.adoc
@@ -9,10 +9,10 @@ Language/link:help.html[English]
 == 動作環境
 
 .Java
-* JRE(JDK) 8, 11 (Open JDK を推奨)(https://openjdk.java.net/)
+* JRE(JDK) 11 (Open JDK を推奨)(https://openjdk.java.net/)
 
 .Burp suite
-* 1.7以上 (http://www.portswigger.net/burp/)
+* v2020以上 (http://www.portswigger.net/burp/)
 
 .開発環境
 * NetBean 11.0 (https://netbeans.apache.org/)

diff --git a/src/main/help/help.adoc b/src/main/help/help.adoc
@@ -9,10 +9,10 @@ Language/link:help-ja.html[Japanese]
 == Operating environment
 
 .Java
-* JRE (JDK) 8, 11 (Open JDK is recommended) (https://openjdk.java.net/)
+* JRE (JDK) 11 (Open JDK is recommended) (https://openjdk.java.net/)
 
 .Burp suite
-* 1.7 or higher (http://www.portswigger.net/burp/)
+* v2020 or higher (http://www.portswigger.net/burp/)
 
 .Development environment
 * NetBean 11.0 (https://netbeans.apache.org/)

diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
@@ -9,8 +9,8 @@
 import yagura.view.JSONViewTab;
 import yagura.view.TabbetOption;
 import yagura.model.MatchReplaceGroup;
-import passive.signature.MatchAlert;
 import yagura.model.OptionProperty;
+import passive.signature.MatchAlert;
 import extend.view.base.HttpMessage;
 import extend.view.base.MatchItem;
 import extend.util.BurpWrap;

diff --git a/src/main/java/yagura/model/SendToItem.java b/src/main/java/yagura/model/SendToItem.java
@@ -4,7 +4,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 import java.util.logging.Level;

diff --git a/src/main/java/yagura/model/SendToMenu.java b/src/main/java/yagura/model/SendToMenu.java
@@ -12,6 +12,7 @@
 import extend.util.HttpUtil;
 import extend.util.Util;
 import java.awt.Component;
+import java.awt.TrayIcon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
@@ -108,6 +109,24 @@ public void renewMenu(SendToProperty property) {
                     mnuItem.setText(item.getCaption());
                     if (item.isServer()) {
                         SendToMenuItem sendToItem = new SendToServer(item, this.invocation);
+                        sendToItem.addSendToListener(new SendToListener() {
+                            @Override
+                            public void complete(SendToEvent evt) {
+                            }
+
+                            @Override
+                            public void warning(SendToEvent evt) {
+                                BurpExtender.issueAlert("SendToServer", evt.getMessage(), TrayIcon.MessageType.WARNING);
+                                Logger.getLogger(BurpExtender.class.getName()).log(Level.WARNING, evt.getMessage());
+                             }
+
+                            @Override
+                            public void error(SendToEvent evt) {
+                               BurpExtender.issueAlert("SendToServer", evt.getMessage(), TrayIcon.MessageType.ERROR);
+                                Logger.getLogger(BurpExtender.class.getName()).log(Level.SEVERE, evt.getMessage());                            }
+
+                        });
+
                         sendToList.add(sendToItem);
                         mnuItem.addActionListener(sendToItem);
                         if (property.isSubMenu()) {

diff --git a/src/main/java/yagura/model/SendToMenuItem.java b/src/main/java/yagura/model/SendToMenuItem.java
@@ -13,7 +13,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

diff --git a/src/main/java/yagura/model/SendToMultiEditor.java b/src/main/java/yagura/model/SendToMultiEditor.java
@@ -6,6 +6,8 @@
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -48,6 +50,7 @@ public void sendToEvent(IHttpRequestResponse[] messageInfo) {
                 Util.executeFormat(this.getTarget(), args);
             } catch (IOException ex) {
                 this.fireSendToErrorEvent(new SendToEvent(this, ex.getMessage()));
+                Logger.getLogger(SendToMultiEditor.class.getName()).log(Level.SEVERE, ex.getMessage(), ex);
             }
         }
     }