Compare commits

...

12 Commits
2.1.4 ... 2.3

Author SHA1 Message Date
AnonymousUser
c84ebf3a9d Version: 2.3 Update 2022-05-27 13:29:32 +08:00
AnonymousUser
15f84028bb Version: 2.2.3 Update 2022-05-12 11:00:55 +08:00
AnonymousUser
1238e536d1 Version: 2.2.2 Update 2022-05-04 23:17:24 +08:00
AnonymousUser
5d23a68c0e Version: 2.2.2 Update 2022-05-04 22:51:58 +08:00
AnonymousUser
d7f04526b4 Version: 2.2.2 Update 2022-05-04 22:48:44 +08:00
AnonymousUser
acff96ed7b Version: 2.2.2 Update 2022-05-04 22:47:28 +08:00
AnonymousUser
350c093162 Update 2022-05-04 20:50:53 +08:00
AnonymousUser
0d3d4f88e9 Version: 2.2.1 Update 2022-04-21 10:50:10 +08:00
AnonymousUser
37ca315aba Version: 2.2 Update 2022-04-08 17:25:35 +08:00
AnonymousUser
241247a4a0 Version: 2.2 Update 2022-04-08 17:21:40 +08:00
AnonymousUser
08bfb69fce Version: 2.1.6 Update 2022-03-31 13:54:12 +08:00
AnonymousUser
a6d5f3a204 Version: 2.1.5 Update 2022-02-25 13:22:14 +08:00
21 changed files with 609 additions and 372 deletions

138
.gitignore vendored
View File

@@ -1,3 +1,137 @@
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# AWS User-specific
.idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### JetBrains+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.
.idea/*
!.idea/codeStyles
!.idea/runConfigurations
### macOS ###
# General
.DS_Store
.idea
.gradle
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### Gradle ###
.gradle
**/build/
!src/**/build/
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Avoid ignore Gradle wrappper properties
!gradle-wrapper.properties
# Cache of project
.gradletasknamecache
# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
# End of https://www.toptal.com/developers/gitignore/api/macos,gradle,jetbrains+all

View File

