admin/HaE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version: 2.2.3 Update

Browse Source
This commit is contained in:
AnonymousUser
2022-05-12 11:00:55 +08:00
parent 1238e536d1
commit 15f84028bb
5 changed files with 204 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/burp/BurpExtender.java
View File

@@ -32,7 +32,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
this.callbacks = callbacks; this.callbacks = callbacks;
BurpExtender.helpers = callbacks.getHelpers(); BurpExtender.helpers = callbacks.getHelpers();
String version = "2.2.2"; String version = "2.2.3";
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version)); callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
// 定义输出 // 定义输出
stdout = new PrintWriter(callbacks.getStdout(), true); stdout = new PrintWriter(callbacks.getStdout(), true);
@@ -159,7 +159,10 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
for (int row : selectRows) { for (int row : selectRows) {
selectData.append(jTable.getValueAt(row, 0).toString()).append("\n"); selectData.append(jTable.getValueAt(row, 0).toString()).append("\n");
} }
return helpers.stringToBytes(selectData.toString()); // 便于单行复制，去除最后一个换行符
String revData = selectData.reverse().toString().replaceFirst("\n", "");
StringBuilder retData = new StringBuilder(revData).reverse();
return helpers.stringToBytes(retData.toString());
} }
/** /**

2
src/main/java/burp/Config.java
View File

@@ -4,7 +4,6 @@ package burp;
* @author EvilChen * @author EvilChen
*/ */
import burp.yaml.LoadConfig;
import java.util.Map; import java.util.Map;
public class Config { public class Config {
@@ -25,7 +24,6 @@ public class Config {
"dfa" "dfa"
}; };
public static String[] colorArray = new String[] { public static String[] colorArray = new String[] {
"red", "red",
"orange", "orange",

236
src/main/java/burp/ui/MainUI.java
View File

@@ -24,23 +24,24 @@ public class MainUI extends JPanel{
public MainUI() { public MainUI() {
initComponents(); initComponents();
} }
public void closeTabActionPerformed(ActionEvent e){ public void closeTabActionPerformed(ActionEvent e){
if (tabbedPane1.getTabCount()>2){ if (ruleTabbedPane.getTabCount()>2){
if (tabbedPane1.getSelectedIndex()!=0){ if (ruleTabbedPane.getSelectedIndex()!=0){
SetConfig setConn = new SetConfig(); SetConfig setConn = new SetConfig();
setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex())); setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
tabbedPane1.remove(tabbedPane1.getSelectedIndex()); ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()-1); ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex()-1);
}else{ }else{
SetConfig setConn = new SetConfig(); SetConfig setConn = new SetConfig();
setConn.deleteRules(tabbedPane1.getTitleAt(tabbedPane1.getSelectedIndex())); setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
tabbedPane1.remove(tabbedPane1.getSelectedIndex()); ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
tabbedPane1.setSelectedIndex(tabbedPane1.getSelectedIndex()); ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex());
} }
} }
} }
private void SelectFileMouseClicked(MouseEvent e) { private void selectFileMouseClicked(MouseEvent e) {
JFileChooser selectFile = new JFileChooser(); JFileChooser selectFile = new JFileChooser();
selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY); selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml"); FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
@@ -50,21 +51,22 @@ public class MainUI extends JPanel{
String configPath = selectFile.getSelectedFile().toString(); String configPath = selectFile.getSelectedFile().toString();
reloadRule(); reloadRule();
loadConn.setConfigPath(configPath); loadConn.setConfigPath(configPath);
configFilepathtext.setText(configPath); configTextField.setText(configPath);
} }
new LoadConfig();
} }
private void reloadRule(){ private void reloadRule(){
tabbedPane1.removeAll(); ruleTabbedPane.removeAll();
ruleSwitch.setListen(false); ruleSwitch.setListen(false);
Map<String,Object[][]> rules = LoadConfig.getRules(); Map<String,Object[][]> rules = LoadConfig.getRules();
rules.keySet().forEach( rules.keySet().forEach(
i->tabbedPane1.addTab( i-> ruleTabbedPane.addTab(
i, i,
new RulePane(rules.get(i), tabbedPane1) new RulePane(rules.get(i), ruleTabbedPane)
) )
); );
tabbedPane1.addTab("...", new JLabel()); ruleTabbedPane.addTab("...", new JLabel());
ruleSwitch.setListen(true); ruleSwitch.setListen(true);
} }
@@ -72,205 +74,199 @@ public class MainUI extends JPanel{
reloadRule(); reloadRule();
} }
private void ESSaveMouseClicked(MouseEvent e) { private void excludeSuffixSaveMouseClicked(MouseEvent e) {
LoadConfig loadCon = new LoadConfig(); LoadConfig loadCon = new LoadConfig();
loadCon.setExcludeSuffix(EStext.getText()); loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
} }
private void initComponents() { private void initComponents() {
tabbedPane2 = new JTabbedPane(); rulesTabbedPane = new JTabbedPane();
tabbedPane1 = new JTabbedPane(); ruleTabbedPane = new JTabbedPane();
panel3 = new JPanel(); rulePanel = new JPanel();
configFilepathtext = new JTextField(); configTextField = new JTextField();
label1 = new JLabel(); configLabel = new JLabel();
SelectFile = new JButton(); selectFileButton = new JButton();
reload = new JButton(); reloadButton = new JButton();
label2 = new JLabel(); excludeSuffixLabel = new JLabel();
EStext = new JTextField(); excludeSuffixTextField = new JTextField();
ESSave = new JButton(); excludeSuffixSaveButton = new JButton();
//======== this ========
setLayout(new GridBagLayout()); setLayout(new GridBagLayout());
((GridBagLayout)getLayout()).columnWidths = new int[] {0, 0}; ((GridBagLayout)getLayout()).columnWidths = new int[] {0, 0};
((GridBagLayout)getLayout()).rowHeights = new int[] {0, 0}; ((GridBagLayout)getLayout()).rowHeights = new int[] {0, 0};
((GridBagLayout)getLayout()).columnWeights = new double[] {1.0, 1.0E-4}; ((GridBagLayout)getLayout()).columnWeights = new double[] {1.0, 1.0E-4};
((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4}; ((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4};
//======== tabbedPane2 ========
{ {
tabbedPane2.addTab("Rules", tabbedPane1); rulesTabbedPane.addTab("Rules", ruleTabbedPane);
//======== panel3 ========
{ {
panel3.setLayout(new GridBagLayout()); rulePanel.setLayout(new GridBagLayout());
((GridBagLayout)panel3.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0}; ((GridBagLayout) rulePanel.getLayout()).columnWidths = new int[] {0, 0, 0, 0, 0};
((GridBagLayout)panel3.getLayout()).rowHeights = new int[] {0, 0, 0}; ((GridBagLayout) rulePanel.getLayout()).rowHeights = new int[] {0, 0, 0};
((GridBagLayout)panel3.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4}; ((GridBagLayout) rulePanel.getLayout()).columnWeights = new double[] {0.0, 1.0, 0.0, 0.0, 1.0E-4};
((GridBagLayout)panel3.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4}; ((GridBagLayout) rulePanel.getLayout()).rowWeights = new double[] {0.0, 0.0, 1.0E-4};
//---- configFilepathtext ---- configTextField.setEditable(false);
configFilepathtext.setEditable(false); rulePanel.add(configTextField, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
panel3.add(configFilepathtext, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(5, 0, 5, 5), 0, 0)); new Insets(5, 0, 5, 5), 0, 0));
//---- label1 ---- configLabel.setText("Config File Path:");
label1.setText("Config File Path:"); rulePanel.add(configLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
panel3.add(label1, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.WEST, GridBagConstraints.VERTICAL, GridBagConstraints.WEST, GridBagConstraints.VERTICAL,
new Insets(5, 5, 5, 5), 0, 0)); new Insets(5, 5, 5, 5), 0, 0));
//---- SelectFile ---- selectFileButton.setText("Select File ...");
SelectFile.setText("Select File ..."); selectFileButton.addMouseListener(new MouseAdapter() {
SelectFile.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
SelectFileMouseClicked(e); selectFileMouseClicked(e);
} }
}); });
panel3.add(SelectFile, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, rulePanel.add(selectFileButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(5, 0, 5, 5), 0, 0)); new Insets(5, 0, 5, 5), 0, 0));
//---- reload ---- reloadButton.setText("Reload");
reload.setText("Reload"); reloadButton.addMouseListener(new MouseAdapter() {
reload.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
reloadMouseClicked(e); reloadMouseClicked(e);
} }
}); });
panel3.add(reload, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, rulePanel.add(reloadButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(5, 0, 5, 5), 0, 0)); new Insets(5, 0, 5, 5), 0, 0));
//---- label2 ----
label2.setText("ExcludeSuffix:"); excludeSuffixLabel.setText("ExcludeSuffix:");
panel3.add(label2, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, rulePanel.add(excludeSuffixLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE,
new Insets(0, 5, 5, 5), 0, 0)); new Insets(0, 5, 5, 5), 0, 0));
panel3.add(EStext, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, rulePanel.add(excludeSuffixTextField, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL, GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 5), 0, 0)); new Insets(0, 0, 0, 5), 0, 0));
//---- ESSave ---- excludeSuffixSaveButton.setText("Save");
ESSave.setText("Save"); excludeSuffixSaveButton.addMouseListener(new MouseAdapter() {
ESSave.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
ESSaveMouseClicked(e); excludeSuffixSaveMouseClicked(e);
} }
}); });
panel3.add(ESSave, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, rulePanel.add(excludeSuffixSaveButton, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL, GridBagConstraints.SOUTH, GridBagConstraints.HORIZONTAL,
new Insets(0, 0, 0, 5), 0, 0)); new Insets(0, 0, 0, 5), 0, 0));
} }
tabbedPane2.addTab("Config", panel3); rulesTabbedPane.addTab("Config", rulePanel);
} }
add(tabbedPane2, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, add(rulesTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 0, 0, 0), 0, 0)); new Insets(0, 0, 0, 0), 0, 0));
// JFormDesigner - End of component initialization //GEN-END:initComponents
Config.ruleConfig.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1))); Config.ruleConfig.keySet().forEach(i-> ruleTabbedPane.addTab(i,new RulePane(Config.ruleConfig.get(i),
ruleTabbedPane)));
tabbedPane1.addTab("...",new JLabel()); ruleTabbedPane.addTab("...",new JLabel());
//TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1); configTextField.setText(LoadConfig.getConfigPath());
configFilepathtext.setText(LoadConfig.getConfigPath()); excludeSuffixTextField.setText(loadConn.getExcludeSuffix());
EStext.setText(loadConn.getExcludeSuffix()); ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
ruleSwitch = new TabTitleEditListener(tabbedPane1); ruleTabbedPane.addChangeListener(ruleSwitch);
tabbedPane1.addChangeListener(ruleSwitch); ruleTabbedPane.addMouseListener(ruleSwitch);
tabbedPane1.addMouseListener(ruleSwitch); closeTabMenuItem.addActionListener(e -> closeTabActionPerformed(e));
closeTab.addActionListener(e -> closeTabActionPerformed(e)); tabMenu.add(closeTabMenuItem);
tabMenu.add(closeTab);
} }
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables private JTabbedPane rulesTabbedPane;
private JTabbedPane tabbedPane2; private JTabbedPane ruleTabbedPane;
private JTabbedPane tabbedPane1; private JPanel rulePanel;
private JPanel panel3; private JTextField configTextField;
private JTextField configFilepathtext; private JLabel configLabel;
private JLabel label1; private JButton selectFileButton;
private JButton SelectFile; private JButton reloadButton;
private JButton reload; private JLabel excludeSuffixLabel;
private JLabel label2; private JTextField excludeSuffixTextField;
private JTextField EStext; private JButton excludeSuffixSaveButton;
private JButton ESSave;
// JFormDesigner - End of variables declaration //GEN-END:variables
protected static JPopupMenu tabMenu = new JPopupMenu(); protected static JPopupMenu tabMenu = new JPopupMenu();
private JMenuItem closeTab = new JMenuItem("Delete"); private JMenuItem closeTabMenuItem = new JMenuItem("Delete");
private TabTitleEditListener ruleSwitch; private TabTitleEditListener ruleSwitch;
} }
class TabTitleEditListener extends MouseAdapter implements ChangeListener, DocumentListener { class TabTitleEditListener extends MouseAdapter implements ChangeListener, DocumentListener {
protected final JTextField editor = new JTextField(); protected final JTextField ruleEditTextField = new JTextField();
protected final JTabbedPane tabbedPane; protected final JTabbedPane ruleEditTabbedPane;
protected int editingIdx = -1; protected int editingIndex = -1;
protected int len = -1; protected int len = -1;
protected Boolean listen = true; protected Boolean listen = true;
protected Dimension dim; protected Dimension dim;
protected Component tabComponent; protected Component tabComponent;
protected Boolean isRenameOk = false; protected Boolean isRenameOk = false;
protected SetConfig setConfig = new SetConfig(); protected SetConfig setConfig = new SetConfig();
protected final Action startEditing = new AbstractAction() { protected final Action startEditing = new AbstractAction() {
@Override public void actionPerformed(ActionEvent e) { @Override public void actionPerformed(ActionEvent e) {
editingIdx = tabbedPane.getSelectedIndex(); editingIndex = ruleEditTabbedPane.getSelectedIndex();
tabComponent = tabbedPane.getTabComponentAt(editingIdx); tabComponent = ruleEditTabbedPane.getTabComponentAt(editingIndex);
tabbedPane.setTabComponentAt(editingIdx, editor); ruleEditTabbedPane.setTabComponentAt(editingIndex, ruleEditTextField);
isRenameOk = true; isRenameOk = true;
editor.setVisible(true); ruleEditTextField.setVisible(true);
editor.setText(tabbedPane.getTitleAt(editingIdx)); ruleEditTextField.setText(ruleEditTabbedPane.getTitleAt(editingIndex));
editor.selectAll(); ruleEditTextField.selectAll();
editor.requestFocusInWindow(); ruleEditTextField.requestFocusInWindow();
len = editor.getText().length(); len = ruleEditTextField.getText().length();
dim = editor.getPreferredSize(); dim = ruleEditTextField.getPreferredSize();
editor.setMinimumSize(dim); ruleEditTextField.setMinimumSize(dim);
} }
}; };
protected final Action renameTabTitle = new AbstractAction() { protected final Action renameTabTitle = new AbstractAction() {
@Override public void actionPerformed(ActionEvent e) { @Override public void actionPerformed(ActionEvent e) {
String title = editor.getText().trim(); String title = ruleEditTextField.getText().trim();
if (editingIdx >= 0 && !title.isEmpty()) { if (editingIndex >= 0 && !title.isEmpty()) {
String oldName = tabbedPane.getTitleAt(editingIdx); String oldName = ruleEditTabbedPane.getTitleAt(editingIndex);
tabbedPane.setTitleAt(editingIdx, title); ruleEditTabbedPane.setTitleAt(editingIndex, title);
setConfig.rename(oldName,title); setConfig.rename(oldName,title);
} }
cancelEditing.actionPerformed(null); cancelEditing.actionPerformed(null);
} }
}; };
protected final Action cancelEditing = new AbstractAction() { protected final Action cancelEditing = new AbstractAction() {
@Override public void actionPerformed(ActionEvent e) { @Override public void actionPerformed(ActionEvent e) {
if (editingIdx >= 0) { if (editingIndex >= 0) {
tabbedPane.setTabComponentAt(editingIdx, tabComponent); ruleEditTabbedPane.setTabComponentAt(editingIndex, tabComponent);
editor.setVisible(false); ruleEditTextField.setVisible(false);
editingIdx = -1; editingIndex = -1;
len = -1; len = -1;
tabComponent = null; tabComponent = null;
editor.setPreferredSize(null); ruleEditTextField.setPreferredSize(null);
tabbedPane.requestFocusInWindow(); ruleEditTabbedPane.requestFocusInWindow();
} }
} }
}; };
protected TabTitleEditListener(JTabbedPane tabbedPane) { protected TabTitleEditListener(JTabbedPane tabbedPane) {
super(); super();
this.tabbedPane = tabbedPane; this.ruleEditTabbedPane = tabbedPane;
editor.setBorder(BorderFactory.createEmptyBorder()); ruleEditTextField.setBorder(BorderFactory.createEmptyBorder());
editor.addFocusListener(new FocusAdapter() { ruleEditTextField.addFocusListener(new FocusAdapter() {
@Override public void focusLost(FocusEvent e) { @Override public void focusLost(FocusEvent e) {
renameTabTitle.actionPerformed(null); renameTabTitle.actionPerformed(null);
} }
}); });
InputMap im = editor.getInputMap(JComponent.WHEN_FOCUSED); InputMap im = ruleEditTextField.getInputMap(JComponent.WHEN_FOCUSED);
ActionMap am = editor.getActionMap(); ActionMap am = ruleEditTextField.getActionMap();
im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel-editing"); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel-editing");
am.put("cancel-editing", cancelEditing); am.put("cancel-editing", cancelEditing);
im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "rename-tab-title"); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "rename-tab-title");
am.put("rename-tab-title", renameTabTitle); am.put("rename-tab-title", renameTabTitle);
editor.getDocument().addDocumentListener(this); ruleEditTextField.getDocument().addDocumentListener(this);
tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing"); tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing");
tabbedPane.getActionMap().put("start-editing", startEditing); tabbedPane.getActionMap().put("start-editing", startEditing);
} }
@Override public void stateChanged(ChangeEvent e) { @Override public void stateChanged(ChangeEvent e) {
if (e.getSource() instanceof JTabbedPane && listen) { if (e.getSource() instanceof JTabbedPane && listen) {
JTabbedPane pane = (JTabbedPane) e.getSource(); JTabbedPane pane = (JTabbedPane) e.getSource();
@@ -286,18 +282,22 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
} }
renameTabTitle.actionPerformed(null); renameTabTitle.actionPerformed(null);
} }
public void newTab(){ public void newTab(){
Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}}; Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
insertTab(tabbedPane, setConfig.newRules(),data); insertTab(ruleEditTabbedPane, setConfig.newRules(),data);
} }
public void insertTab(JTabbedPane pane,String title,Object[][] data){ public void insertTab(JTabbedPane pane,String title,Object[][] data){
pane.addTab(title,new RulePane(data,pane)); pane.addTab(title,new RulePane(data,pane));
pane.remove(pane.getSelectedIndex()); pane.remove(pane.getSelectedIndex());
pane.addTab("...",new JLabel()); pane.addTab("...",new JLabel());
} }
public void setListen(Boolean listen){ public void setListen(Boolean listen){
this.listen = listen; this.listen = listen;
} }
@Override public void insertUpdate(DocumentEvent e) { @Override public void insertUpdate(DocumentEvent e) {
updateTabSize(); updateTabSize();
} }
@@ -312,7 +312,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
switch (e.getButton()){ switch (e.getButton()){
case 1: case 1:
{ {
Rectangle r = tabbedPane.getBoundsAt(tabbedPane.getSelectedIndex()); Rectangle r = ruleEditTabbedPane.getBoundsAt(ruleEditTabbedPane.getSelectedIndex());
boolean isDoubleClick = e.getClickCount() >= 2; boolean isDoubleClick = e.getClickCount() >= 2;
if (isDoubleClick && r.contains(e.getPoint())) { if (isDoubleClick && r.contains(e.getPoint())) {
startEditing.actionPerformed(null); startEditing.actionPerformed(null);
@@ -331,7 +331,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
} }
protected void updateTabSize() { protected void updateTabSize() {
editor.setPreferredSize(editor.getText().length() > len ? null : dim); ruleEditTextField.setPreferredSize(ruleEditTextField.getText().length() > len ? null : dim);
tabbedPane.revalidate(); ruleEditTabbedPane.revalidate();
} }
} }

74
src/main/java/burp/ui/RulePane.java
View File

@@ -30,54 +30,54 @@ public class RulePane extends JPanel {
Vector data = new Vector(); Vector data = new Vector();
data.add(false); data.add(false);
data.add(add.Name.getText()); data.add(add.Name.getText());
data.add(add.Regex.getText()); data.add(add.regexTextField.getText());
data.add(add.ColorSelect.getSelectedItem().toString()); data.add(add.colorComboBox.getSelectedItem().toString());
data.add(add.ScopeSelect.getSelectedItem().toString()); data.add(add.scopeComboBox.getSelectedItem().toString());
data.add(add.EngineSelect.getSelectedItem().toString()); data.add(add.engineComboBox.getSelectedItem().toString());
model.insertRow(model.getRowCount(), data); model.insertRow(model.getRowCount(), data);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
setConfig.add(data, pane.getTitleAt(pane.getSelectedIndex())); setConfig.add(data, pane.getTitleAt(pane.getSelectedIndex()));
} }
} }
private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){ private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
if (jTable.getSelectedRowCount() >= 1){ if (ruleTable.getSelectedRowCount() >= 1){
RuleSetting edit = new RuleSetting(); RuleSetting edit = new RuleSetting();
edit.Name.setText(jTable.getValueAt(jTable.getSelectedRow(), 1).toString()); edit.Name.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
edit.Regex.setText(jTable.getValueAt(jTable.getSelectedRow(), 2).toString()); edit.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
edit.ColorSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 3).toString()); edit.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
edit.ScopeSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 4).toString()); edit.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
edit.EngineSelect.setSelectedItem(jTable.getValueAt(jTable.getSelectedRow(), 5).toString()); edit.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
int isOk = JOptionPane.showConfirmDialog(null, edit, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION); int isOk = JOptionPane.showConfirmDialog(null, edit, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION);
if (isOk == 0){ if (isOk == 0){
int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
model.setValueAt(edit.Name.getText(), select, 1); model.setValueAt(edit.Name.getText(), select, 1);
model.setValueAt(edit.Regex.getText(), select, 2); model.setValueAt(edit.regexTextField.getText(), select, 2);
model.setValueAt(edit.ColorSelect.getSelectedItem().toString(), select, 3); model.setValueAt(edit.colorComboBox.getSelectedItem().toString(), select, 3);
model.setValueAt(edit.ScopeSelect.getSelectedItem().toString(), select, 4); model.setValueAt(edit.scopeComboBox.getSelectedItem().toString(), select, 4);
model.setValueAt(edit.EngineSelect.getSelectedItem().toString(), select, 5); model.setValueAt(edit.engineComboBox.getSelectedItem().toString(), select, 5);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex())); setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
} }
} }
} }
private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){ private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){
if (jTable.getSelectedRowCount() >= 1){ if (ruleTable.getSelectedRowCount() >= 1){
int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION); int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
if (isOk == 0){ if (isOk == 0){
int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
model.removeRow(select); model.removeRow(select);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
setConfig.remove(select, pane.getTitleAt(pane.getSelectedIndex())); setConfig.remove(select, pane.getTitleAt(pane.getSelectedIndex()));
} }
} }
} }
private void ruleTableChange(TableModelEvent e, JTabbedPane pane) { private void ruleTableChange(TableModelEvent e, JTabbedPane pane) {
if (e.getColumn() == 0 && jTable.getSelectedRow() != -1 && !isEdit){ if (e.getColumn() == 0 && ruleTable.getSelectedRow() != -1 && !isEdit){
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
int select = jTable.convertRowIndexToModel(jTable.getSelectedRow()); int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex())); setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
} }
} }
@@ -87,7 +87,7 @@ public class RulePane extends JPanel {
addButton = new JButton(); addButton = new JButton();
editButton = new JButton(); editButton = new JButton();
scrollPane = new JScrollPane(); scrollPane = new JScrollPane();
jTable = new JTable(); ruleTable = new JTable();
removeButton = new JButton(); removeButton = new JButton();
//======== this ======== //======== this ========
@@ -105,7 +105,7 @@ public class RulePane extends JPanel {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
isEdit = true; isEdit = true;
ruleAddMouseClicked(e, pane); ruleAddMouseClicked(e, pane);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
isEdit = false; isEdit = false;
} }
}); });
@@ -121,7 +121,7 @@ public class RulePane extends JPanel {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
isEdit = true; isEdit = true;
ruleEditMouseClicked(e, pane); ruleEditMouseClicked(e, pane);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
isEdit = false; isEdit = false;
} }
}); });
@@ -133,13 +133,13 @@ public class RulePane extends JPanel {
//======== scrollPane ======== //======== scrollPane ========
{ {
//---- table ---- //---- table ----
jTable.setShowVerticalLines(false); ruleTable.setShowVerticalLines(false);
jTable.setVerifyInputWhenFocusTarget(false); ruleTable.setVerifyInputWhenFocusTarget(false);
jTable.setUpdateSelectionOnSort(false); ruleTable.setUpdateSelectionOnSort(false);
jTable.setShowHorizontalLines(false); ruleTable.setShowHorizontalLines(false);
jTable.setModel(new DefaultTableModel()); ruleTable.setModel(new DefaultTableModel());
jTable.setSurrendersFocusOnKeystroke(true); ruleTable.setSurrendersFocusOnKeystroke(true);
scrollPane.setViewportView(jTable); scrollPane.setViewportView(ruleTable);
} }
add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0, add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0,
@@ -154,7 +154,7 @@ public class RulePane extends JPanel {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
isEdit = true; isEdit = true;
ruleRemoveMouseClicked(e, pane); ruleRemoveMouseClicked(e, pane);
model = (DefaultTableModel) jTable.getModel(); model = (DefaultTableModel) ruleTable.getModel();
isEdit = false; isEdit = false;
} }
}); });
@@ -164,7 +164,7 @@ public class RulePane extends JPanel {
new Insets(0, 5, 3, 2), 0, 0)); new Insets(0, 5, 3, 2), 0, 0));
// JFormDesigner - End of component initialization //GEN-END:initComponents // JFormDesigner - End of component initialization //GEN-END:initComponents
jTable.setModel(model); ruleTable.setModel(model);
model.setDataVector(data, title); model.setDataVector(data, title);
model.addTableModelListener(new TableModelListener() { model.addTableModelListener(new TableModelListener() {
@Override @Override
@@ -173,14 +173,14 @@ public class RulePane extends JPanel {
} }
}); });
jTable.setRowSorter(new TableRowSorter(model)); ruleTable.setRowSorter(new TableRowSorter(model));
} }
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
public JButton addButton; public JButton addButton;
public JButton editButton; public JButton editButton;
public JScrollPane scrollPane; public JScrollPane scrollPane;
public JTable jTable; public JTable ruleTable;
public JButton removeButton; public JButton removeButton;
// JFormDesigner - End of variables declaration //GEN-END:variables // JFormDesigner - End of variables declaration //GEN-END:variables
private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"}; private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"};

