Skip to content

Commit ce6955d

Browse files
author
isayan
committed
ResultFilterのWebSocket サポート
1 parent 79bd735 commit ce6955d

19 files changed

+1976
-1252
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true
22
release_version_major=3.1
3-
release_version_minor=4.0
3+
release_version_minor=4.1
44
netbeans.license=mit

‎help/help-ja.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
<div id="header">
441441
<h1>YaguraExtension ヘルプ</h1>
442442
<div class="details">
443-
<span id="revnumber">version v3.1.4.0</span>
443+
<span id="revnumber">version v3.1.4.1</span>
444444
</div>
445445
<div id="toc" class="toc2">
446446
<div id="toctitle">Table of Contents</div>
@@ -2845,7 +2845,7 @@ <h3 id="_version">3.11. Version</h3>
28452845
</div>
28462846
<div id="footer">
28472847
<div id="footer-text">
2848-
Version v3.1.4.0<br>
2848+
Version v3.1.4.1<br>
28492849
Last updated 2024-10-01 23:46:59 +0900
28502850
</div>
28512851
</div>

‎help/help.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
<div id="header">
441441
<h1>YaguraExtension Help</h1>
442442
<div class="details">
443-
<span id="revnumber">version v3.1.4.0</span>
443+
<span id="revnumber">version v3.1.4.1</span>
444444
</div>
445445
<div id="toc" class="toc2">
446446
<div id="toctitle">Table of Contents</div>
@@ -2861,7 +2861,7 @@ <h3 id="_version">3.11. Version</h3>
28612861
</div>
28622862
<div id="footer">
28632863
<div id="footer-text">
2864-
Version v3.1.4.0<br>
2864+
Version v3.1.4.1<br>
28652865
Last updated 2024-10-01 23:47:59 +0900
28662866
</div>
28672867
</div>

‎libs/BurpExtensionCommons-v3.2.1.1-all.jar‎ renamed to ‎libs/BurpExtensionCommons-v3.2.1.2-all.jar‎

756 KB
Binary file not shown.

‎release/YaguraExtension-v3.1.jar‎

21.5 KB
Binary file not shown.

