feat(ui): add verifiable indicators and editable issue properties

Author: TheArqsz

src/main/java/com/arqsz/burpgitleaks/BurpExtender.java

@@ -122,7 +122,7 @@ private RegisteredComponents registerComponents(MontoyaApi api, GitleaksConfigur
                 templateManager, issuesTab);
         api.userInterface().registerContextMenuItemsProvider(menuProvider);
 
-        SettingsTab settingsTab = new SettingsTab(api, scanCheck, settings, config.rules(), (visible) -> {
+        SettingsTab settingsTab = new SettingsTab(api, scanCheck, settings, config.rules(), templateManager, (visible) -> {
             if (visible)
                 registerIssuesTab();
             else

src/main/java/com/arqsz/burpgitleaks/ui/IssuesTab.java

@@ -17,7 +17,9 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.swing.DefaultCellEditor;
 import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -45,6 +47,7 @@
 import burp.api.montoya.core.Marker;
 import burp.api.montoya.http.message.HttpRequestResponse;
 import burp.api.montoya.scanner.audit.issues.AuditIssue;
+import burp.api.montoya.scanner.audit.issues.AuditIssueConfidence;
 import burp.api.montoya.scanner.audit.issues.AuditIssueSeverity;
 import burp.api.montoya.ui.editor.HttpRequestEditor;
 import burp.api.montoya.ui.editor.HttpResponseEditor;
@@ -98,6 +101,13 @@ public IssuesTab(MontoyaApi api, String tabTitle, TemplateManager templateManage
         add(topPanel, BorderLayout.NORTH);
 
         table = new JTable(model);
+
+        JComboBox<AuditIssueSeverity> severityCombo = new JComboBox<>(AuditIssueSeverity.values());
+        table.getColumnModel().getColumn(4).setCellEditor(new DefaultCellEditor(severityCombo));
+
+        JComboBox<AuditIssueConfidence> confidenceCombo = new JComboBox<>(AuditIssueConfidence.values());
+        table.getColumnModel().getColumn(5).setCellEditor(new DefaultCellEditor(confidenceCombo));
+
         table.setAutoCreateRowSorter(true);
         table.setFillsViewportHeight(true);
         table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -157,13 +167,17 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
         JMenuItem copyUrl = new JMenuItem("Copy URL");
         copyUrl.addActionListener(e -> copySelectedUrls());
 
-        JMenuItem deleteItem = new JMenuItem("Delete Selected Issue(s)");
+        JMenuItem deleteItem = new JMenuItem("Delete selected issue(s)");
         deleteItem.addActionListener(e -> deleteSelectedIssues());
 
+        JMenuItem restoreItem = new JMenuItem("Restore original value");
+        restoreItem.addActionListener(e -> restoreSelectedDefaults());
+
         popupMenu.add(sendToRepeater);
         popupMenu.add(copyUrl);
         popupMenu.addSeparator();
         popupMenu.add(deleteItem);
+        popupMenu.add(restoreItem);
 
         final int staticItemCount = popupMenu.getComponentCount();
 
@@ -240,6 +254,17 @@ public void popupMenuCanceled(PopupMenuEvent e) {
         });
     }
 
+    private void restoreSelectedDefaults() {
+        int[] selectedRows = table.getSelectedRows();
+        if (selectedRows.length == 0)
+            return;
+
+        for (int viewRow : selectedRows) {
+            int modelRow = table.convertRowIndexToModel(viewRow);
+            model.restoreDefaults(modelRow);
+        }
+    }
+
     public boolean addIssue(AuditIssue issue) {
         String sig = generateSignature(issue);
         if (threadSafeSignatures.contains(sig)) {
@@ -505,7 +530,30 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
         }
     }
 
-    private record IssueEntry(int id, LocalDateTime timestamp, AuditIssue issue) {
+    private static class IssueEntry {
+        final int id;
+        final LocalDateTime timestamp;
+        final AuditIssue originalIssue;
+
+        AuditIssueSeverity userSeverity;
+        AuditIssueConfidence userConfidence;
+
+        public IssueEntry(int id, LocalDateTime timestamp, AuditIssue issue) {
+            this.id = id;
+            this.timestamp = timestamp;
+            this.originalIssue = issue;
+            this.userSeverity = issue.severity();
+            this.userConfidence = issue.confidence();
+        }
+
+        public void reset() {
+            this.userSeverity = originalIssue.severity();
+            this.userConfidence = originalIssue.confidence();
+        }
+
+        public AuditIssue issue() {
+            return originalIssue;
+        }
     }
 
     private static class IssuesTableModel extends AbstractTableModel {
@@ -526,6 +574,14 @@ public void removeRow(int row) {
             }
         }
 
+        public void restoreDefaults(int row) {
+            if (row >= 0 && row < entries.size()) {
+                entries.get(row).reset();
+                fireTableCellUpdated(row, 4);
+                fireTableCellUpdated(row, 5);
+            }
+        }
+
         public void clear() {
             entries.clear();
             nextId = 1;
@@ -536,6 +592,11 @@ public AuditIssue getIssue(int row) {
             return entries.get(row).issue();
         }
 
+        @Override
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return columnIndex == 4 || columnIndex == 5;
+        }
+
         @Override
         public int getRowCount() {
             return entries.size();
@@ -561,23 +622,35 @@ public Class<?> getColumnClass(int columnIndex) {
             return String.class;
         }
 
+        @Override
+        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+            IssueEntry e = entries.get(rowIndex);
+            if (columnIndex == 4 && aValue instanceof AuditIssueSeverity) {
+                e.userSeverity = (AuditIssueSeverity) aValue;
+                fireTableCellUpdated(rowIndex, columnIndex);
+            } else if (columnIndex == 5 && aValue instanceof AuditIssueConfidence) {
+                e.userConfidence = (AuditIssueConfidence) aValue;
+                fireTableCellUpdated(rowIndex, columnIndex);
+            }
+        }
+
         @Override
         public Object getValueAt(int row, int col) {
             IssueEntry e = entries.get(row);
-            AuditIssue i = e.issue();
+            AuditIssue i = e.originalIssue;
             switch (col) {
                 case 0:
-                    return e.id();
+                    return e.id;
                 case 1:
-                    return e.timestamp();
+                    return e.timestamp;
                 case 2:
                     return i.name();
                 case 3:
                     return i.baseUrl();
                 case 4:
-                    return i.severity().name();
+                    return e.userSeverity.name();
                 case 5:
-                    return i.confidence().name();
+                    return e.userConfidence.name();
                 default:
                     return "";
             }

src/main/java/com/arqsz/burpgitleaks/ui/SettingsTab.java

@@ -2,6 +2,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Graphics;
@@ -39,13 +40,15 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableRowSorter;
 
 import com.arqsz.burpgitleaks.config.GitleaksRule;
 import com.arqsz.burpgitleaks.config.PluginSettings;
 import com.arqsz.burpgitleaks.config.RuleLoader;
 import com.arqsz.burpgitleaks.config.RuleLoader.GitleaksConfiguration;
 import com.arqsz.burpgitleaks.scan.GitleaksScanCheck;
+import com.arqsz.burpgitleaks.verification.TemplateManager;
 
 import burp.api.montoya.MontoyaApi;
 
@@ -55,6 +58,7 @@ public class SettingsTab extends JPanel {
     private final GitleaksScanCheck scanCheck;
     private final PluginSettings settings;
     private final ExecutorService executor;
+    private final TemplateManager templateManager;
     private final RulesTableModel rulesModel;
     private List<GitleaksRule> currentRules;
 
@@ -73,13 +77,15 @@ protected void paintComponent(Graphics g) {
     private final Consumer<Boolean> onIssuesTabVisibilityChange;
 
     public SettingsTab(MontoyaApi api, GitleaksScanCheck scanCheck, PluginSettings settings,
-            List<GitleaksRule> initialRules, Consumer<Boolean> onIssuesTabVisibilityChange) {
+            List<GitleaksRule> initialRules, TemplateManager templateManager,
+            Consumer<Boolean> onIssuesTabVisibilityChange) {
         this.api = api;
         this.scanCheck = scanCheck;
         this.settings = settings;
+        this.templateManager = templateManager;
         this.currentRules = initialRules;
         this.onIssuesTabVisibilityChange = onIssuesTabVisibilityChange;
-        this.rulesModel = new RulesTableModel(initialRules, settings.getDisabledRules());
+        this.rulesModel = new RulesTableModel(initialRules, settings.getDisabledRules(), templateManager);
         this.executor = Executors.newSingleThreadExecutor();
 
         setLayout(new BorderLayout());
@@ -280,6 +286,8 @@ public String getToolTipText(java.awt.event.MouseEvent e) {
         table.setFillsViewportHeight(true);
         table.setRowHeight(24);
 
+        table.setDefaultRenderer(Boolean.class, new BooleanRenderer());
+
         JPopupMenu popup = new JPopupMenu();
         addCopyMenuItem(popup, table, "Copy Source", 1);
         addCopyMenuItem(popup, table, "Copy Rule ID", 2);
@@ -316,7 +324,8 @@ private void filter() {
         table.getColumnModel().getColumn(1).setPreferredWidth(100);
         table.getColumnModel().getColumn(1).setMaxWidth(350);
         table.getColumnModel().getColumn(2).setPreferredWidth(200);
-        table.getColumnModel().getColumn(3).setPreferredWidth(400);
+        table.getColumnModel().getColumn(3).setMaxWidth(80);
+        table.getColumnModel().getColumn(4).setPreferredWidth(400);
 
         p.add(new JScrollPane(table), BorderLayout.CENTER);
 
@@ -560,11 +569,13 @@ private void setConfigBadge(String text, Color bg) {
     }
 
     private static class RulesTableModel extends AbstractTableModel {
-        private final String[] cols = { "Enabled", "Source", "Rule ID", "Description" };
+        private final String[] cols = { "Enabled", "Source", "Rule ID", "Verifiable", "Description" };
         private List<GitleaksRule> rules;
         private List<Boolean> enabledState;
+        private final TemplateManager templateManager;
 
-        public RulesTableModel(List<GitleaksRule> rules, List<String> disabledIds) {
+        public RulesTableModel(List<GitleaksRule> rules, List<String> disabledIds, TemplateManager templateManager) {
+            this.templateManager = templateManager;
             setRules(rules, disabledIds);
         }
 
@@ -603,7 +614,7 @@ public String getColumnName(int col) {
 
         @Override
         public Class<?> getColumnClass(int col) {
-            return col == 0 ? Boolean.class : String.class;
+            return (col == 0 || col == 3) ? Boolean.class : String.class;
         }
 
         @Override
@@ -622,6 +633,8 @@ public Object getValueAt(int row, int col) {
                 case 2:
                     return rule.getId();
                 case 3:
+                    return templateManager.hasTemplate(rule.getId());
+                case 4:
                     return rule.getDescription();
                 default:
                     return null;
@@ -635,4 +648,41 @@ public void setValueAt(Object val, int row, int col) {
             fireTableCellUpdated(row, col);
         }
     }
+
+    private static class BooleanRenderer extends JPanel implements TableCellRenderer {
+        private final JCheckBox checkBox = new JCheckBox();
+
+        public BooleanRenderer() {
+            super(new GridBagLayout());
+
+            setOpaque(true);
+            checkBox.setOpaque(false);
+            checkBox.setHorizontalAlignment(JLabel.CENTER);
+
+            add(checkBox);
+        }
+
+        @Override
+        public Component getTableCellRendererComponent(JTable table, Object value,
+                boolean isSelected, boolean hasFocus, int row, int column) {
+
+            if (isSelected) {
+                setBackground(table.getSelectionBackground());
+                checkBox.setForeground(table.getSelectionForeground());
+            } else {
+                Color alternateColor = UIManager.getColor("Table.alternateRowColor");
+                if (alternateColor != null && row % 2 != 0) {
+                    setBackground(alternateColor);
+                } else {
+                    setBackground(table.getBackground());
+                }
+
+                checkBox.setForeground(table.getForeground());
+            }
+
+            checkBox.setSelected(value != null && (Boolean) value);
+
+            return this;
+        }
+    }
 }