bugfix

isayan · isayan · commit aa5e1a841e85 · 2021-04-30T19:22:34.000+09:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
 release_version_major=2.2
-release_version_minor=3.0
+release_version_minor=4.0
diff --git a/help/html5/help-ja.html b/help/html5/help-ja.html
@@ -964,7 +964,7 @@ <h5 id="_proxy設定ダイヤログ">Proxy設定ダイヤログ</h5>
 <dl>
 <dt class="hdlist1">Protocol</dt>
 <dd>
-<p>Proxyのプロトコルを指定します。HTTPとSOCKSを選択可能です｡(SOCKSは現状動作しません)</p>
+<p>Proxyのプロトコルを指定します。HTTPとSOCKSを選択可能です｡</p>
 </dd>
 <dt class="hdlist1">Host</dt>
 <dd>
@@ -990,6 +990,9 @@ <h5 id="_proxy設定ダイヤログ">Proxy設定ダイヤログ</h5>
 </li>
 </ul>
 </div>
+<div class="paragraph">
+<p>COUTION: JDKのバグのためSOCKS Proxyは動作しません</p>
+</div>
 </div>
 <div class="sect4">
 <h5 id="_サーバチェック時にサーバに送信される形式">サーバチェック時にサーバに送信される形式</h5>
@@ -1106,6 +1109,10 @@ <h4 id="_extendタブ">2.4.4. Extendタブ</h4>
 <dd>
 <p>リクエストとレスポンスをファイルに保存します。</p>
 </dd>
+<dt class="hdlist1">request body to file</dt>
+<dd>
+<p>リクエストのボディの部分のみをファイルに保存します。</p>
+</dd>
 <dt class="hdlist1">response body to file</dt>
 <dd>
 <p>レスポンスのボディの部分のみをファイルに保存します。</p>
@@ -1837,7 +1844,7 @@ <h3 id="_version">2.9. Version</h3>
 <div id="footer">
 <div id="footer-text">
 Version unspecified<br>
-Last updated 2021-04-17 12:29:05 +0900
+Last updated 2021-04-29 10:45:19 +0900
 </div>
 </div>
 </body>
diff --git a/help/html5/help.html b/help/html5/help.html
@@ -1107,6 +1107,10 @@ <h4 id="_extend_tab">2.4.4. Extend tab</h4>
 <dd>
 <p>Save request and response to a file.</p>
 </dd>
+<dt class="hdlist1">request body to file</dt>
+<dd>
+<p>Save only the body part of the request to a file.</p>
+</dd>
 <dt class="hdlist1">response body to file</dt>
 <dd>
 <p>Save only the body part of the response to a file.</p>
@@ -1137,6 +1141,9 @@ <h4 id="_extend_tab">2.4.4. Extend tab</h4>
 </dd>
 </dl>
 </div>
+<div class="paragraph">
+<p>COUTION: SOCKS Proxy does not work due to a JDK bug</p>
+</div>
 </div>
 </div>
 <div class="sect2">
@@ -1843,7 +1850,7 @@ <h3 id="_version">2.9. Version</h3>
 <div id="footer">
 <div id="footer-text">
 Version unspecified<br>
-Last updated 2021-04-17 12:31:28 +0900
+Last updated 2021-04-29 10:45:56 +0900
 </div>
 </div>
 </body>