102
src/main/java/burp/ui/RuleSetting.java
View File

@@ -14,67 +14,56 @@ public class RuleSetting extends JPanel {
} }
public void initComponents() { public void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents engineLabel = new JLabel();
label5 = new JLabel(); scopeLabel = new JLabel();
label4 = new JLabel(); regexTextField = new JTextField();
Regex = new JTextField(); regexLabel = new JLabel();
label3 = new JLabel(); nameLabel = new JLabel();
label2 = new JLabel();
Name = new JTextField(); Name = new JTextField();
ScopeSelect = new JComboBox<>(); scopeComboBox = new JComboBox<>();
EngineSelect = new JComboBox<>(); engineComboBox = new JComboBox<>();
label6 = new JLabel(); colorLabel = new JLabel();
ColorSelect = new JComboBox<>(); colorComboBox = new JComboBox<>();
//======== this ========
setLayout(null); setLayout(null);
//---- label5 ---- engineLabel.setText("Engine:");
label5.setText("Engine:"); add(engineLabel);
add(label5); engineLabel.setBounds(new Rectangle(new Point(10, 175), engineLabel.getPreferredSize()));
label5.setBounds(new Rectangle(new Point(10, 175), label5.getPreferredSize()));
//---- label4 ---- scopeLabel.setText("Scope:");
label4.setText("Scope:"); add(scopeLabel);
add(label4); scopeLabel.setBounds(new Rectangle(new Point(10, 135), scopeLabel.getPreferredSize()));
label4.setBounds(new Rectangle(new Point(10, 135), label4.getPreferredSize())); add(regexTextField);
add(Regex); regexTextField.setBounds(70, 50, 265, 30);
Regex.setBounds(70, 50, 265, 30);
//---- label3 ---- regexLabel.setText("Regex:");
label3.setText("Regex:"); add(regexLabel);
add(label3); regexLabel.setBounds(new Rectangle(new Point(10, 55), regexLabel.getPreferredSize()));
label3.setBounds(new Rectangle(new Point(10, 55), label3.getPreferredSize()));
//---- label2 ---- nameLabel.setText("Name:");
label2.setText("Name:"); add(nameLabel);
add(label2); nameLabel.setBounds(new Rectangle(new Point(10, 15), nameLabel.getPreferredSize()));
label2.setBounds(new Rectangle(new Point(10, 15), label2.getPreferredSize()));
add(Name); add(Name);
Name.setBounds(70, 10, 265, 30); Name.setBounds(70, 10, 265, 30);
//---- ScopeSelect ---- scopeComboBox.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
ScopeSelect.setModel(new DefaultComboBoxModel<>(Config.scopeArray)); add(scopeComboBox);
add(ScopeSelect); scopeComboBox.setBounds(70, 130, 265, scopeComboBox.getPreferredSize().height);
ScopeSelect.setBounds(70, 130, 265, ScopeSelect.getPreferredSize().height);
//---- EngineSelect ---- engineComboBox.setModel(new DefaultComboBoxModel<>(Config.engineArray));
EngineSelect.setModel(new DefaultComboBoxModel<>(Config.engineArray)); add(engineComboBox);
add(EngineSelect); engineComboBox.setBounds(70, 170, 265, engineComboBox.getPreferredSize().height);
EngineSelect.setBounds(70, 170, 265, EngineSelect.getPreferredSize().height);
//---- label7 ---- colorLabel.setText("Color:");
label6.setText("Color:"); add(colorLabel);
add(label6); colorLabel.setBounds(new Rectangle(new Point(10, 95), colorLabel.getPreferredSize()));
label6.setBounds(new Rectangle(new Point(10, 95), label6.getPreferredSize()));
//---- ColorSelect ---- colorComboBox.setModel(new DefaultComboBoxModel<>(Config.colorArray));
ColorSelect.setModel(new DefaultComboBoxModel<>(Config.colorArray)); add(colorComboBox);
add(ColorSelect); colorComboBox.setBounds(70, 90, 265, colorComboBox.getPreferredSize().height);
ColorSelect.setBounds(70, 90, 265, ColorSelect.getPreferredSize().height);
{ {
// compute preferred size
Dimension preferredSize = new Dimension(); Dimension preferredSize = new Dimension();
for(int i = 0; i < getComponentCount(); i++) { for(int i = 0; i < getComponentCount(); i++) {
Rectangle bounds = getComponent(i).getBounds(); Rectangle bounds = getComponent(i).getBounds();
@@ -87,19 +76,16 @@ public class RuleSetting extends JPanel {
setMinimumSize(preferredSize); setMinimumSize(preferredSize);
setPreferredSize(preferredSize); setPreferredSize(preferredSize);
} }
// JFormDesigner - End of component initialization //GEN-END:initComponents
} }
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables private JLabel engineLabel;
private JLabel label5; private JLabel scopeLabel;
private JLabel label4; public JTextField regexTextField;
public JTextField Regex; private JLabel regexLabel;
private JLabel label3; private JLabel nameLabel;
private JLabel label2;
public JTextField Name; public JTextField Name;
public JComboBox<String> ScopeSelect; public JComboBox<String> scopeComboBox;
public JComboBox<String> EngineSelect; public JComboBox<String> engineComboBox;
private JLabel label6; private JLabel colorLabel;
public JComboBox<String> ColorSelect; public JComboBox<String> colorComboBox;
// JFormDesigner - End of variables declaration //GEN-END:variables
} }