@@ -4,9 +4,13 @@
架构作者: [@0chencc](https://github.com/0Chencc)
## 公共规则网站
## 公共规则 & 打赏
https://gh0st.cn/HaE/
公共规则下载地址:https://gh0st.cn/HaE/
如果你觉得HaE好用可以打赏一下作者给作者持续更新下去的动力
![](images/reward.jpeg)
## 介绍
@@ -48,7 +52,7 @@ https://gh0st.cn/HaE/
访问该地址,在`Proxy - HTTP History`中可以看见高亮请求,响应标签页中含有`MarkINFO`标签,其中将匹配到的信息提取了出来。
![-w1047](images/16000720732854.jpg)
![-w1047](images/16000720732854.png)
## 正则优化

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 KiB

BIN
images/16000720732854.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 KiB

BIN
images/reward.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

View File

@@ -3,15 +3,18 @@ package burp;
import burp.action.*;
import burp.ui.MainUI;
import java.util.Map;
import javax.swing.*;
import java.awt.*;
import java.nio.charset.StandardCharsets;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
/*
* @author EvilChen
/**
* @author EvilChen & 0chencc
*/
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
@@ -29,14 +32,13 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
this.callbacks = callbacks;
BurpExtender.helpers = callbacks.getHelpers();
String version = "2.1.4";
String version = "2.3";
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
// 定义输出
stdout = new PrintWriter(callbacks.getStdout(), true);
stdout.println("@Core Author: EvilChen");
stdout.println("@Architecture Author: 0chencc");
stdout.println("@Github: https://github.com/gh0stkey/HaE");
stdout.println("@Team: OverSpace Security Team");
// UI
SwingUtilities.invokeLater(this::initialize);
@@ -59,7 +61,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
return main;
}
/*
/**
* 使用processHttpMessage用来做Highlighter
*/
@Override
@@ -74,7 +76,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
}
String c = new String(content, StandardCharsets.UTF_8).intern();
List<String> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
if (result != null && !result.isEmpty() && result.size() > 0) {
String originalColor = messageInfo.getHighlight();
String originalComment = messageInfo.getComment();
@@ -82,31 +84,27 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
if (originalColor != null) {
colorList.add(originalColor);
}
colorList.add(result.get(0));
colorList.add(result.get(0).get("color"));
String color = uc.getEndColor(gck.getColorKeys(colorList));
messageInfo.setHighlight(color);
String addComment = String.join(", ", result.get(1));
String addComment = String.join(", ", result.get(1).get("comment"));
String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
messageInfo.setComment(resComment);
}
}
}
class MarkInfoTab implements IMessageEditorTab {
private final ITextEditor markInfoText;
private byte[] currentMessage;
private final JTabbedPane jTabbedPane = new JTabbedPane();
private JTable jTable = new JTable();
private final IMessageEditorController controller;
private byte[] extractRequestContent;
private byte[] extractResponseContent;
private Map<String, String> extractRequestMap;
private Map<String, String> extractResponseMap;
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
this.controller = controller;
this.markInfoText = callbacks.createTextEditor();
this.markInfoText.setEditable(editable);
}
@Override
@@ -116,18 +114,25 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
@Override
public Component getUiComponent() {
return this.markInfoText.getComponent();
jTabbedPane.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent arg0) {
jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView();
}
});
return this.jTabbedPane;
}
@Override
public boolean isEnabled(byte[] content, boolean isRequest) {
String c = new String(content, StandardCharsets.UTF_8).intern();
List<String> result = pm.processMessageByContent(helpers, content, isRequest, false);
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false);
if (result != null && !result.isEmpty()) {
Map<String, String> dataMap = result.get(0);
if (isRequest) {
this.extractRequestContent = result.get(0).getBytes();
extractRequestMap = dataMap;
} else {
this.extractResponseContent = result.get(0).getBytes();
extractResponseMap = dataMap;
}
return true;
}
@@ -136,20 +141,31 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
@Override
public byte[] getMessage() {
return this.currentMessage;
return null;
}
@Override
public boolean isModified() {
return this.markInfoText.isTextModified();
return false;
}
/**
* 快捷键复制功能
*/
@Override
public byte[] getSelectedData() {
return this.markInfoText.getSelectedText();
int[] selectRows = jTable.getSelectedRows();
StringBuilder selectData = new StringBuilder();
for (int row : selectRows) {
selectData.append(jTable.getValueAt(row, 0).toString()).append("\n");
}
// 便于单行复制,去除最后一个换行符
String revData = selectData.reverse().toString().replaceFirst("\n", "");
StringBuilder retData = new StringBuilder(revData).reverse();
return helpers.stringToBytes(retData.toString());
}
/*
/**
* 使用setMessage用来做Extractor
*/
@Override
@@ -157,15 +173,37 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
String c = new String(content, StandardCharsets.UTF_8).intern();
if (content.length > 0) {
if (isRequest) {
this.markInfoText.setText(this.extractRequestContent);
makeTable(extractRequestMap);
} else {
this.markInfoText.setText(this.extractResponseContent);
makeTable(extractResponseMap);
}
}
this.currentMessage = content;
}
/**
* 创建MarkInfo表单
*/
public void makeTable(Map<String, String> dataMap) {
dataMap.keySet().forEach(i->{
String[] extractData = dataMap.get(i).split("\n");
Object[][] data = new Object[extractData.length][1];
for (int x = 0; x < extractData.length; x++) {
data[x][0] = extractData[x];
stdout.println(extractData[x]);
}
int indexOfTab = this.jTabbedPane.indexOfTab(i);
JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[] {"Information"}));
this.jTabbedPane.addTab(i, jScrollPane);
// 使用removeAll会导致UI出现空白的情况为了改善用户侧体验采用remove的方式进行删除
if (indexOfTab != -1) {
this.jTabbedPane.remove(indexOfTab);
}
});
}
}
@Override
public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
return new MarkInfoTab(controller, editable);

View File

