fix MatchAlert

Author: isayan

release/YaguraExtension-v3.0.jar

@@ -1095,6 +1095,7 @@ public ProxyHander(MontoyaApi api) {
          */
         @Override
         public RequestToBeSentAction handleHttpRequestToBeSent(HttpRequestToBeSent httpRequestToBeSent) {
+
             return RequestToBeSentAction.continueWith(httpRequestToBeSent, httpRequestToBeSent.annotations());
         }
 
@@ -1271,25 +1272,6 @@ protected void historyLogAppend() {
             }
         }
 
-        /**
-         * processToolMessage
-         *
-         * @param toolType
-         * @param messageIsRequest
-         * @param messageInfo
-         * @return
-         */
-        public HttpRequestResponse processToolMessage(
-                ToolType toolType,
-                boolean messageIsRequest,
-                HttpRequestResponse messageInfo) {
-            HttpRequestResponse httpRequestResponse = messageInfo;
-            if (getProperty().getMatchAlertProperty().isMatchAlertEnable() && getProperty().getMatchAlertProperty().isSelectedMatchAlert()) {
-                httpRequestResponse = this.matchAlertMessage(toolType, messageIsRequest, messageInfo);
-            }
-            return httpRequestResponse;
-        }
-
         /**
          * Request
          *
@@ -1523,7 +1505,6 @@ public AutoResponderHandler(MontoyaApi api) {
         public RequestToBeSentAction handleHttpRequestToBeSent(HttpRequestToBeSent httpRequestToBeSent) {
             // Autoresponder
             if (option.getAutoResponderProperty().getAutoResponderEnable()) {
-                HttpService service = httpRequestToBeSent.httpService();
                 final String url = httpRequestToBeSent.url();
                 AutoResponderItem item = option.getAutoResponderProperty().findItem(url, httpRequestToBeSent.method());
                 if (item != null) {

src/main/java/burp/BurpExtension.java

@@ -85,7 +85,7 @@ public static AutoResponderItem fromObjects(Object[] rows) {
         autoResponder.setBodyOnly(((Boolean) rows[5]));
         autoResponder.setContentType(((String) rows[6]));
         autoResponder.setReplace((String) rows[7]);
-        autoResponder.recompileRegex();
+        autoResponder.recompileRegex(!autoResponder.isRegexp());
         return autoResponder;
     }
 

src/main/java/yagura/model/AutoResponderItem.java

@@ -224,6 +224,7 @@ public static MatchAlertItem fromObjects(Object[] rows) {
         matchAlert.setIssueName((String) rows[11]);
         matchAlert.setSeverity((Severity) rows[12]);
         matchAlert.setConfidence((Confidence) rows[13]);
+        matchAlert.recompileRegex(!matchAlert.isRegexp());
         return matchAlert;
     }
 

src/main/java/yagura/model/MatchAlertItem.java

@@ -378,13 +378,14 @@ public AutoResponderItem getItem() {
         item.setReplace(this.txtRepReplace.getText());
         item.setBodyOnly(this.chkBodyOnly.isSelected());
         item.setContentType(ConvertUtil.toEmpty(this.cmbContentType.getEditor().getItem()));
+        item.recompileRegex(!item.isRegexp());
         return item;
     }
 
     /**
      * @param item the item to set
      */
-    public void setItem(AutoResponderItem item) {     
+    public void setItem(AutoResponderItem item) {
         if (item.getMethod() == null) {
             this.chkAnyMethod.setSelected(true);
             this.txtMethod.setText("");

src/main/java/yagura/view/AutoResponderItemDlg.java

@@ -238,7 +238,7 @@ public void valueChanged(ListSelectionEvent e) {
         this.tableAutoResponder.getColumnModel().getColumn(1).setMinWidth(40);
         this.tableAutoResponder.getColumnModel().getColumn(1).setPreferredWidth(60);
         this.tableAutoResponder.getColumnModel().getColumn(1).setMaxWidth(80);
-        
+
         // match
 //        this.tableAutoResponder.getColumnModel().getColumn(2).setMinWidth(40);
 //        this.tableAutoResponder.getColumnModel().getColumn(2).setPreferredWidth(100);
@@ -391,7 +391,6 @@ private AutoResponderItem getEditItem() {
         Object editRows[] = SwingUtil.editItem(this.tableAutoResponder);
         if (editRows != null) {
             item = AutoResponderItem.fromObjects(editRows);
-            item.recompileRegex();
         }
         return item;
     }

src/main/java/yagura/view/AutoResponderTab.java

@@ -581,13 +581,12 @@ public void componentShown(ComponentEvent e) {
      */
     public MatchAlertItem getItem() {
         MatchAlertItem item = new MatchAlertItem();
-        item.setType((String) this.cmbAlertType.getSelectedItem());
-        item.setMatch(this.txtAlertMatch.getText());
-
         item.setSmartMatch(this.chkSmartMatch.isSelected());
         item.setRegexp(this.chkRegExp.isSelected());
         item.setIgnoreCase(this.chkIgnoreCase.isSelected());
         item.setCaptureGroup(this.chkCaptureGroup.isSelected());
+        item.setType((String) this.cmbAlertType.getSelectedItem());
+        item.setMatch(this.txtAlertMatch.getText());
 
         //item.setNotifyType((MatchItem.NotifyType) this.cmbAlertNotify.getSelectedItem());
         EnumSet<NotifyType> notifys = EnumSet.noneOf(NotifyType.class);
@@ -645,6 +644,7 @@ public MatchAlertItem getItem() {
             String confidence = (String) this.cmbConfidence.getSelectedItem();
             item.setConfidence(Confidence.parseEnum(confidence));
         }
+        item.recompileRegex(!item.isRegexp());
         return item;
     }
 

src/main/java/yagura/view/MatchAlertItemDlg.java

@@ -313,13 +313,14 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     public MatchReplaceItem getItem() {
         MatchReplaceItem item = new MatchReplaceItem();
         item.setSelected(true);
-        item.setType((String) this.cmbRepType.getSelectedItem());
-        item.setMatch(this.txtRepMatch.getText());
         item.setSmartMatch(this.chkSmartMatch.isSelected());
         item.setRegexp(this.chkRegExp.isSelected());
         item.setIgnoreCase(this.chkIgnoreCase.isSelected());
+        item.setType((String) this.cmbRepType.getSelectedItem());
+        item.setMatch(this.txtRepMatch.getText());
         item.setReplace(this.txtRepReplace.getText());
         item.setMetaChar(this.chkMetaChar.isSelected());
+        item.recompileRegex(!item.isRegexp());
         return item;
     }
 

src/main/java/yagura/view/MatchReplaceItemDlg.java

@@ -484,7 +484,6 @@ protected void done() {
             };
             swParam.execute();
             // Decode状態を戻す
-            BurpExtension.helpers().outPrintln("toggleDecode:" + toggleDecode);
             this.btnDecode.setSelected(toggleDecode);
             this.textModified = false;
         }