ResultFilterのWebSocket サポート

raise-isayan · Oct 7, 2024 · ce6955d · ce6955d
1 parent 79bd735
commit ce6955d
Show file tree

Hide file tree

Showing 19 changed files with 1,976 additions and 1,252 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
 release_version_major=3.1
-release_version_minor=4.0
+release_version_minor=4.1
 netbeans.license=mit
diff --git a/help/help-ja.html b/help/help-ja.html
@@ -440,7 +440,7 @@
 <div id="header">
 <h1>YaguraExtension ヘルプ</h1>
 <div class="details">
-<span id="revnumber">version v3.1.4.0</span>
+<span id="revnumber">version v3.1.4.1</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -2845,7 +2845,7 @@ <h3 id="_version">3.11. Version</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version v3.1.4.0<br>
+Version v3.1.4.1<br>
 Last updated 2024-10-01 23:46:59 +0900
 </div>
 </div>

diff --git a/help/help.html b/help/help.html
@@ -440,7 +440,7 @@
 <div id="header">
 <h1>YaguraExtension Help</h1>
 <div class="details">
-<span id="revnumber">version v3.1.4.0</span>
+<span id="revnumber">version v3.1.4.1</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -2861,7 +2861,7 @@ <h3 id="_version">3.11. Version</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version v3.1.4.0<br>
+Version v3.1.4.1<br>
 Last updated 2024-10-01 23:47:59 +0900
 </div>
 </div>

diff --git a/libs/BurpExtensionCommons-v3.2.1.1-all.jar → libs/BurpExtensionCommons-v3.2.1.2-all.jar b/libs/BurpExtensionCommons-v3.2.1.1-all.jar → libs/BurpExtensionCommons-v3.2.1.2-all.jar
diff --git a/release/YaguraExtension-v3.1.jar b/release/YaguraExtension-v3.1.jar
diff --git a/src/main/java/yagura/handler/MenuHander.java b/src/main/java/yagura/handler/MenuHander.java
@@ -51,6 +51,8 @@ public class MenuHander {
 
     private final static Logger logger = Logger.getLogger(MenuHander.class.getName());
 
+    private final static java.util.ResourceBundle BUNDLE = java.util.ResourceBundle.getBundle("yagura/resources/Resource");
+
     private final MontoyaApi api;
     private final BurpExtension extenderImpl;
 
@@ -65,6 +67,9 @@ public class MenuHander {
 
     private String yaguraCharset = StandardCharsets.UTF_8.name();
 
+    private final javax.swing.ImageIcon image_http = new javax.swing.ImageIcon(getClass().getResource("/yagura/resources/page_white_world.png"));
+    private final javax.swing.ImageIcon image_websocket = new javax.swing.ImageIcon(getClass().getResource("/yagura/resources/connect.png"));
+
     public MenuHander(MontoyaApi api) {
         this.api = api;
         this.extenderImpl = BurpExtension.getInstance();
@@ -908,7 +913,7 @@ private void updateBurpCharsetUI(JMenu burpCharsetMenu) {
      */
     private void updateResultFilterUI(JMenu yaguraResultFilterMenu) {
         yaguraResultFilterMenu.removeAll();
-        Map<String, FilterProperty> filterMap = extenderImpl.getProperty().getResultFilterProperty().getFilterMap();
+        final Map<String, FilterProperty> filterMap = extenderImpl.getProperty().getResultFilterProperty().getFilterMap();
         for (String name : filterMap.keySet()) {
             JMenuItem chkResultFilterItem = new JMenuItem();
             chkResultFilterItem.setText(name);

diff --git a/src/main/java/yagura/model/JSearchProperty.java b/src/main/java/yagura/model/JSearchProperty.java
@@ -37,7 +37,7 @@ public void setAutoRecogniseEncoding(boolean autoRecognise) {
     }
 
     @Expose
-    private FilterProperty filterProp = new FilterProperty();
+    private FilterProperty filterProp = new FilterProperty(FilterProperty.FilterCategory.HTTP);
 
     public FilterProperty getFilterProperty() {
         return this.filterProp;

diff --git a/src/main/java/yagura/view/FilterAnnotationPanel.form b/src/main/java/yagura/view/FilterAnnotationPanel.form
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,102,0,0,1,-112"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="javax.swing.JPanel" name="pnlAnnotations">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="Filter by Annotations"/>
+          </Border>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+      <SubComponents>
+        <Container class="javax.swing.JPanel" name="pnlAnnotation">
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="North"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
+            <Property name="axis" type="int" value="3"/>
+          </Layout>
+          <SubComponents>
+            <Component class="javax.swing.JCheckBox" name="chkShowOnlyComment">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Show only comment"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyCommentActionPerformed"/>
+              </Events>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkShowOnlyHighlight">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Show only highlight"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyHighlightActionPerformed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="pnlHighlightColor">
+          <Properties>
+            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+              <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+                <TitledBorder>
+                  <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+                    <TitledBorder title="Highlight Color"/>
+                  </Border>
+                </TitledBorder>
+              </Border>
+            </Property>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[151, 500]"/>
+            </Property>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[151, 500]"/>
+            </Property>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+            <Property name="columns" type="int" value="1"/>
+            <Property name="rows" type="int" value="10"/>
+          </Layout>
+          <SubComponents>
+            <Component class="javax.swing.JCheckBox" name="chkWhite">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="white (none)"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkRed">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="red"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkOrange">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="orange"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkYellow">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="yellow"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkGreen">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="green"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkCyan">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="cyan"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkBlue">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="blue"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkPink">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="pink"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkMagenta">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="magenta"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JCheckBox" name="chkGray">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="gray"/>
+              </Properties>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="javax.swing.JPanel" name="pnlBottom">
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="South"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+          <SubComponents>
+            <Container class="javax.swing.JPanel" name="pnlListenerPort">
+              <Properties>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+                    <TitledBorder title="Filter by listener "/>
+                  </Border>
+                </Property>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+                  <BorderConstraints direction="South"/>
+                </Constraint>
+              </Constraints>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="lblListenerPort" min="-2" pref="50" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="txtLiistenerPort" min="-2" pref="112" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace max="32767" attributes="0"/>
+                          <Group type="103" groupAlignment="3" attributes="0">
+                              <Component id="lblListenerPort" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="txtLiistenerPort" alignment="3" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+              <SubComponents>
+                <Component class="javax.swing.JTextField" name="txtLiistenerPort">
+                </Component>
+                <Component class="javax.swing.JLabel" name="lblListenerPort">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="Port"/>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+          </SubComponents>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>