‎src/main/java/yagura/handler/MenuHander.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ public class MenuHander {
5151

5252
private final static Logger logger = Logger.getLogger(MenuHander.class.getName());
5353

54+
private final static java.util.ResourceBundle BUNDLE = java.util.ResourceBundle.getBundle("yagura/resources/Resource");
55+
5456
private final MontoyaApi api;
5557
private final BurpExtension extenderImpl;
5658

@@ -65,6 +67,9 @@ public class MenuHander {
6567

6668
private String yaguraCharset = StandardCharsets.UTF_8.name();
6769

70+
private final javax.swing.ImageIcon image_http = new javax.swing.ImageIcon(getClass().getResource("/yagura/resources/page_white_world.png"));
71+
private final javax.swing.ImageIcon image_websocket = new javax.swing.ImageIcon(getClass().getResource("/yagura/resources/connect.png"));
72+
6873
public MenuHander(MontoyaApi api) {
6974
this.api = api;
7075
this.extenderImpl = BurpExtension.getInstance();
@@ -908,7 +913,7 @@ private void updateBurpCharsetUI(JMenu burpCharsetMenu) {
908913
*/
909914
private void updateResultFilterUI(JMenu yaguraResultFilterMenu) {
910915
yaguraResultFilterMenu.removeAll();
911-
Map<String, FilterProperty> filterMap = extenderImpl.getProperty().getResultFilterProperty().getFilterMap();
916+
final Map<String, FilterProperty> filterMap = extenderImpl.getProperty().getResultFilterProperty().getFilterMap();
912917
for (String name : filterMap.keySet()) {
913918
JMenuItem chkResultFilterItem = new JMenuItem();
914919
chkResultFilterItem.setText(name);

‎src/main/java/yagura/model/JSearchProperty.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void setAutoRecogniseEncoding(boolean autoRecognise) {
3737
}
3838

3939
@Expose
40-
private FilterProperty filterProp = new FilterProperty();
40+
private FilterProperty filterProp = new FilterProperty(FilterProperty.FilterCategory.HTTP);
4141

4242
public FilterProperty getFilterProperty() {
4343
return this.filterProp;

‎src/main/java/yagura/view/FilterAnnotationPanel.form‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
3+
<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4+
<AuxValues>
5+
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
6+
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
7+
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
8+
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
9+
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
10+
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
11+
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
12+
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
13+
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
14+
<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"/>
15+
</AuxValues>
16+
17+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
18+
<SubComponents>
19+
<Container class="javax.swing.JPanel" name="pnlAnnotations">
20+
<Properties>
21+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
22+
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
23+
<TitledBorder title="Filter by Annotations"/>
24+
</Border>
25+
</Property>
26+
</Properties>
27+
<Constraints>
28+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
29+
<BorderConstraints direction="Center"/>
30+
</Constraint>
31+
</Constraints>
32+
33+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
34+
<SubComponents>
35+
<Container class="javax.swing.JPanel" name="pnlAnnotation">
36+
<Constraints>
37+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
38+
<BorderConstraints direction="North"/>
39+
</Constraint>
40+
</Constraints>
41+
42+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout">
43+
<Property name="axis" type="int" value="3"/>
44+
</Layout>
45+
<SubComponents>
46+
<Component class="javax.swing.JCheckBox" name="chkShowOnlyComment">
47+
<Properties>
48+
<Property name="text" type="java.lang.String" value="Show only comment"/>
49+
</Properties>
50+
<Events>
51+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyCommentActionPerformed"/>
52+
</Events>
53+
</Component>
54+
<Component class="javax.swing.JCheckBox" name="chkShowOnlyHighlight">
55+
<Properties>
56+
<Property name="text" type="java.lang.String" value="Show only highlight"/>
57+
</Properties>
58+
<Events>
59+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyHighlightActionPerformed"/>
60+
</Events>
61+
</Component>
62+
</SubComponents>
63+
</Container>
64+
<Container class="javax.swing.JPanel" name="pnlHighlightColor">
65+
<Properties>
66+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
67+
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
68+
<TitledBorder>
69+
<Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
70+
<TitledBorder title="Highlight Color"/>
71+
</Border>
72+
</TitledBorder>
73+
</Border>
74+
</Property>
75+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
76+
<Dimension value="[151, 500]"/>
77+
</Property>
78+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
79+
<Dimension value="[151, 500]"/>
80+
</Property>
81+
</Properties>
82+
<Constraints>
83+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
84+
<BorderConstraints direction="Center"/>
85+
</Constraint>
86+
</Constraints>
87+
88+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
89+
<Property name="columns" type="int" value="1"/>
90+
<Property name="rows" type="int" value="10"/>
91+
</Layout>
92+
<SubComponents>
93+
<Component class="javax.swing.JCheckBox" name="chkWhite">
94+
<Properties>
95+
<Property name="text" type="java.lang.String" value="white (none)"/>
96+
</Properties>
97+
</Component>
98+
<Component class="javax.swing.JCheckBox" name="chkRed">
99+
<Properties>
100+
<Property name="text" type="java.lang.String" value="red"/>
101+
</Properties>
102+
</Component>
103+
<Component class="javax.swing.JCheckBox" name="chkOrange">
104+
<Properties>
105+
<Property name="text" type="java.lang.String" value="orange"/>
106+
</Properties>
107+
</Component>
108+
<Component class="javax.swing.JCheckBox" name="chkYellow">
109+
<Properties>
110+
<Property name="text" type="java.lang.String" value="yellow"/>
111+
</Properties>
112+
</Component>
113+
<Component class="javax.swing.JCheckBox" name="chkGreen">
114+
<Properties>
115+
<Property name="text" type="java.lang.String" value="green"/>
116+
</Properties>
117+
</Component>
118+
<Component class="javax.swing.JCheckBox" name="chkCyan">
119+
<Properties>
120+
<Property name="text" type="java.lang.String" value="cyan"/>
121+
</Properties>
122+
</Component>
123+
<Component class="javax.swing.JCheckBox" name="chkBlue">
124+
<Properties>
125+
<Property name="text" type="java.lang.String" value="blue"/>
126+
</Properties>
127+
</Component>
128+
<Component class="javax.swing.JCheckBox" name="chkPink">
129+
<Properties>
130+
<Property name="text" type="java.lang.String" value="pink"/>
131+
</Properties>
132+
</Component>
133+
<Component class="javax.swing.JCheckBox" name="chkMagenta">
134+
<Properties>
135+
<Property name="text" type="java.lang.String" value="magenta"/>
136+
</Properties>
137+
</Component>
138+
<Component class="javax.swing.JCheckBox" name="chkGray">
139+
<Properties>
140+
<Property name="text" type="java.lang.String" value="gray"/>
141+
</Properties>
142+
</Component>
143+
</SubComponents>
144+
</Container>
145+
<Container class="javax.swing.JPanel" name="pnlBottom">
146+
<Constraints>
147+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
148+
<BorderConstraints direction="South"/>
149+
</Constraint>
150+
</Constraints>
151+
152+
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
153+
<SubComponents>
154+
<Container class="javax.swing.JPanel" name="pnlListenerPort">
155+
<Properties>
156+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
157+
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
158+
<TitledBorder title="Filter by listener "/>
159+
</Border>
160+
</Property>
161+
</Properties>
162+
<Constraints>
163+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
164+
<BorderConstraints direction="South"/>
165+
</Constraint>
166+
</Constraints>
167+
168+
<Layout>
169+
<DimensionLayout dim="0">
170+
<Group type="103" groupAlignment="0" attributes="0">
171+
<Group type="102" alignment="0" attributes="0">
172+
<EmptySpace max="-2" attributes="0"/>
173+
<Component id="lblListenerPort" min="-2" pref="50" max="-2" attributes="0"/>
174+
<EmptySpace max="-2" attributes="0"/>
175+
<Component id="txtLiistenerPort" min="-2" pref="112" max="-2" attributes="0"/>
176+
<EmptySpace min="-2" pref="25" max="-2" attributes="0"/>
177+
</Group>
178+
</Group>
179+
</DimensionLayout>
180+
<DimensionLayout dim="1">
181+
<Group type="103" groupAlignment="0" attributes="0">
182+
<Group type="102" alignment="0" attributes="0">
183+
<EmptySpace max="32767" attributes="0"/>
184+
<Group type="103" groupAlignment="3" attributes="0">
185+
<Component id="lblListenerPort" alignment="3" min="-2" max="-2" attributes="0"/>
186+
<Component id="txtLiistenerPort" alignment="3" min="-2" max="-2" attributes="0"/>
187+
</Group>
188+
</Group>
189+
</Group>
190+
</DimensionLayout>
191+
</Layout>
192+
<SubComponents>
193+
<Component class="javax.swing.JTextField" name="txtLiistenerPort">
194+
</Component>
195+
<Component class="javax.swing.JLabel" name="lblListenerPort">
196+
<Properties>
197+
<Property name="text" type="java.lang.String" value="Port"/>
198+
</Properties>
199+
</Component>
200+
</SubComponents>
201+
</Container>
202+
</SubComponents>
203+
</Container>
204+
</SubComponents>
205+
</Container>
206+
</SubComponents>
207+
</Form>

0 commit comments

Comments
 (0)