@@ -1,10 +1,9 @@
package burp;
/*
/**
* @author EvilChen
*/
import burp.yaml.LoadConfig;
import java.util.Map;
public class Config {
@@ -25,8 +24,6 @@ public class Config {
"dfa"
};
public static String outputTplString = "[%s]\n%s\n\n";
public static String[] colorArray = new String[] {
"red",
"orange",
@@ -39,5 +36,5 @@ public class Config {
"gray"
};
public static Map<String,Object[][]> ruleConfig = LoadConfig.getRules();
public static Map<String,Object[][]> ruleConfig = null;
}

View File

@@ -1,24 +1,24 @@
package burp.action;
import java.util.HashMap;
import java.util.Map;
import burp.Config;
import java.util.ArrayList;
import java.util.List;
/*
/**
* @author EvilChen
*/
public class DoAction {
public String extractString(Map<String, Map<String, Object>> obj) {
String[] result = {""};
public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
Map<String, String> resultMap = new HashMap<String, String>();
obj.keySet().forEach(i->{
Map<String, Object> tmpMap = obj.get(i);
String data = tmpMap.get("data").toString();
String tmpStr = String.format(Config.outputTplString, i, data).intern();
result[0] += tmpStr;
resultMap.put(i, String.format("%s\n", data).intern());
});
return result[0];
return resultMap;
}
public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {

View File

@@ -4,7 +4,6 @@ import java.nio.charset.StandardCharsets;
import java.util.*;
import burp.Config;
import burp.yaml.LoadConfig;
import dk.brics.automaton.Automaton;
import dk.brics.automaton.AutomatonMatcher;
import dk.brics.automaton.RegExp;
@@ -12,7 +11,7 @@ import dk.brics.automaton.RunAutomaton;
import jregex.Matcher;
import jregex.Pattern;
/*
/**
* @author EvilChen
*/
@@ -33,6 +32,7 @@ public class ExtractContent {
String color = objects[3].toString();
String scope = objects[4].toString();
String engine = objects[5].toString();
boolean sensitive = (Boolean) objects[6];
// 判断规则是否开启与作用域
if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
switch (scope) {
@@ -54,7 +54,13 @@ public class ExtractContent {
}
if ("nfa".equals(engine)) {
Pattern pattern = new Pattern(regex);
Pattern pattern;
// 判断规则是否大小写敏感
if (sensitive) {
pattern = new Pattern(regex);
} else {
pattern = new Pattern(regex, Pattern.IGNORE_CASE);
}
Matcher matcher = pattern.matcher(matchContent);
while (matcher.find()) {
// 添加匹配数据至list

View File

@@ -4,12 +4,12 @@ import burp.Config;
import java.util.ArrayList;
import java.util.List;
/*
/**
* @author EvilChen
*/
public class GetColorKey {
/*
/**
* 颜色下标获取
*/
public List<Integer> getColorKeys(List<String> keys){

View File

@@ -5,7 +5,7 @@ import jregex.Pattern;
import jregex.REFlags;
import burp.yaml.LoadConfig;
/*
/**
* @author EvilChen
*/

View File

@@ -5,6 +5,7 @@ import burp.IHttpService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,8 +16,8 @@ public class ProcessMessage {
GetColorKey gck = new GetColorKey();
UpgradeColor uc = new UpgradeColor();
public List<String> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
List<String> result = new ArrayList<>();;
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
List<Map<String, String>> result = new ArrayList<>();;
Map<String, Map<String, Object>> obj;
if (isRequest) {
@@ -73,8 +74,14 @@ public class ProcessMessage {
List<String> commentList = resultList.get(1);
if (colorList.size() != 0 && commentList.size() != 0) {
String color = uc.getEndColor(gck.getColorKeys(colorList));
result.add(color);
result.add(String.join(", ", commentList));
Map<String, String> colorMap = new HashMap<String, String>(){{
put("color", color);
}};
Map<String, String> commentMap = new HashMap<String, String>(){{
put("comment", String.join(", ", commentList));
}};
result.add(colorMap);
result.add(commentMap);
}
} else {
if (obj.size() > 0) {

View File

@@ -4,13 +4,13 @@ import burp.Config;
import java.util.*;
/*
/**
* @author EvilChen
*/
public class UpgradeColor {
private String endColor = "";
/*
/**
* 颜色升级递归算法
*/
private void colorUpgrade(List<Integer> colorList) {

View File

@@ -6,7 +6,7 @@ import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
/*
/**
* @author 6dc
*
* A class which creates a JTabbedPane and auto sets a close button when you add a tab
@@ -18,7 +18,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
super();
}
/* Override Addtab in order to add the close Button everytime */
/** Override Addtab in order to add the close Button everytime */
@Override
public void addTab(String title, Icon icon, Component component, String tip) {
super.addTab(title, icon, component, tip);
@@ -45,7 +45,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
}
}
/* addTabNoExit */
/** addTabNoExit */
public void addTabNoExit(String title, Icon icon, Component component, String tip) {
super.addTab(title, icon, component, tip);
}
@@ -58,7 +58,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
addTabNoExit(title, null, component);
}
/* Button */
/** Button */
public class CloseButtonTab extends JPanel {
public CloseButtonTab(final Component tab, String title, Icon icon) {
@@ -74,7 +74,7 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
add(button);
}
}
/* ClickListener */
/** ClickListener */
public class CloseListener implements MouseListener
{
private final Component tab;

View File

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

View File

@@ -2,6 +2,7 @@ package burp.ui;
import burp.yaml.SetConfig;
import java.awt.event.ComponentListener;
import javax.swing.*;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -12,83 +13,91 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Vector;
/*
/**
* @author LinChen
*/
public class RulePane extends JPanel {
public RulePane(Object[][] data,JTabbedPane pane) {
initComponents(data,pane);
public RulePane(Object[][] data, JTabbedPane pane) {
initComponents(data, pane);
}
private SetConfig setruleconfig = new SetConfig();
private SetConfig setConfig = new SetConfig();
private Boolean isEdit = false;
private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
// TODO add your code here
RuleSetting add = new RuleSetting();
int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
if(isOk == 0){
Vector data = new Vector();
data.add(false);
data.add(add.Name.getText());
data.add(add.Regex.getText());
data.add(add.ColorSelect.getSelectedItem().toString());
data.add(add.ScopeSelect.getSelectedItem().toString());
data.add(add.EngineSelect.getSelectedItem().toString());
model.insertRow(model.getRowCount(),data);
model = (DefaultTableModel) table.getModel();
setruleconfig.add(data,pane.getTitleAt(pane.getSelectedIndex()));
private void ruleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
RuleSetting ruleSettingPanel = new RuleSetting();
int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Add Rule", JOptionPane.OK_OPTION);
if(showState == 0){
Vector ruleData = new Vector();
ruleData.add(false);
ruleData.add(ruleSettingPanel.ruleNameTextField.getText());
ruleData.add(ruleSettingPanel.regexTextField.getText());
ruleData.add(ruleSettingPanel.colorComboBox.getSelectedItem().toString());
ruleData.add(ruleSettingPanel.scopeComboBox.getSelectedItem().toString());
ruleData.add(ruleSettingPanel.engineComboBox.getSelectedItem().toString());
ruleData.add(ruleSettingPanel.sensitiveComboBox.getSelectedItem());
model.insertRow(model.getRowCount(), ruleData);
model = (DefaultTableModel) ruleTable.getModel();
setConfig.add(ruleData, pane.getTitleAt(pane.getSelectedIndex()));
}
}
private void RuleEditMouseClicked(MouseEvent e,JTabbedPane pane){
if (table.getSelectedRowCount()>=1){
RuleSetting edit = new RuleSetting();
edit.Name.setText(table.getValueAt(table.getSelectedRow(),1).toString());
edit.Regex.setText(table.getValueAt(table.getSelectedRow(),2).toString());
edit.ColorSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),3).toString());
edit.ScopeSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),4).toString());
edit.EngineSelect.setSelectedItem(table.getValueAt(table.getSelectedRow(),5).toString());
int isOk = JOptionPane.showConfirmDialog(null,edit,"RuleSetting - Edit Rule",JOptionPane.OK_OPTION);
if (isOk ==0){
int select = table.convertRowIndexToModel(table.getSelectedRow());
model.setValueAt(edit.Name.getText(),select,1);
model.setValueAt(edit.Regex.getText(),select,2);
model.setValueAt(edit.ColorSelect.getSelectedItem().toString(),select,3);
model.setValueAt(edit.ScopeSelect.getSelectedItem().toString(),select,4);
model.setValueAt(edit.EngineSelect.getSelectedItem().toString(),select,5);
model = (DefaultTableModel) table.getModel();
setruleconfig.edit((Vector) model.getDataVector().get(select),select,pane.getTitleAt(pane.getSelectedIndex()));
private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
if (ruleTable.getSelectedRowCount() >= 1){
RuleSetting ruleSettingPanel = new RuleSetting();
ruleSettingPanel.ruleNameTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
ruleSettingPanel.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
ruleSettingPanel.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
ruleSettingPanel.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
ruleSettingPanel.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
ruleSettingPanel.sensitiveComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(),6).toString());
ruleSettingPanel.sensitiveComboBox.setEnabled(
ruleSettingPanel.engineComboBox.getSelectedItem().toString().equals("nfa")
);
int showState = JOptionPane.showConfirmDialog(null, ruleSettingPanel, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION);
if (showState == 0){
int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
model.setValueAt(ruleSettingPanel.ruleNameTextField.getText(), select, 1);
model.setValueAt(ruleSettingPanel.regexTextField.getText(), select, 2);
model.setValueAt(ruleSettingPanel.colorComboBox.getSelectedItem().toString(), select, 3);
model.setValueAt(ruleSettingPanel.scopeComboBox.getSelectedItem().toString(), select, 4);
model.setValueAt(ruleSettingPanel.engineComboBox.getSelectedItem().toString(), select, 5);
model.setValueAt(ruleSettingPanel.sensitiveComboBox.getSelectedItem(), select, 6);
model = (DefaultTableModel) ruleTable.getModel();
setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
}
}
}
private void RuleRemoveMouseClicked(MouseEvent e,JTabbedPane pane){
if (table.getSelectedRowCount()>=1){
int isOk = JOptionPane.showConfirmDialog(null,"Are your sure?","RuleSetting - Delete Rule",JOptionPane.OK_OPTION);
if (isOk==0){
int select = table.convertRowIndexToModel(table.getSelectedRow());
private void ruleRemoveMouseClicked(MouseEvent e, JTabbedPane pane){
if (ruleTable.getSelectedRowCount() >= 1){
int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
if (isOk == 0){
int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
model.removeRow(select);
model = (DefaultTableModel) table.getModel();
setruleconfig.remove(select,pane.getTitleAt(pane.getSelectedIndex()));
model = (DefaultTableModel) ruleTable.getModel();
setConfig.remove(select, pane.getTitleAt(pane.getSelectedIndex()));
}
}
}
private void RuleTableChange(TableModelEvent e,JTabbedPane pane) {
if (e.getColumn()==0&&table.getSelectedRow()!=-1&&!isEdit){
model = (DefaultTableModel) table.getModel();
int select = table.convertRowIndexToModel(table.getSelectedRow());
setruleconfig.edit((Vector) model.getDataVector().get(select),select,pane.getTitleAt(pane.getSelectedIndex()));
private void ruleTableChange(TableModelEvent e, JTabbedPane pane) {
if (e.getColumn() == 0 && ruleTable.getSelectedRow() != -1 && !isEdit){
model = (DefaultTableModel) ruleTable.getModel();
int select = ruleTable.convertRowIndexToModel(ruleTable.getSelectedRow());
setConfig.edit((Vector) model.getDataVector().get(select), select, pane.getTitleAt(pane.getSelectedIndex()));
}
}
private void initComponents(Object[][] data,JTabbedPane pane) {
private void initComponents(Object[][] data, JTabbedPane pane) {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
RuleAdd = new JButton();
RuleEdit = new JButton();
addButton = new JButton();
editButton = new JButton();
scrollPane = new JScrollPane();
table = new JTable();
Remove = new JButton();
ruleTable = new JTable();
removeButton = new JButton();
//======== this ========
setLayout(new GridBagLayout());
@@ -97,100 +106,106 @@ public class RulePane extends JPanel {
((GridBagLayout)getLayout()).columnWeights = new double[] {0.0, 1.0, 1.0E-4};
((GridBagLayout)getLayout()).rowWeights = new double[] {0.0, 0.0, 0.0, 1.0, 1.0E-4};
//---- RuleAdd ----
RuleAdd.setText("Add");
RuleAdd.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
isEdit = true;
RuleAddMouseClicked(e,pane);
model = (DefaultTableModel) table.getModel();
isEdit = false;
}
});
add(RuleAdd, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(15, 5, 3, 2), 0, 0));
//---- addButton ----
addButton.setText("Add");
//---- RuleEdit ----
RuleEdit.setText("Edit");
RuleEdit.addMouseListener(new MouseAdapter() {
addButton.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
isEdit = true;
RuleEditMouseClicked(e,pane);
model = (DefaultTableModel) table.getModel();
ruleAddMouseClicked(e, pane);
model = (DefaultTableModel) ruleTable.getModel();
isEdit = false;
}
});
add(RuleEdit, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 5, 3, 2), 0, 0));
add(addButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(15, 5, 3, 2), 0, 0));
//---- editButton ----
editButton.setText("Edit");
editButton.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
isEdit = true;
ruleEditMouseClicked(e, pane);
model = (DefaultTableModel) ruleTable.getModel();
isEdit = false;
}
});
add(editButton, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 5, 3, 2), 0, 0));
//======== scrollPane ========
{
//---- table ----
table.setShowVerticalLines(false);
table.setVerifyInputWhenFocusTarget(false);
table.setUpdateSelectionOnSort(false);
table.setShowHorizontalLines(false);
table.setModel(new DefaultTableModel());
table.setSurrendersFocusOnKeystroke(true);
scrollPane.setViewportView(table);
ruleTable.setShowVerticalLines(false);
ruleTable.setVerifyInputWhenFocusTarget(false);
ruleTable.setUpdateSelectionOnSort(false);
ruleTable.setShowHorizontalLines(false);
ruleTable.setModel(new DefaultTableModel());
ruleTable.setSurrendersFocusOnKeystroke(true);
scrollPane.setViewportView(ruleTable);
}
add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(15, 5, 5, 5), 0, 0));
//---- Remove ----
Remove.setText("Remove");
Remove.addMouseListener(new MouseAdapter() {
add(scrollPane, new GridBagConstraints(1, 0, 1, 4, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(15, 5, 5, 5), 0, 0));
//---- removeButton ----
removeButton.setText("Remove");
removeButton.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
isEdit = true;
RuleRemoveMouseClicked(e,pane);
model = (DefaultTableModel) table.getModel();
ruleRemoveMouseClicked(e, pane);
model = (DefaultTableModel) ruleTable.getModel();
isEdit = false;
}
});
add(Remove, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 5, 3, 2), 0, 0));
add(removeButton, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(0, 5, 3, 2), 0, 0));
// JFormDesigner - End of component initialization //GEN-END:initComponents
table.setModel(model);
model.setDataVector(data,title);
ruleTable.setModel(model);
model.setDataVector(data, title);
model.addTableModelListener(new TableModelListener() {
@Override
public void tableChanged(TableModelEvent e) {
RuleTableChange(e,pane);
ruleTableChange(e, pane);
}
});
table.setRowSorter(new TableRowSorter(model));
ruleTable.setRowSorter(new TableRowSorter(model));
}
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
public JButton RuleAdd;
public JButton RuleEdit;
public JButton addButton;
public JButton editButton;
public JScrollPane scrollPane;
public JTable table;
public JButton Remove;
public JTable ruleTable;
public JButton removeButton;
// 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", "Sensitive"};
private DefaultTableModel model = new DefaultTableModel() {
public Class<?> getColumnClass ( int column){
@Override
public Class<?> getColumnClass (int column){
if (column == 0) {
return Boolean.class;
}else{
return String.class;
}
}
public boolean isCellEditable(int row,int column){
if (column ==0){
return true;
}else {
return false;
}
@Override
public boolean isCellEditable(int row, int column){
return column == 0;
}
};
}

View File

@@ -1,10 +1,14 @@
package burp.ui;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import javax.swing.*;
import java.awt.*;
import burp.Config;
/*
/**
* @author LinChen
*/
@@ -14,67 +18,77 @@ public class RuleSetting extends JPanel {
}
public void initComponents() {
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
label5 = new JLabel();
label4 = new JLabel();
Regex = new JTextField();
label3 = new JLabel();
label2 = new JLabel();
Name = new JTextField();
ScopeSelect = new JComboBox<>();
EngineSelect = new JComboBox<>();
label6 = new JLabel();
ColorSelect = new JComboBox<>();
sensitiveLabel = new JLabel();
engineLabel = new JLabel();
scopeLabel = new JLabel();
regexTextField = new JTextField();
regexLabel = new JLabel();
nameLabel = new JLabel();
ruleNameTextField = new JTextField();
scopeComboBox = new JComboBox<>();
engineComboBox = new JComboBox<>();
colorLabel = new JLabel();
colorComboBox = new JComboBox<>();
sensitiveComboBox = new JComboBox<>();
//======== this ========
setLayout(null);
//---- label5 ----
label5.setText("Engine:");
add(label5);
label5.setBounds(new Rectangle(new Point(10, 175), label5.getPreferredSize()));
engineLabel.setText("Engine:");
add(engineLabel);
engineLabel.setBounds(new Rectangle(new Point(10, 175), engineLabel.getPreferredSize()));
//---- label4 ----
label4.setText("Scope:");
add(label4);
label4.setBounds(new Rectangle(new Point(10, 135), label4.getPreferredSize()));
add(Regex);
Regex.setBounds(70, 50, 265, 30);
sensitiveLabel.setText("Sensitive:");
add(sensitiveLabel);
sensitiveLabel.setBounds(new Rectangle(new Point(10,215), sensitiveLabel.getPreferredSize()));
//---- label3 ----
label3.setText("Regex:");
add(label3);
label3.setBounds(new Rectangle(new Point(10, 55), label3.getPreferredSize()));
scopeLabel.setText("Scope:");
add(scopeLabel);
scopeLabel.setBounds(new Rectangle(new Point(10, 135), scopeLabel.getPreferredSize()));
add(regexTextField);
regexTextField.setBounds(70, 50, 265, 30);
//---- label2 ----
label2.setText("Name:");
add(label2);
label2.setBounds(new Rectangle(new Point(10, 15), label2.getPreferredSize()));
add(Name);
Name.setBounds(70, 10, 265, 30);
regexLabel.setText("Regex:");
add(regexLabel);
regexLabel.setBounds(new Rectangle(new Point(10, 55), regexLabel.getPreferredSize()));
//---- ScopeSelect ----
ScopeSelect.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
add(ScopeSelect);
ScopeSelect.setBounds(70, 130, 265, ScopeSelect.getPreferredSize().height);
nameLabel.setText("Name:");
add(nameLabel);
nameLabel.setBounds(new Rectangle(new Point(10, 15), nameLabel.getPreferredSize()));
add(ruleNameTextField);
ruleNameTextField.setBounds(70, 10, 265, 30);
//---- EngineSelect ----
EngineSelect.setModel(new DefaultComboBoxModel<>(Config.engineArray));
add(EngineSelect);
EngineSelect.setBounds(70, 170, 265, EngineSelect.getPreferredSize().height);
scopeComboBox.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
add(scopeComboBox);
scopeComboBox.setBounds(70, 130, 265, scopeComboBox.getPreferredSize().height);
//---- label7 ----
label6.setText("Color:");
add(label6);
label6.setBounds(new Rectangle(new Point(10, 95), label6.getPreferredSize()));
engineComboBox.setModel(new DefaultComboBoxModel<>(Config.engineArray));
engineComboBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
String engineValue = engineComboBox.getSelectedItem().toString();
if (engineValue.equals("nfa")) {
sensitiveComboBox.setEnabled(true);
} else {
sensitiveComboBox.setEnabled(false);
}
}
});
add(engineComboBox);
engineComboBox.setBounds(70, 170, 265, engineComboBox.getPreferredSize().height);
//---- ColorSelect ----
ColorSelect.setModel(new DefaultComboBoxModel<>(Config.colorArray));
add(ColorSelect);
ColorSelect.setBounds(70, 90, 265, ColorSelect.getPreferredSize().height);
colorLabel.setText("Color:");
add(colorLabel);
colorLabel.setBounds(new Rectangle(new Point(10, 95), colorLabel.getPreferredSize()));
colorComboBox.setModel(new DefaultComboBoxModel<>(Config.colorArray));
add(colorComboBox);
colorComboBox.setBounds(70, 90, 265, colorComboBox.getPreferredSize().height);
sensitiveComboBox.setModel(new DefaultComboBoxModel<>(new Boolean[]{true, false}));
add(sensitiveComboBox);
sensitiveComboBox.setBounds(70,210,265,sensitiveComboBox.getPreferredSize().height);
{
// compute preferred size
Dimension preferredSize = new Dimension();
for(int i = 0; i < getComponentCount(); i++) {
Rectangle bounds = getComponent(i).getBounds();
@@ -87,19 +101,18 @@ public class RuleSetting extends JPanel {
setMinimumSize(preferredSize);
setPreferredSize(preferredSize);
}
// JFormDesigner - End of component initialization //GEN-END:initComponents
}
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
private JLabel label5;
private JLabel label4;
public JTextField Regex;
private JLabel label3;
private JLabel label2;
public JTextField Name;
public JComboBox<String> ScopeSelect;
public JComboBox<String> EngineSelect;
private JLabel label6;
public JComboBox<String> ColorSelect;
// JFormDesigner - End of variables declaration //GEN-END:variables
private JLabel engineLabel;
private JLabel sensitiveLabel;
private JLabel scopeLabel;
public JTextField regexTextField;
private JLabel regexLabel;
private JLabel nameLabel;
public JTextField ruleNameTextField;
public JComboBox<String> scopeComboBox;
public JComboBox<String> engineComboBox;
private JLabel colorLabel;
public JComboBox<String> colorComboBox;
public JComboBox<Boolean> sensitiveComboBox;
}

