new feature: conditional parameter for detecting completion of proces…

…sing.
gdgd009xcd · Sep 9, 2020 · 4608f47 · 4608f47
1 parent e32127a
commit 4608f47
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/...uilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenNew.form b/...uilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenNew.form
@@ -882,7 +882,7 @@
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                          <Component id="jButton10" alignment="0" max="32767" attributes="0"/>
+                          <Component id="RegexTestSelectedColumn" alignment="0" max="32767" attributes="0"/>
                           <Component id="nParamDel14" alignment="0" max="32767" attributes="0"/>
                           <Component id="nParamDel13" alignment="0" max="32767" attributes="0"/>
                           <Component id="nParamDel12" alignment="0" max="32767" attributes="0"/>
@@ -912,7 +912,7 @@
                               <EmptySpace type="unrelated" max="-2" attributes="0"/>
                               <Component id="nParamDel14" min="-2" max="-2" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Component id="jButton10" min="-2" max="-2" attributes="0"/>
+                              <Component id="RegexTestSelectedColumn" min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
@@ -961,14 +961,14 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="nParamDel14ActionPerformed"/>
               </Events>
             </Component>
-            <Component class="javax.swing.JButton" name="jButton10">
+            <Component class="javax.swing.JButton" name="RegexTestSelectedColumn">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
                   <ResourceString bundle="burp/Bundle.properties" key="&#x6b63;&#x898f;&#x8868;&#x73fe;&#x30c6;&#x30b9;&#x30c8;" replaceFormat="bundle.getString(&quot;{sourceFileName}.{key}.text&quot;)"/>
                 </Property>
               </Properties>
               <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton10ActionPerformed"/>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="RegexTestSelectedColumnActionPerformed"/>
               </Events>
             </Component>
             <Container class="javax.swing.JScrollPane" name="jScrollPane6">

diff --git a/...uilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenNew.java b/...uilder/src/main/java/org/zaproxy/zap/extension/automacrobuilder/generated/ParmGenNew.java
@@ -533,7 +533,7 @@ public void updateTableRowRegex(String regex){
             pos = 3;
         } else if (current_model == P_TRACKMODEL) {
             PRequestResponse ppr = getOriginalRequestResponse();
-            if (ppr != null) {
+            if (ppr != null && pos == 12) {
                 int mpos = ppr.getMacroPos();
                 ParamTableModels[current_model].setValueAt(mpos, current_tablerowidx, 13);
             }
@@ -639,7 +639,7 @@ private void initComponents() {
         nParamDel12 = new javax.swing.JButton();
         nParamDel13 = new javax.swing.JButton();
         nParamDel14 = new javax.swing.JButton();
-        jButton10 = new javax.swing.JButton();
+        RegexTestSelectedColumn = new javax.swing.JButton();
         jScrollPane6 = new javax.swing.JScrollPane();
         trackTable = new javax.swing.JTable();
         jLabel9 = new javax.swing.JLabel();
@@ -1182,10 +1182,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        jButton10.setText(bundle.getString("ParmGenNew.正規表現テスト.text")); // NOI18N
-        jButton10.addActionListener(new java.awt.event.ActionListener() {
+        RegexTestSelectedColumn.setText(bundle.getString("ParmGenNew.正規表現テスト.text")); // NOI18N
+        RegexTestSelectedColumn.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jButton10ActionPerformed(evt);
+                RegexTestSelectedColumnActionPerformed(evt);
             }
         });
 
@@ -1264,7 +1264,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addComponent(trackTargetURL)))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(SeqResponseLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                    .addComponent(jButton10, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(RegexTestSelectedColumn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(nParamDel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(nParamDel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(nParamDel12, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1290,7 +1290,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(nParamDel14)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jButton10)))
+                        .addComponent(RegexTestSelectedColumn)))
                 .addContainerGap())
         );
 
@@ -2019,7 +2019,7 @@ private void nParamDel14ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
         }
     }//GEN-LAST:event_nParamDel14ActionPerformed
 
