Skip to content

Commit 16ad8e7

Browse files
author
isayan
committed
WebSocket Filter Edited 対応
1 parent 286311e commit 16ad8e7

22 files changed

+82
-393
lines changed

‎libs/BurpExtensionCommons-v3.2.1.3-all.jar‎

44 Bytes
Binary file not shown.

‎release/YaguraExtension-v3.1.jar‎

-18.2 KB
Binary file not shown.

‎src/main/java/extend/util/external/BouncyUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3052,6 +3052,7 @@ public static String toTUPLEHASH256_512Sum(String str, String charset, boolean u
30523052
return BouncyUtil.toTUPLEHASH256_512Sum(StringUtil.getBytesCharset(str, charset), upperCase);
30533053
}
30543054

3055+
30553056
// https://github.com/bcgit/bc-java/tree/main/core/src/test/java/org/bouncycastle/crypto/test
30563057
/**
30573058
* 証明書 https://gist.github.com/vivekkr12/c74f7ee08593a8c606ed96f4b62a208a

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@
353353
</AccessibilityProperties>
354354
<Events>
355355
<EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="chkProvidedServerStateChanged"/>
356-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkProvidedServerActionPerformed"/>
357356
</Events>
358357
</Component>
359358
</SubComponents>

‎src/main/java/yagura/view/CertificateTab.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,6 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) {
284284
chkProvidedServerStateChanged(evt);
285285
}
286286
});
287-
chkProvidedServer.addActionListener(new java.awt.event.ActionListener() {
288-
public void actionPerformed(java.awt.event.ActionEvent evt) {
289-
chkProvidedServerActionPerformed(evt);
290-
}
291-
});
292287

293288
javax.swing.GroupLayout pnlServerEnableLayout = new javax.swing.GroupLayout(pnlServerEnable);
294289
pnlServerEnable.setLayout(pnlServerEnableLayout);
@@ -683,10 +678,6 @@ private void btnSelectExecuteActionPerformed(java.awt.event.ActionEvent evt) {//
683678
this.showImportCertificatetDlg();
684679
}//GEN-LAST:event_btnSelectExecuteActionPerformed
685680

686-
private void chkProvidedServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkProvidedServerActionPerformed
687-
// TODO add your handling code here:
688-
}//GEN-LAST:event_chkProvidedServerActionPerformed
689-
690681
private void rdoCustomCAActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rdoCustomCAActionPerformed
691682
// SwingUtil.setContainerEnable(this.pnlCertificateExports, this.rdoCustomCA.isSelected());
692683
this.tableCertificate.setEnabled(this.rdoCustomCA.isSelected());

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,8 @@
211211
</Group>
212212
<EmptySpace max="-2" attributes="0"/>
213213
<Group type="103" groupAlignment="0" attributes="0">
214-
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
215-
<Component id="chkResRegExp" alignment="3" min="-2" max="-2" attributes="0"/>
216-
<Component id="chkResIgnoreCase" alignment="0" min="-2" max="-2" attributes="0"/>
217-
</Group>
214+
<Component id="chkResIgnoreCase" alignment="0" min="-2" max="-2" attributes="0"/>
215+
<Component id="chkResRegExp" min="-2" max="-2" attributes="0"/>
218216
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
219217
<Component id="txtResponse" alignment="3" min="-2" max="-2" attributes="0"/>
220218
<Component id="lblResponse" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -321,17 +319,11 @@
321319
<Properties>
322320
<Property name="text" type="java.lang.String" value="Show only parameterized requests"/>
323321
</Properties>
324-
<Events>
325-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyParameterizedRequestsActionPerformed"/>
326-
</Events>
327322
</Component>
328323
<Component class="javax.swing.JCheckBox" name="chkShowOnlyEditedMessage">
329324
<Properties>
330325
<Property name="text" type="java.lang.String" value="Show only edited message"/>
331326
</Properties>
332-
<Events>
333-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkShowOnlyEditedMessageActionPerformed"/>
334-
</Events>
335327
</Component>
336328
</SubComponents>
337329
</Container>
@@ -382,9 +374,6 @@
382374
<Properties>
383375
<Property name="text" type="java.lang.String" value="5xx [server error]"/>
384376
</Properties>
385-
<Events>
386-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkStat5xxActionPerformed"/>
387-
</Events>
388377
</Component>
389378
</SubComponents>
390379
</Container>

‎src/main/java/yagura/view/FilterHttpPanel.java‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,8 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) {
193193
.addComponent(chkReqIgnoreCase))
194194
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
195195
.addGroup(pnlHttpFilterSearchItemLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
196-
.addGroup(pnlHttpFilterSearchItemLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
197-
.addComponent(chkResRegExp)
198-
.addComponent(chkResIgnoreCase))
196+
.addComponent(chkResIgnoreCase)
197+
.addComponent(chkResRegExp)
199198
.addGroup(pnlHttpFilterSearchItemLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
200199
.addComponent(txtResponse, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
201200
.addComponent(lblResponse)))
@@ -218,19 +217,9 @@ public void stateChanged(javax.swing.event.ChangeEvent evt) {
218217
pnlHttpFilterByRequest.add(chkHideItemsWithoutResponses);
219218

220219
chkShowOnlyParameterizedRequests.setText("Show only parameterized requests");
221-
chkShowOnlyParameterizedRequests.addActionListener(new java.awt.event.ActionListener() {
222-
public void actionPerformed(java.awt.event.ActionEvent evt) {
223-
chkShowOnlyParameterizedRequestsActionPerformed(evt);
224-
}
225-
});
226220
pnlHttpFilterByRequest.add(chkShowOnlyParameterizedRequests);
227221

228222
chkShowOnlyEditedMessage.setText("Show only edited message");
229-
chkShowOnlyEditedMessage.addActionListener(new java.awt.event.ActionListener() {
230-
public void actionPerformed(java.awt.event.ActionEvent evt) {
231-
chkShowOnlyEditedMessageActionPerformed(evt);
232-
}
233-
});
234223
pnlHttpFilterByRequest.add(chkShowOnlyEditedMessage);
235224

236225
pnlHeader.add(pnlHttpFilterByRequest, java.awt.BorderLayout.CENTER);
@@ -252,11 +241,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
252241
pnlHttpStatus.add(chkStat4xx);
253242

254243
chkStat5xx.setText("5xx [server error]");
255-
chkStat5xx.addActionListener(new java.awt.event.ActionListener() {
256-
public void actionPerformed(java.awt.event.ActionEvent evt) {
257-
chkStat5xxActionPerformed(evt);
258-
}
259-
});
260244
pnlHttpStatus.add(chkStat5xx);
261245

262246
pnlHeader.add(pnlHttpStatus, java.awt.BorderLayout.EAST);
@@ -274,18 +258,6 @@ private void chkHideStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST
274258
this.chkShowOnly.setEnabled(!this.chkHide.isSelected());
275259
}//GEN-LAST:event_chkHideStateChanged
276260

277-
private void chkShowOnlyParameterizedRequestsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkShowOnlyParameterizedRequestsActionPerformed
278-
// TODO add your handling code here:
279-
}//GEN-LAST:event_chkShowOnlyParameterizedRequestsActionPerformed
280-
281-
private void chkShowOnlyEditedMessageActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkShowOnlyEditedMessageActionPerformed
282-
// TODO add your handling code here:
283-
}//GEN-LAST:event_chkShowOnlyEditedMessageActionPerformed
284-
285-
private void chkStat5xxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkStat5xxActionPerformed
286-
// TODO add your handling code here:
287-
}//GEN-LAST:event_chkStat5xxActionPerformed
288-
289261

290262
// Variables declaration - do not modify//GEN-BEGIN:variables
291263
private javax.swing.JCheckBox chkHide;

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
1212
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
1313
<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,6,0,0,3,14"/>
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,26,0,0,3,14"/>
1515
</AuxValues>
1616

1717
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -87,6 +87,11 @@
8787
<Property name="text" type="java.lang.String" value="Hide incoming message"/>
8888
</Properties>
8989
</Component>
90+
<Component class="javax.swing.JCheckBox" name="chkShowOnlyEditedMessage">
91+
<Properties>
92+
<Property name="text" type="java.lang.String" value="Show only edited message"/>
93+
</Properties>
94+
</Component>
9095
</SubComponents>
9196
</Container>
9297
<Container class="javax.swing.JPanel" name="pnlWebsocketFilterSearchItem">
@@ -140,7 +145,6 @@
140145
<SubComponents>
141146
<Component class="javax.swing.JCheckBox" name="chkMsgRegExp">
142147
<Properties>
143-
<Property name="selected" type="boolean" value="true"/>
144148
<Property name="text" type="java.lang.String" value="RegExp"/>
145149
</Properties>
146150
</Component>

‎src/main/java/yagura/view/FilterWebSocketPanel.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ private void initComponents() {
4141
chkShowOnlyinscopeItem = new javax.swing.JCheckBox();
4242
chkHideOutgoingMessage = new javax.swing.JCheckBox();
4343
chkHideIncomingMessage = new javax.swing.JCheckBox();
44+
chkShowOnlyEditedMessage = new javax.swing.JCheckBox();
4445
pnlWebsocketFilterSearchItem = new javax.swing.JPanel();
4546
chkMsgRegExp = new javax.swing.JCheckBox();
4647
chkMsgIgnoreCase = new javax.swing.JCheckBox();
@@ -68,12 +69,14 @@ private void initComponents() {
6869
chkHideIncomingMessage.setText("Hide incoming message");
6970
pnlFilterByRequest.add(chkHideIncomingMessage);
7071

72+
chkShowOnlyEditedMessage.setText("Show only edited message");
73+
pnlFilterByRequest.add(chkShowOnlyEditedMessage);
74+
7175
pnlCenter.add(pnlFilterByRequest, java.awt.BorderLayout.NORTH);
7276

7377
pnlWebsocketFilterSearchItem.setBorder(javax.swing.BorderFactory.createTitledBorder("Filter by Search Item"));
7478
pnlWebsocketFilterSearchItem.setMinimumSize(new java.awt.Dimension(663, 400));
7579

76-
chkMsgRegExp.setSelected(true);
7780
chkMsgRegExp.setText("RegExp");
7881

7982
chkMsgIgnoreCase.setText("IgnoreCase");
@@ -121,6 +124,7 @@ private void initComponents() {
121124
private javax.swing.JCheckBox chkHideOutgoingMessage;
122125
private javax.swing.JCheckBox chkMsgIgnoreCase;
123126
private javax.swing.JCheckBox chkMsgRegExp;
127+
private javax.swing.JCheckBox chkShowOnlyEditedMessage;
124128
private javax.swing.JCheckBox chkShowOnlyinscopeItem;
125129
private javax.swing.JLabel lblMessage;
126130
private javax.swing.JPanel pnlCenter;
@@ -139,11 +143,11 @@ public Document createDefaultDocument() {
139143
}
140144
};
141145

142-
private FilterAnnotationPanel pnlAnnotation = new FilterAnnotationPanel();
146+
private final FilterAnnotationPanel pnlAnnotation = new FilterAnnotationPanel();
143147

144-
private javax.swing.JPanel pnlBambda = new javax.swing.JPanel();
145-
private javax.swing.JScrollPane scrollBabda = new javax.swing.JScrollPane();
146-
private javax.swing.JEditorPane txtBambda = new javax.swing.JEditorPane();
148+
private final javax.swing.JPanel pnlBambda = new javax.swing.JPanel();
149+
private final javax.swing.JScrollPane scrollBabda = new javax.swing.JScrollPane();
150+
private final javax.swing.JEditorPane txtBambda = new javax.swing.JEditorPane();
147151

148152
private void customizeComponents() {
149153
this.scrollBabda.setViewportView(this.txtBambda);
@@ -202,6 +206,7 @@ public void setProperty(FilterWebSocketProperty filterProp) {
202206
this.chkShowOnlyinscopeItem.setSelected(filterProp.isShowOnlyScopeItems());
203207
this.chkHideIncomingMessage.setSelected(filterProp.isHideIncomingMessage());
204208
this.chkHideOutgoingMessage.setSelected(filterProp.isHideOutgoingMessage());
209+
this.chkShowOnlyEditedMessage.setSelected(filterProp.isShowOnlyEditedMessage());
205210

206211
this.txtMessage.setText(filterProp.getMessage());
207212
this.chkMsgRegExp.setSelected(filterProp.isMessageRegex());
@@ -222,6 +227,7 @@ public FilterProperty getProperty() {
222227
filterProp.setShowOnlyScopeItems(this.chkShowOnlyinscopeItem.isSelected());
223228
filterProp.setHideIncomingMessage(this.chkHideIncomingMessage.isSelected());
224229
filterProp.setHideOutgoingMessage(this.chkHideOutgoingMessage.isSelected());
230+
filterProp.setShowOnlyEditedMessage(this.chkShowOnlyEditedMessage.isSelected());
225231

226232
this.pnlAnnotation.getAnnotationProperty(filterProp);
227233

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
</Properties>
130130
<Events>
131131
<EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="chkRegExpStateChanged"/>
132-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkRegExpActionPerformed"/>
133132
</Events>
134133
</Component>
135134
<Component class="javax.swing.JCheckBox" name="chkIgnoreCase">
@@ -299,17 +298,13 @@
299298
<Properties>
300299
<Property name="text" type="java.lang.String" value="in-scope only"/>
301300
</Properties>
302-
<Events>
303-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkScopeOnlyActionPerformed"/>
304-
</Events>
305301
</Component>
306302
<Component class="javax.swing.JCheckBox" name="chkSmartMatch">
307303
<Properties>
308304
<Property name="text" type="java.lang.String" value="Smart Match"/>
309305
</Properties>
310306
<Events>
311307
<EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="chkSmartMatchStateChanged"/>
312-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkSmartMatchActionPerformed"/>
313308
</Events>
314309
</Component>
315310
</SubComponents>

0 commit comments

Comments
 (0)