diff --git a/release/YaguraExtender-v2.2.jar b/release/YaguraExtender-v2.2.jar
diff --git a/src/main/help/help-ja.adoc b/src/main/help/help-ja.adoc
@@ -308,7 +308,7 @@ image:images/custom_sendto_server_proxy.png[SendToItem編集 Proxy設定 ダイ
 ** プロキシ設定に独自の設定を利用します。
 
 Protocol:: 
-    Proxyのプロトコルを指定します。HTTPとSOCKSを選択可能です｡(SOCKSは現状動作しません)
+    Proxyのプロトコルを指定します。HTTPとSOCKSを選択可能です｡
 
 Host:: 
     Proxyのホストを入力します。
@@ -322,6 +322,9 @@ User::
 Password:: 
     Proxyの認証パスワードを指定します。
 
+
+COUTION: JDKのバグのためSOCKS Proxyは動作しません
+
 ===== サーバチェック時にサーバに送信される形式
 
 multipart のデータ形式でサーバに送信されます。次の内容を含みます。
@@ -404,6 +407,8 @@ image:images/custom_sendto_extend.png[SendToItem編集 Extend ダイヤログ]
           JTransCoder のInputに選択した文字列を送ります。
      request and response to file:: 
           リクエストとレスポンスをファイルに保存します。
+     request body to file:: 
+          リクエストのボディの部分のみをファイルに保存します。
      response body to file:: 
           レスポンスのボディの部分のみをファイルに保存します。
      paste from jtranscoder:: 
diff --git a/src/main/help/help.adoc b/src/main/help/help.adoc
@@ -410,6 +410,8 @@ image:images/custom_sendto_extend.png[SendToItem Edit Extend Dialog]
         Sends the selected string to the input of JTransCoder.
     request and response to file:: 
         Save request and response to a file.
+    request body to file:: 
+        Save only the body part of the request to a file.
     response body to file:: 
         Save only the body part of the response to a file.
     paste from jtranscoder:: 
@@ -425,6 +427,8 @@ image:images/custom_sendto_extend.png[SendToItem Edit Extend Dialog]
     add exclude scope:: 
         Add URL to exclude in scope.
 
+COUTION: SOCKS Proxy does not work due to a JDK bug
+
 === Logging tabs
 
 image:images/custom_logging.png[Logging tab]
diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java
@@ -280,6 +280,7 @@ public void processProxyMessage(boolean messageIsRequest, IInterceptedProxyMessa
             MatchReplaceGroup group = this.option.getMatchReplaceProperty().getReplaceSelectedGroup(this.option.getMatchReplaceProperty().getSelectedName());
             if (group != null && group.isInScopeOnly()) {
                 IRequestInfo reqInfo = BurpExtender.getHelpers().analyzeRequest(msgInfo.getHttpService(), messageByte);
+                //BurpExtender.outPrintln("isScope:" + BurpExtender.getCallbacks().isInScope(reqInfo.getUrl()) + ":" + reqInfo.getUrl());
                 if (BurpExtender.getCallbacks().isInScope(reqInfo.getUrl())) {
                     resultBytes = this.replaceProxyMessage(message.getMessageReference(), messageIsRequest, messageByte);
                 }
@@ -555,9 +556,10 @@ private void matchAlertMessage(String toolName, boolean messageIsRequest, IHttpR
                     issue.setConfidence(bean.getConfidence());
                     issue.setStart(m.start());
                     issue.setEnd(m.end());
-                    if (bean.isCaptureGroup()) {
+                    // コメントは最初にマッチしたもののみ
+                    if (bean.isCaptureGroup() && replacemeComment == null) {
                         String group = m.group();
-                        replacemeComment= p.matcher(group).replaceFirst(bean.getComment());
+                        replacemeComment = p.matcher(group).replaceFirst(bean.getComment());
                     }
                     markList.add(issue);
                     count++;
diff --git a/src/main/java/extend/util/external/gson/XMatchItemAdapter.java b/src/main/java/extend/util/external/gson/XMatchItemAdapter.java
@@ -40,6 +40,7 @@ public JsonElement serialize(MatchItem t, Type type, JsonSerializationContext js
             jsonObject.add("smartMatch", jsc.serialize(matchItem.isSmartMatch()));
             jsonObject.add("issueName", jsc.serialize(matchItem.getIssueName()));
             jsonObject.add("severity", jsc.serialize(matchItem.getSeverity()));
+            jsonObject.add("captureGroup", jsc.serialize(matchItem.isCaptureGroup()));
             jsonObject.add("confidence", jsc.serialize(matchItem.getConfidence()));
             jsonObject.add("notifyTypes", jsc.serialize(matchItem.getNotifyTypes()));
             jsonObject.add("targetTools", jsc.serialize(matchItem.getTargetTools()));
@@ -71,6 +72,7 @@ public MatchItem deserialize(JsonElement je, Type type, JsonDeserializationConte
             if (jsonObject.has("smartMatch")) matchItem.setSmartMatch(jdc.deserialize(jsonObject.get("smartMatch"), Boolean.TYPE));
             if (jsonObject.has("issueName")) matchItem.setIssueName(jdc.deserialize(jsonObject.get("issueName"), String.class));
             if (jsonObject.has("severity")) matchItem.setSeverity(jdc.deserialize(jsonObject.get("severity"), Severity.class));
+            if (jsonObject.has("captureGroup")) matchItem.setCaptureGroup(jdc.deserialize(jsonObject.get("captureGroup"), Boolean.TYPE));
             if (jsonObject.has("confidence")) matchItem.setConfidence(jdc.deserialize(jsonObject.get("confidence"), Confidence.class));
             if (jsonObject.has("notifyTypes")) matchItem.setNotifyTypes(NotifyType.parseEnumSet(jsonObject.get("notifyTypes").getAsJsonArray().toString()));
             if (jsonObject.has("targetTools")) matchItem.setTargetTools(TargetTool.parseEnumSet(jsonObject.get("targetTools").getAsJsonArray().toString()));
diff --git a/src/main/java/yagura/model/SendToExtend.java b/src/main/java/yagura/model/SendToExtend.java
@@ -57,6 +57,10 @@ public void sendToEvent(String menuItemCaption, IHttpRequestResponse[] messageIn
                 saveAsMessage(SendToItem.MessageType.REQUEST_AND_RESPONSE, messageInfo);
                 break;
             }
+            case REQUEST_BODY_TO_FILE: {
+                saveAsMessageBody(SendToItem.MessageType.REQUEST, messageInfo);
+                break;
+            }
             case RESPONSE_BODY_TO_FILE: {
                 saveAsMessageBody(SendToItem.MessageType.RESPONSE, messageInfo);
                 break;
@@ -190,6 +194,7 @@ public boolean isEnabled() {
                 enabled = true;
                 break;
             }
+            case REQUEST_BODY_TO_FILE:
             case RESPONSE_BODY_TO_FILE: {
                 enabled = true;
                 break;
diff --git a/src/main/java/yagura/model/SendToItem.java b/src/main/java/yagura/model/SendToItem.java
@@ -30,6 +30,7 @@ public String toString() {
     public enum ExtendType {
         SEND_TO_JTRANSCODER,
         REQUEST_AND_RESPONSE_TO_FILE,
+        REQUEST_BODY_TO_FILE,
         RESPONSE_BODY_TO_FILE,
         PASTE_FROM_JTRANSCODER,
         PASTE_FROM_CLIPBOARD,
diff --git a/src/test/java/yagura/model/ProxyTest.java b/src/test/java/yagura/model/ProxyTest.java
@@ -0,0 +1,90 @@
+package yagura.model;
+
+import extension.helpers.HttpUtil;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author isayan
+ */
+public class ProxyTest {
+
+    public ProxyTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    @Test
+    public void testHttpClint() {
+        try {
+            System.out.println("testHttpClint");
+            // https://bugs.openjdk.java.net/browse/JDK-8214516
+
+            HttpClient.Builder builder = HttpClient.newBuilder()
+                    .version(Version.HTTP_1_1)
+                    .followRedirects(Redirect.NORMAL)
+                    .connectTimeout(Duration.ofSeconds(10));
+
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URI.create("https://www.example.com/"))
+                    .build();
+
+            SocketAddress addr = new InetSocketAddress("127.0.0.1", 1080);
+            Proxy proxy = new Proxy(Proxy.Type.SOCKS, addr);
+            ProxySelector staticProxy = new HttpUtil.StaticProxySelector(proxy) {
+                @Override
+                public void connectFailed(URI uri, SocketAddress sa, IOException ex) {
+                    fail();
+                }
+            };
+
+            builder = builder.proxy(staticProxy);
+
+            HttpClient client = builder.build();
+            HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+            int statusCode = response.statusCode();
+            String bodyMessage = response.body();
+            System.out.println(bodyMessage);
+        } catch (IOException ex) {
+            Logger.getLogger(ProxyTest.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (InterruptedException ex) {
+            Logger.getLogger(ProxyTest.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+    }
+
+}