-    private void jButton10ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton10ActionPerformed
+    private void RegexTestSelectedColumnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_RegexTestSelectedColumnActionPerformed
         // TODO add your handling code here:
         if(current_model_selected){
             if(current_model!=P_TRACKMODEL){
@@ -2048,7 +2048,7 @@ private void jButton10ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
             }
             new ParmGenRegex(this, showrequest).setVisible(true);
         }
-    }//GEN-LAST:event_jButton10ActionPerformed
+    }//GEN-LAST:event_RegexTestSelectedColumnActionPerformed
 
     private void csvParamDelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_csvParamDelActionPerformed
         // TODO add your handling code here:
@@ -2182,6 +2182,7 @@ private void CondRegexActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
         }
         int[] rowsSelected = trackTable.getSelectedRows();
         boolean showrequest = true;
+
         if (rowsSelected.length > 0){
             current_tablerowidx = rowsSelected[0];
             current_tablecolidx = 12;
@@ -2249,6 +2250,7 @@ private void ParamRegexActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
     private javax.swing.JRadioButton NumberSelBtn;
     private javax.swing.JMenuItem ParamRegex;
     private javax.swing.JPopupMenu RegexPopup;
+    private javax.swing.JButton RegexTestSelectedColumn;
     private javax.swing.JPanel ReqPanel;
     private javax.swing.JTextPane RequestArea;
     private javax.swing.JButton RequestSelectBtn;
@@ -2278,7 +2280,6 @@ private void ParamRegexActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
     private javax.swing.JTextField csvTargetURL;
     private javax.swing.JButton delTamper;
     private javax.swing.JButton downTamper;
-    private javax.swing.JButton jButton10;
     private javax.swing.JButton jButton6;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;

diff --git a/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties b/addOns/automacrobuilder/src/main/resources/burp/Bundle.properties
@@ -136,7 +136,7 @@ ParmGenNew.trackTable.title8.text=URLencoded
 ParmGenNew.trackTable.title9.text=FromNo
 ParmGenNew.trackTable.title10.text=ToNo
 ParmGenNew.trackTable.title11.text=tokentype
-ParmGenNew.trackTable.condRegex.text=LoggedInRegex
+ParmGenNew.trackTable.condRegex.text=ValidCondRegex
 ParmGenNew.trackTable.condTargetNo.text=CondTargetNo
 ParmGenNew.trackTable.condRegexTargetIsRequest.text=CondRequest
 ParmGenNew.trackTable.replaceZeroSize.text=Replace0size
@@ -146,7 +146,7 @@ ParmGenNew.NumberTitle.text=Numeric
 ParmGenNew.DateTimeTitle.text=Date
 ParmGenNew.RegexPopup.ParamRegex.text=RequestParam:Regex of the request parameter for embedding TrackValue to.
 ParmGenNew.RegexPopup.FromValueRegex.text=TrackValue: Regex of the tracking value to extract.
-ParmGenNew.RegexPopup.CondRegex.text=LoggedInRegex: Regex of condition for detecting logged In
+ParmGenNew.RegexPopup.CondRegex.text=ValidCondRegex: Regex for detecting succeeded result.
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u304c\u4e0d\u6b63.text=Invalid regular expression\n
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a()\u304c\u3042\u308a\u307e\u305b\u3093\u3002()\u3067\u7f6e\u63db\u3059\u308b\u90e8\u5206\u3092\u56f2\u3093\u3067\u304f\u3060\u3055\u3044\u3002.text=<html>Regular expression has no capturing group syntax"()".<BR>\nEnclose param value in parentheses</html>
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a\u304c\u8907\u6570\u3042\u308a\u307e\u3059\u3002.text=There are multiple caturing group syntax"()".<BR>\nOnly one group syntax allowed.
@@ -172,7 +172,7 @@ ParmGenRegex.\uff5e.text=~
 ParmGenRegex.\u6841\u6570.text=num of digits
 ParmGenRegex.\u30aa\u30ea\u30b8\u30ca\u30eb.text=Original
 ParmGenRegex.\u6b63\u898f\u8868\u73fe.text=Regex
-ParmGenRegex.\u6b63\u898f\u8868\u73fe\u30c6\u30b9\u30c8\u753b\u9762.text=MessageEditor/RegexTextor
+ParmGenRegex.\u6b63\u898f\u8868\u73fe\u30c6\u30b9\u30c8\u753b\u9762.text=MessageEditor/RegexEditor
 ParmGenRegex.REDO.text=Redo
 ParmGenRegex.UNDO.text=Undo
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002.text=Regular expressions did not match

diff --git a/addOns/automacrobuilder/src/main/resources/burp/Bundle_ja_JP.properties b/addOns/automacrobuilder/src/main/resources/burp/Bundle_ja_JP.properties
@@ -136,7 +136,7 @@ ParmGenNew.trackTable.title8.text=URLencode\u3059\u308b
 ParmGenNew.trackTable.title9.text=\u8ffd\u8de1from
 ParmGenNew.trackTable.title10.text=\u8ffd\u8de1to
 ParmGenNew.trackTable.title11.text=tokentype
-ParmGenNew.trackTable.condRegex.text=\u30ed\u30b0\u30a4\u30f3\u6b63\u898f\u8868\u73fe
+ParmGenNew.trackTable.condRegex.text=\u5b8c\u4e86\u6b63\u898f\u8868\u73fe
 ParmGenNew.trackTable.condTargetNo.text=\u8ffd\u8de1\u6761\u4ef6No
 ParmGenNew.trackTable.condRegexTargetIsRequest.text=\u6761\u4ef6\u30ea\u30af\u30a8\u30b9\u30c8
 ParmGenNew.trackTable.replaceZeroSize.text=0\u30b5\u30a4\u30ba\u3092\u8a31\u5bb9
@@ -146,7 +146,7 @@ ParmGenNew.NumberTitle.text=\u6570\u5024
 ParmGenNew.DateTimeTitle.text=\u65e5\u6642
 ParmGenNew.RegexPopup.ParamRegex.text=\u7f6e\u63db\u6b63\u898f\u8868\u73fe\u66f4\u65b0\uff08\u8ffd\u8de1\u5024\u57cb\u3081\u8fbc\u307f\u5148\uff09
 ParmGenNew.RegexPopup.FromValueRegex.text=\u8ffd\u8de1\u6b63\u898f\u8868\u73fe\u66f4\u65b0\uff08\u8ffd\u8de1\u5024\u8ffd\u8de1\u5143\uff09
-ParmGenNew.RegexPopup.CondRegex.text=\u30ed\u30b0\u30a4\u30f3\u6b63\u898f\u8868\u73fe\u66f4\u65b0\uff08\u30ed\u30b0\u30a4\u30f3\u72b6\u614b\u306e\u691c\u51fa\u6b63\u898f\u8868\u73fe\uff09
+ParmGenNew.RegexPopup.CondRegex.text=\u5b8c\u4e86\u6b63\u898f\u8868\u73fe\u66f4\u65b0\uff08\u51e6\u7406\u5b8c\u4e86\u306e\u691c\u51fa\u6b63\u898f\u8868\u73fe\uff09
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u304c\u4e0d\u6b63.text=\u6b63\u898f\u8868\u73fe\u304c\u4e0d\u6b63\n
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a()\u304c\u3042\u308a\u307e\u305b\u3093\u3002()\u3067\u7f6e\u63db\u3059\u308b\u90e8\u5206\u3092\u56f2\u3093\u3067\u304f\u3060\u3055\u3044\u3002.text=\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a()\u304c\u3042\u308a\u307e\u305b\u3093\u3002\n()\u3067\u7f6e\u63db\u3059\u308b\u90e8\u5206\u3092\u56f2\u3093\u3067\u304f\u3060\u3055\u3044\u3002
 ParmGenRegex.\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a\u304c\u8907\u6570\u3042\u308a\u307e\u3059\u3002.text=\u6b63\u898f\u8868\u73fe\u306b\u30b0\u30eb\u30fc\u30d7\u6307\u5b9a\u304c\u8907\u6570\u3042\u308a\u307e\u3059\u3002