View File

@@ -27,6 +27,7 @@ public class LoadConfig {
initSetting();
initRules();
}
Config.ruleConfig = LoadConfig.getRules();
}
// 初始化设置信息
@@ -51,6 +52,8 @@ public class LoadConfig {
rule.setEngine("nfa");
rule.setScope("response");
rule.setRegex("(([a-zA-Z0-9][_|\\.])*[a-zA-Z0-9]+@([a-zA-Z0-9][-|_|\\.])*[a-zA-Z0-9]+\\.((?!js|css|jpg|jpeg|png|ico)[a-zA-Z]{2,}))");
rule.setSensitive(false);
Rules rules = new Rules();
rules.setType("Basic Information");
ArrayList<Rule> rl = new ArrayList<>();
@@ -91,14 +94,21 @@ public class LoadConfig {
// 获取不包含的后缀名
public String getExcludeSuffix(){
try {
InputStream inorder = new FileInputStream(SettingPath);
Map<String,Object> r = yaml.load(inorder);
return r.get("excludeSuffix").toString();
} catch (FileNotFoundException e) {
e.printStackTrace();
return Config.excludeSuffix;
String excludeSuffix = "";
File yamlSetting = new File(SettingPath);
if (yamlSetting.exists() && yamlSetting.isFile()) {
try {
InputStream inorder = new FileInputStream(SettingPath);
Map<String,Object> r = yaml.load(inorder);
excludeSuffix = r.get("excludeSuffix").toString();
} catch (Exception e) {
// e.printStackTrace();
excludeSuffix = "";
}
} else {
excludeSuffix = Config.excludeSuffix;
}
return excludeSuffix;
}
// 获取规则配置

View File

@@ -40,6 +40,7 @@ public class SetConfig {
rlTmp.setColor((String) objects[3]);
rlTmp.setScope((String) objects[4]);
rlTmp.setEngine((String) objects[5]);
rlTmp.setSensitive((Boolean) objects[6]);
rl.add(rlTmp);
}
rlsTmp.setRule(rl);
@@ -87,7 +88,7 @@ public class SetConfig {
String name = "New ";
Object[][] data = new Object[][]{
{
false, "New Name", "(New Regex)", "gray", "any", "nfa"
false, "New Name", "(New Regex)", "gray", "any", "nfa", false
}
};
while (Config.ruleConfig.containsKey(name + i)) {

View File

@@ -3,7 +3,7 @@ package burp.yaml.template;
import java.util.HashMap;
import java.util.Map;
/*
/**
* @author LinChen
*/
@@ -14,6 +14,7 @@ public class Rule {
private String Color;
private String Engine;
private String Scope;
private Boolean Sensitive;
public Boolean getLoaded() {
return Loaded;
@@ -38,6 +39,9 @@ public class Rule {
return Scope;
}
public Boolean getSensitive(){
return Sensitive = Sensitive;
}
public void setLoaded(Boolean loaded) {
this.Loaded = loaded;
}
@@ -62,9 +66,12 @@ public class Rule {
public void setScope(String scope) {
this.Scope = scope;
}
public void setSensitive(Boolean sensitive){
this.Sensitive = sensitive;
}
public Object[] getRuleObject() {
return new Object[] { Loaded, Name, Regex, Color, Scope, Engine };
return new Object[] { Loaded, Name, Regex, Color, Scope, Engine,Sensitive };
}
public Map<String, Object> getRuleObjMap(){
@@ -75,10 +82,12 @@ public class Rule {
r.put("Color", Color);
r.put("Scope", Scope);
r.put("Engine", Engine);
r.put("Sensitive", Sensitive);
return r;
}
@Override
public String toString() {
return "{ \nLoaded: " + Loaded + "\nName: " + Name + "\nRegex: " + Regex + "\nColor: " + Color + "\nScope: " + Scope + "\nEngine: " + Engine + "\n}";
return "{ \nLoaded: " + Loaded + "\nName: " + Name + "\nRegex: " + Regex + "\nColor: " + Color + "\nScope: " + Scope + "\nEngine: " + Engine + "\nSensitive: " + Sensitive + "\n }";
}
}

View File

@@ -4,7 +4,7 @@ import burp.yaml.template.Rule;
import java.util.List;
/*
/**
* @author LinChen
*/
@@ -28,9 +28,9 @@ public class Rules {
this.rule = rule;
}
public void setRuleObj(){
public void setRuleObj(){}
}
@Override
public String toString(){
return "{ type: "+type+"\n config: "+ rule +"}\n";
}