ToolbarにBurp Configボタン追加

Author: isayan

release/YaguraExtension-v3.2.jar

@@ -288,6 +288,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBurpOptionActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JButton" name="btnBurpConfig">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/yagura/resources/cog.png"/>
+            </Property>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>

src/main/java/yagura/view/BurpToolBar.form

@@ -8,6 +8,7 @@
 import extension.burp.BurpUtil;
 import extension.helpers.FileUtil;
 import extension.helpers.StringUtil;
+import java.awt.Frame;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -19,6 +20,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -89,6 +91,7 @@ private void initComponents() {
         btnWrapTabLayout = new javax.swing.JButton();
         btnScrollTabLayout = new javax.swing.JButton();
         btnBurpOption = new javax.swing.JButton();
+        btnBurpConfig = new javax.swing.JButton();
 
         mnuLoadProjectSettings.setText("Load project settings");
         mnuLoadProjectSettings.setToolTipText("");
@@ -295,6 +298,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         toolBar.add(btnBurpOption);
 
+        btnBurpConfig.setIcon(new javax.swing.ImageIcon(getClass().getResource("/yagura/resources/cog.png"))); // NOI18N
+        btnBurpConfig.setFocusable(false);
+        btnBurpConfig.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        btnBurpConfig.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        toolBar.add(btnBurpConfig);
+
         add(toolBar, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
@@ -322,29 +331,24 @@ public void stateChanged(ChangeEvent e) {
     private void customizeComponents() {
         this.cmbProfile.setModel(this.modelProfile);
         this.renewProfile();
-        JToggleButton button = BurpUtil.findSuiteIntercept(BurpUtil.suiteFrame());
+        Frame frame = BurpUtil.suiteFrame();
+        JToggleButton button = BurpUtil.findSuiteIntercept(frame);
         if (button != null) {
             this.tglButtonChangeListener.stateChanged(new ChangeEvent(button));
             button.addChangeListener(this.tglButtonChangeListener);
         }
 
-        this.popupInterceptOption.addPopupMenuListener(new PopupMenuListener() {
-            @Override
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-
-            }
-
-            @Override
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-
-            }
-
-            @Override
-            public void popupMenuCanceled(PopupMenuEvent e) {
+        final JButton setting = BurpUtil.findSuiteButton("settingsButton", frame);
+        this.btnBurpConfig.setVisible(setting != null);
+        if (setting != null) {
+            this.btnBurpConfig.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    setting.doClick();
+                }
+            });
 
-            }
-        });
-//        this.timer.schedule(this.task, 0, this.interval_time);
+        }
     }
 
     public boolean isInterceptEnabled() {
@@ -502,12 +506,6 @@ private void mnuSaveProjectSettingsActionPerformed(java.awt.event.ActionEvent ev
         }
     }//GEN-LAST:event_mnuSaveProjectSettingsActionPerformed
 
-//        Frame frame = BurpUtil.suiteFrame();
-//        JButton setting = BurpUtil.findSuiteButton("settingsButton", frame);
-//        if (setting != null) {
-//            setting.doClick();
-//        }
-
     /**
      * Intercept requests based on the following rules
      * Request interception rules
@@ -546,6 +544,7 @@ private void mnuChkInterceptInScopeOnlyActionPerformed(java.awt.event.ActionEven
     }//GEN-LAST:event_mnuChkInterceptInScopeOnlyActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton btnBurpConfig;
     private javax.swing.JButton btnBurpOption;
     private javax.swing.JButton btnInterceptOption;
     private javax.swing.JButton btnOpenBrowser;