Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d590d4a70e | ||
|
|
548339fa58 | ||
|
|
df4496d4fd | ||
|
|
48e355ac54 | ||
|
|
b784aa1425 | ||
|
|
440b3b1504 | ||
|
|
a8f1798c7b | ||
|
|
225ee471ec | ||
|
|
5097124867 | ||
|
|
7e0e3054be | ||
|
|
17a84fc19e | ||
|
|
1573d563eb | ||
|
|
515f7b33f0 | ||
|
|
1dc510d576 | ||
|
|
f401214524 | ||
|
|
7ebba02200 | ||
|
|
93f5c73aac | ||
|
|
60b261d6ef | ||
|
|
c84ebf3a9d |
96
README.md
@@ -1,48 +1,46 @@
|
||||
# HaE - Highlighter and Extractor
|
||||
<div align="center">
|
||||
<img src="images/logo.png" style="width: 20%" />
|
||||
<h4><a href="https://gh0st.cn/HaE/">赋能白帽,高效作战!</a></h4>
|
||||
<h5>第一作者: <a href="https://github.com/gh0stkey">EvilChen</a>(中孚信息元亨实验室), 第二作者: <a href="https://github.com/0chencc">0chencc</a>(米斯特安全团队)</h5>
|
||||
</div>
|
||||
|
||||
核心功能作者: [@EvilChen](https://github.com/gh0stkey)
|
||||
|
||||
架构作者: [@0chencc](https://github.com/0Chencc)
|
||||
## 项目介绍
|
||||
|
||||
## 公共规则 & 打赏
|
||||
**HaE**是基于 `BurpSuite Java插件API` 开发的请求高亮标记与信息提取的辅助型框架式插件,该插件可以通过自定义正则的方式匹配响应报文或请求报文,并对满足正则匹配的报文进行信息高亮与提取。
|
||||
|
||||
公共规则下载地址:https://gh0st.cn/HaE/
|
||||
现代化Web应用走上前后端分离开发模式,这就导致在日常测试时候会有许多的流量,如果你想要尽可能全面的对一个Web应用进行测试评估,将花费大量精力浪费在无用的报文上;**HaE的出现正是为了解决这一类似场景**,借助HaE你可以**有效的减少**测试的时间,将更多的精力放在**有价值、有意义**的报文上,**提高漏洞挖掘效率**。
|
||||
|
||||
如果你觉得HaE好用,可以打赏一下作者,给作者持续更新下去的动力!
|
||||
|
||||

|
||||
|
||||
## 介绍
|
||||
|
||||
**HaE**是基于 `BurpSuite` 插件 `JavaAPI` 开发的请求高亮标记与信息提取的辅助型插件。
|
||||
|
||||

|
||||
|
||||
该插件可以通过自定义正则的方式匹配**响应报文或请求报文**,可以自行决定符合该自定义正则匹配的相应请求是否需要高亮标记、信息提取。
|
||||
|
||||
**注**: `HaE`的使用,对测试人员来说需要基本的正则表达式基础,由于`Java`正则表达式的库并没有`Python`的优雅或方便,在使用正则的,HaE要求使用者必须使用`()`将所需提取的表达式内容包含;例如你要匹配一个**Shiro应用**的响应报文,正常匹配规则为`rememberMe=delete`,如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
|
||||
**注**: 要想灵活的使用`HaE`,你需要掌握正则表达式阅读、编写、修改能力;由于`Java`正则表达式的库并没有`Python`的优雅或方便,所以HaE要求使用者必须用`()`将所需提取的表达式内容包含;例如你要匹配一个**Shiro应用**的响应报文,正常匹配规则为`rememberMe=delete`,如果你要提取这段内容的话就需要变成`(rememberMe=delete)`。
|
||||
|
||||
## 使用方法
|
||||
|
||||
插件装载: `Extender - Extensions - Add - Select File - Next`
|
||||
|
||||
初次装载`HaE`会初始化配置文件,默认配置文件内置一个正则: `Email`,初始化的配置文件会放在与`BurpSuite Jar`包同级目录下。
|
||||
初次装载`HaE`会初始化配置文件,默认配置文件内置一个正则: `Email`,初始化的配置文件会放在的`/用户根目录/.config/HaE/`目录下。
|
||||
|
||||
除了初始化的配置文件外,还有`Setting.yml`,该文件用于存储配置文件路径;`HaE`支持自定义配置文件路径,你可以通过点击`Select File`按钮进行选择自定义配置文件。
|
||||

|
||||
|
||||

|
||||
除了初始化的配置文件外,还有`Setting.yml`,该文件用于存储配置文件路径与排除后缀名;`HaE`支持在线更新配置文件,你可以通过点击`Online Update`按钮进行更新(部分网络需要挂代理)。
|
||||
|
||||
## 插件优点
|
||||
## 优势特点
|
||||
|
||||
1. **精细化配置项**:高自由度配置更适配精细化场景需求;
|
||||
2. **简洁可视界面**:简洁的可视化界面让你更加清晰了解HaE的各项配置,操作更轻松,使用更简单;
|
||||
3. **颜色升级算法**:内置颜色升级算法,避免“屠龙者终成恶龙”场景,突出最具价值的请求;
|
||||
4. **标签化规则项**:标签化你的正则规则,让规则可分类,让管理更轻松;
|
||||
5. **数据集合面板**:将所有匹配数据集合到Databoard中,使得测试、梳理更高效;
|
||||
6. **高亮标记一体**:在Proxy - History页面你可以通过颜色高亮与Comment判断请求价值;
|
||||
7. **实战化官方库**:基于实战化场景、案例进行输出的官方规则库,提升测试实战性;
|
||||
8. **配置文件易读**:配置文件使用YAML格式存储,更加便于阅读与修改。
|
||||
|
||||
| 界面名称 | 界面展示 |
|
||||
| ------------------------- | ----------------------------------------------------- |
|
||||
| Rules(规则信息管理) | <img src="images/rules.png" style="width: 80%" /> |
|
||||
| Config(配置信息管理) | <img src="images/config.png" style="width: 80%" /> |
|
||||
| Databoard(数据集合面板) | <img src="images/databoard.png" style="width: 80%" /> |
|
||||
|
||||
1. 多选项自定义控制适配需求
|
||||
2. 多颜色高亮分类,将BurpSuite的所有高亮颜色集成: `red, orange, yellow, green, cyan, blue, pink, magenta, gray`
|
||||
3. **颜色升级算法**: 利用下标的方式进行优先级排序,当满足2个同颜色条件则以优先级顺序上升颜色(例如: **两个正则,颜色为橘黄色,该请求两个正则都匹配到了,那么将升级为红色**)
|
||||
4. 配置文件采用YAML格式存储,更加便于阅读和修改
|
||||
5. 内置简单缓存,在“多正则、大数据”的场景下减少卡顿现象
|
||||
6. **支持标签分页**,点击`...`即可添加新的标签页,对着标签页右键即可删除
|
||||
7. 高亮信息添加的同时添加Comment,便于查找请求
|
||||
|
||||

|
||||
|
||||
## 实际使用
|
||||
|
||||
@@ -54,41 +52,15 @@
|
||||
|
||||

|
||||
|
||||
## 文末随笔
|
||||
|
||||
## 正则优化
|
||||
正义感是一个不可丢失的东西。
|
||||
|
||||
有些正则在实战应用场景中并不理想
|
||||
如果你觉得HaE好用,可以打赏一下作者,给作者持续更新下去的动力!
|
||||
|
||||
在正则匹配手机号、身份证号码的时候(纯数字类)会存在一些误报(这里匹配身份证号码无法进行校验,误报率很高),但手机号处理这一块可以解决:
|
||||
|
||||
原正则:
|
||||
|
||||
```
|
||||
1[3-9]\d{9}
|
||||
```
|
||||
|
||||
误报场景: `12315188888888123`,这时候会匹配到`15188888888`,而实际上这一段并不是手机号,所以修改正则为:
|
||||
|
||||
```
|
||||
[^0-9]+(1[3-9]\d{9})[^0-9]+
|
||||
```
|
||||
|
||||
也就是要求匹配的手机号前后不能为0-9的数字。
|
||||
|
||||
## 实战用法
|
||||
|
||||
1. CMS指纹识别,Discuz正则: `(Powered by Discuz!)`
|
||||
2. OSS对象存储信息泄露,正则: `([A|a]ccess[K|k]ey[I|i]d|[A|a]ccess[K|k]ey[S|s]ecret)`
|
||||
3. 内网地址信息提取,正则: `(?:10\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?:172\.(?:(?:1[6-9])|(?:2\d)|(?:3[01]))\.\d{1,3}\.\d{1,3})|(?:192\.168\.\d{1,3}\.\d{1,3})`
|
||||
4. 实战插件关联搭配,漏洞挖掘案例: https://mp.weixin.qq.com/s/5vNn7dMRZBtv0ojPBAHV7Q
|
||||
|
||||
...还有诸多使用方法等待大家去发掘。
|
||||
|
||||
## 文末
|
||||
|
||||
随笔: 正义感是一个不可丢失的东西。
|
||||
|
||||
Github项目地址(BUG、需求、正则欢迎提交): https://github.com/gh0stkey/HaE
|
||||
<div align=center>
|
||||
<img src="images/reward.jpeg" style="width: 30%" />
|
||||
</div>
|
||||
|
||||
## 404StarLink 2.0 - Galaxy
|
||||
|
||||
|
||||
@@ -30,4 +30,5 @@ dependencies {
|
||||
compile group: 'org.yaml', name: 'snakeyaml', version: '1.28'
|
||||
compile 'net.sourceforge.jregex:jregex:1.2_01'
|
||||
compile 'dk.brics.automaton:automaton:1.11-8'
|
||||
compile 'com.squareup.okhttp:okhttp:2.7.5'
|
||||
}
|
||||
|
Before Width: | Height: | Size: 188 KiB |
|
Before Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 84 KiB |
BIN
images/config.png
Normal file
|
After Width: | Height: | Size: 56 KiB |
BIN
images/databoard.png
Normal file
|
After Width: | Height: | Size: 55 KiB |
BIN
images/logo.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
images/rules.png
Normal file
|
After Width: | Height: | Size: 111 KiB |
BIN
images/show_config.png
Normal file
|
After Width: | Height: | Size: 56 KiB |
@@ -4,6 +4,7 @@ import burp.action.*;
|
||||
import burp.ui.MainUI;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@@ -19,7 +20,8 @@ import javax.swing.event.ChangeListener;
|
||||
|
||||
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
|
||||
private final MainUI main = new MainUI();
|
||||
private static PrintWriter stdout;
|
||||
// stdout变成公开属性,便于其他类调用输出调试信息
|
||||
public static PrintWriter stdout;
|
||||
private IBurpExtenderCallbacks callbacks;
|
||||
private static IExtensionHelpers helpers;
|
||||
GetColorKey gck = new GetColorKey();
|
||||
@@ -32,12 +34,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
||||
this.callbacks = callbacks;
|
||||
BurpExtender.helpers = callbacks.getHelpers();
|
||||
|
||||
String version = "2.2.3";
|
||||
String version = "2.4.6";
|
||||
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("@First Author: EvilChen");
|
||||
stdout.println("@Second Author: 0chencc");
|
||||
stdout.println("@Github: https://github.com/gh0stkey/HaE");
|
||||
// UI
|
||||
SwingUtilities.invokeLater(this::initialize);
|
||||
@@ -75,21 +77,34 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
||||
content = messageInfo.getResponse();
|
||||
}
|
||||
|
||||
IHttpService iHttpService = null;
|
||||
try {
|
||||
iHttpService = messageInfo.getHttpService();
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
// 获取请求主机信息
|
||||
assert iHttpService != null;
|
||||
String host = iHttpService.getHost();
|
||||
|
||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
|
||||
|
||||
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true, host);
|
||||
if (result != null && !result.isEmpty() && result.size() > 0) {
|
||||
String originalColor = messageInfo.getHighlight();
|
||||
String originalComment = messageInfo.getComment();
|
||||
List<String> colorList = new ArrayList<>();
|
||||
|
||||
if (originalColor != null) {
|
||||
colorList.add(originalColor);
|
||||
}
|
||||
|
||||
colorList.add(result.get(0).get("color"));
|
||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||
|
||||
messageInfo.setHighlight(color);
|
||||
|
||||
String addComment = String.join(", ", result.get(1).get("comment"));
|
||||
String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
|
||||
String resComment = !Objects.equals(originalComment, "") ? String.format("%s, %s", originalComment, addComment) : addComment;
|
||||
|
||||
messageInfo.setComment(resComment);
|
||||
}
|
||||
@@ -102,6 +117,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
||||
private final IMessageEditorController controller;
|
||||
private Map<String, String> extractRequestMap;
|
||||
private Map<String, String> extractResponseMap;
|
||||
private ArrayList<String> titleList = new ArrayList<>();
|
||||
|
||||
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
|
||||
this.controller = controller;
|
||||
@@ -126,7 +142,8 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
||||
@Override
|
||||
public boolean isEnabled(byte[] content, boolean isRequest) {
|
||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||
List<Map<String, 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) {
|
||||
@@ -184,25 +201,34 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
||||
* 创建MarkInfo表单
|
||||
*/
|
||||
public void makeTable(Map<String, String> dataMap) {
|
||||
ArrayList<String> lTitleList = new ArrayList<>();
|
||||
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"}));
|
||||
JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[]{"Information"}));
|
||||
lTitleList.add(i);
|
||||
this.jTabbedPane.addTab(i, jScrollPane);
|
||||
// 使用removeAll会导致UI出现空白的情况,为了改善用户侧体验,采用remove的方式进行删除
|
||||
});
|
||||
|
||||
/*
|
||||
* 使用removeAll会导致MarkInfo UI出现空白的情况,为了改善用户侧体验,采用remove的方式进行删除;
|
||||
* 采用全局ArrayList的方式遍历删除Tab,以此应对BurpSuite缓存机制导致的MarkInfo UI错误展示。
|
||||
*/
|
||||
titleList.forEach(t->{
|
||||
int indexOfTab = this.jTabbedPane.indexOfTab(t);
|
||||
if (indexOfTab != -1) {
|
||||
this.jTabbedPane.remove(indexOfTab);
|
||||
this.jTabbedPane.removeTabAt(indexOfTab);
|
||||
}
|
||||
});
|
||||
|
||||
titleList = lTitleList;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
|
||||
return new MarkInfoTab(controller, editable);
|
||||
|
||||
@@ -4,6 +4,8 @@ package burp;
|
||||
* @author EvilChen
|
||||
*/
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class Config {
|
||||
@@ -11,6 +13,8 @@ public class Config {
|
||||
|
||||
public static String[] scopeArray = new String[] {
|
||||
"any",
|
||||
"any header",
|
||||
"any body",
|
||||
"response",
|
||||
"response header",
|
||||
"response body",
|
||||
@@ -37,4 +41,6 @@ public class Config {
|
||||
};
|
||||
|
||||
public static Map<String,Object[][]> ruleConfig = null;
|
||||
|
||||
public static Map<String, Map<String, List<String>>> globalDataMap = new HashMap<>();
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package burp.action;
|
||||
|
||||
import burp.BurpExtender;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import burp.Config;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -12,11 +12,11 @@ import java.util.List;
|
||||
|
||||
public class DoAction {
|
||||
public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
|
||||
Map<String, String> resultMap = new HashMap<String, String>();
|
||||
Map<String, String> resultMap = new HashMap<>();
|
||||
obj.keySet().forEach(i->{
|
||||
Map<String, Object> tmpMap = obj.get(i);
|
||||
String data = tmpMap.get("data").toString();
|
||||
resultMap.put(i, String.format("%s\n", data).intern());
|
||||
resultMap.put(i, data);
|
||||
});
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
package burp.action;
|
||||
|
||||
import burp.BurpExtender;
|
||||
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;
|
||||
@@ -18,76 +17,130 @@ import jregex.Pattern;
|
||||
|
||||
public class ExtractContent {
|
||||
|
||||
public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString) {
|
||||
public Map<String, Map<String, Object>> matchRegex(byte[] content, String headers, byte[] body, String scopeString, String host) {
|
||||
Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
|
||||
Config.ruleConfig.keySet().forEach(i -> {
|
||||
String matchContent = "";
|
||||
for (Object[] objects : Config.ruleConfig.get(i)) {
|
||||
// 遍历获取规则
|
||||
List<String> result = new ArrayList<>();
|
||||
Map<String, Object> tmpMap = new HashMap<>();
|
||||
// 多线程执行,一定程度上减少阻塞现象
|
||||
Thread t = new Thread(() -> {
|
||||
String matchContent = "";
|
||||
// 遍历获取规则
|
||||
List<String> result = new ArrayList<>();
|
||||
Map<String, Object> tmpMap = new HashMap<>();
|
||||
|
||||
String name = objects[1].toString();
|
||||
boolean loaded = (Boolean) objects[0];
|
||||
String regex = objects[2].toString();
|
||||
String color = objects[3].toString();
|
||||
String scope = objects[4].toString();
|
||||
String engine = objects[5].toString();
|
||||
// 判断规则是否开启与作用域
|
||||
if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
|
||||
switch (scope) {
|
||||
case "any":
|
||||
case "request":
|
||||
case "response":
|
||||
matchContent = new String(content, StandardCharsets.UTF_8).intern();
|
||||
break;
|
||||
case "request header":
|
||||
case "response header":
|
||||
matchContent = headers;
|
||||
break;
|
||||
case "request body":
|
||||
case "response body":
|
||||
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if ("nfa".equals(engine)) {
|
||||
Pattern pattern = new Pattern(regex);
|
||||
Matcher matcher = pattern.matcher(matchContent);
|
||||
while (matcher.find()) {
|
||||
// 添加匹配数据至list
|
||||
// 强制用户使用()包裹正则
|
||||
result.add(matcher.group(1));
|
||||
String name = objects[1].toString();
|
||||
boolean loaded = (Boolean) objects[0];
|
||||
String regex = objects[2].toString();
|
||||
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) || scope.contains("any"))) {
|
||||
switch (scope) {
|
||||
case "any":
|
||||
case "request":
|
||||
case "response":
|
||||
matchContent = new String(content, StandardCharsets.UTF_8).intern();
|
||||
break;
|
||||
case "any header":
|
||||
case "request header":
|
||||
case "response header":
|
||||
matchContent = headers;
|
||||
break;
|
||||
case "any body":
|
||||
case "request body":
|
||||
case "response body":
|
||||
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
RegExp regexp = new RegExp(regex);
|
||||
Automaton auto = regexp.toAutomaton();
|
||||
RunAutomaton runAuto = new RunAutomaton(auto, true);
|
||||
AutomatonMatcher autoMatcher = runAuto.newMatcher(matchContent);
|
||||
while (autoMatcher.find()) {
|
||||
// 添加匹配数据至list
|
||||
// 强制用户使用()包裹正则
|
||||
result.add(autoMatcher.group());
|
||||
|
||||
if ("nfa".equals(engine)) {
|
||||
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
|
||||
// 强制用户使用()包裹正则
|
||||
result.add(matcher.group(1));
|
||||
}
|
||||
} else {
|
||||
RegExp regexp = new RegExp(regex);
|
||||
Automaton auto = regexp.toAutomaton();
|
||||
RunAutomaton runAuto = new RunAutomaton(auto, true);
|
||||
AutomatonMatcher autoMatcher = runAuto.newMatcher(matchContent);
|
||||
while (autoMatcher.find()) {
|
||||
// 添加匹配数据至list
|
||||
// 强制用户使用()包裹正则
|
||||
result.add(autoMatcher.group());
|
||||
}
|
||||
}
|
||||
|
||||
// 去除重复内容
|
||||
HashSet tmpList = new HashSet(result);
|
||||
result.clear();
|
||||
result.addAll(tmpList);
|
||||
|
||||
if (!result.isEmpty()) {
|
||||
tmpMap.put("color", color);
|
||||
String dataStr = String.join("\n", result);
|
||||
tmpMap.put("data", dataStr);
|
||||
|
||||
// 添加到全局变量中,便于Databoard检索
|
||||
if (!host.isEmpty()) {
|
||||
String anyHost = host.replace(host.split("\\.")[0], "*");
|
||||
List<String> dataList = Arrays.asList(dataStr.split("\n"));
|
||||
if (Config.globalDataMap.containsKey(host)) {
|
||||
Map<String, List<String>> gRuleMap = Config.globalDataMap.get(host);
|
||||
// 判断匹配规则是否存在(逻辑同Host判断)
|
||||
if (gRuleMap.containsKey(name)) {
|
||||
List<String> gDataList = gRuleMap.get(name);
|
||||
List<String> mergeDataList = new ArrayList<>(gDataList);
|
||||
// 合并两个List
|
||||
mergeDataList.addAll(dataList);
|
||||
// 去重操作
|
||||
tmpList = new HashSet(mergeDataList);
|
||||
mergeDataList.clear();
|
||||
mergeDataList.addAll(tmpList);
|
||||
// 替换操作
|
||||
gRuleMap.replace(name, gDataList, mergeDataList);
|
||||
} else {
|
||||
gRuleMap.put(name, dataList);
|
||||
}
|
||||
} else if (!Config.globalDataMap.containsKey(anyHost)) {
|
||||
// 添加通配符Host
|
||||
Config.globalDataMap.put(anyHost, new HashMap<>());
|
||||
} else {
|
||||
Map<String, List<String>> ruleMap = new HashMap<>();
|
||||
ruleMap.put(name, dataList);
|
||||
// 添加单一Host
|
||||
Config.globalDataMap.put(host, ruleMap);
|
||||
}
|
||||
}
|
||||
|
||||
map.put(name, tmpMap);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// 去除重复内容
|
||||
HashSet tmpList = new HashSet(result);
|
||||
result.clear();
|
||||
result.addAll(tmpList);
|
||||
|
||||
if (!result.isEmpty()) {
|
||||
tmpMap.put("color", color);
|
||||
tmpMap.put("data", String.join("\n", result));
|
||||
// 初始化格式
|
||||
map.put(name, tmpMap);
|
||||
}
|
||||
});
|
||||
t.start();
|
||||
try {
|
||||
t.join();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
package burp.action;
|
||||
|
||||
import burp.BurpExtender;
|
||||
import burp.IExtensionHelpers;
|
||||
import burp.IHttpService;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
@@ -16,7 +15,7 @@ public class ProcessMessage {
|
||||
GetColorKey gck = new GetColorKey();
|
||||
UpgradeColor uc = new UpgradeColor();
|
||||
|
||||
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
|
||||
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo, String host) {
|
||||
List<Map<String, String>> result = new ArrayList<>();;
|
||||
Map<String, Map<String, Object>> obj;
|
||||
|
||||
@@ -44,7 +43,7 @@ public class ProcessMessage {
|
||||
int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
|
||||
byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
|
||||
|
||||
obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
|
||||
obj = ec.matchRegex(content, requestHeaders, requestBody, "request", host);
|
||||
} else {
|
||||
try {
|
||||
// 流量清洗
|
||||
@@ -65,26 +64,26 @@ public class ProcessMessage {
|
||||
int responseBodyOffset = helpers.analyzeResponse(content).getBodyOffset();
|
||||
byte[] responseBody = Arrays.copyOfRange(content, responseBodyOffset, content.length);
|
||||
|
||||
obj = ec.matchRegex(content, responseHeaders, responseBody, "response");
|
||||
obj = ec.matchRegex(content, responseHeaders, responseBody, "response", host);
|
||||
}
|
||||
|
||||
if (messageInfo) {
|
||||
List<List<String>> resultList = da.highlightAndComment(obj);
|
||||
List<String> colorList = resultList.get(0);
|
||||
List<String> commentList = resultList.get(1);
|
||||
if (colorList.size() != 0 && commentList.size() != 0) {
|
||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||
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) {
|
||||
if (obj.size() > 0) {
|
||||
if (messageInfo) {
|
||||
List<List<String>> resultList = da.highlightAndComment(obj);
|
||||
List<String> colorList = resultList.get(0);
|
||||
List<String> commentList = resultList.get(1);
|
||||
if (colorList.size() != 0 && commentList.size() != 0) {
|
||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||
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 {
|
||||
result.add(da.extractString(obj));
|
||||
}
|
||||
}
|
||||
|
||||
249
src/main/java/burp/ui/Databoard.java
Normal file
@@ -0,0 +1,249 @@
|
||||
package burp.ui;
|
||||
|
||||
import burp.Config;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Map;
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
|
||||
/**
|
||||
* @author LinChen && EvilChen
|
||||
*/
|
||||
|
||||
public class Databoard extends JPanel {
|
||||
public Databoard() {
|
||||
initComponents();
|
||||
}
|
||||
|
||||
/**
|
||||
* 清空数据
|
||||
*/
|
||||
private void clearActionPerformed(ActionEvent e) {
|
||||
// 清空页面
|
||||
dataTabbedPane.removeAll();
|
||||
// 判断通配符Host/单一Host
|
||||
String host = hostTextField.getText();
|
||||
if(host.contains("*")){
|
||||
Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
|
||||
Map<String, List<String>> selectHost = new HashMap<>();
|
||||
ruleMap.keySet().forEach(i -> {
|
||||
if (i.contains(host.replace("*.", ""))) {
|
||||
Config.globalDataMap.remove(i);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Config.globalDataMap.remove(host);
|
||||
}
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
||||
hostLabel = new JLabel();
|
||||
hostTextField = new JTextField();
|
||||
dataTabbedPane = new JTabbedPane();
|
||||
clearButton = new JButton();
|
||||
|
||||
//======== this ========
|
||||
setLayout(new GridBagLayout());
|
||||
((GridBagLayout)getLayout()).columnWidths = new int[] {25, 0, 0, 0, 20, 0};
|
||||
((GridBagLayout)getLayout()).rowHeights = new int[] {0, 65, 20, 0};
|
||||
((GridBagLayout)getLayout()).columnWeights = new double[] {0.0, 0.0, 1.0, 0.0, 0.0, 1.0E-4};
|
||||
((GridBagLayout)getLayout()).rowWeights = new double[] {0.0, 1.0, 0.0, 1.0E-4};
|
||||
|
||||
//---- hostLabel ----
|
||||
hostLabel.setText("Host:");
|
||||
add(hostLabel, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(8, 0, 5, 5), 0, 0));
|
||||
add(hostTextField, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(8, 0, 5, 5), 0, 0));
|
||||
clearButton.setText("Clear");
|
||||
clearButton.addActionListener(this::clearActionPerformed);
|
||||
add(clearButton, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(8, 0, 5, 5), 0, 0));
|
||||
add(dataTabbedPane, new GridBagConstraints(1, 1, 3, 2, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(8, 0, 0, 5), 0, 0));
|
||||
|
||||
setAutoMatch(hostTextField, dataTabbedPane);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Host列表
|
||||
*/
|
||||
private static List<String> getHostByList(){
|
||||
List<String> hostList = new ArrayList<>();
|
||||
hostList.addAll(Config.globalDataMap.keySet());
|
||||
return hostList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置输入自动匹配
|
||||
*/
|
||||
public static void setAutoMatch(JTextField textField, JTabbedPane tabbedPane) {
|
||||
final DefaultComboBoxModel comboBoxModel = new DefaultComboBoxModel();
|
||||
|
||||
final JComboBox hostComboBox = new JComboBox(comboBoxModel) {
|
||||
@Override
|
||||
public Dimension getPreferredSize() {
|
||||
return new Dimension(super.getPreferredSize().width, 0);
|
||||
}
|
||||
};
|
||||
|
||||
isMatchHost = false;
|
||||
|
||||
for (String host : getHostByList()) {
|
||||
comboBoxModel.addElement(host);
|
||||
}
|
||||
|
||||
hostComboBox.setSelectedItem(null);
|
||||
|
||||
hostComboBox.addActionListener(e -> {
|
||||
if (!isMatchHost) {
|
||||
if (hostComboBox.getSelectedItem() != null) {
|
||||
textField.setText(hostComboBox.getSelectedItem().toString());
|
||||
getInfoByHost(hostComboBox, tabbedPane, textField);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 事件监听
|
||||
textField.addKeyListener(new KeyAdapter() {
|
||||
@Override
|
||||
public void keyPressed(KeyEvent e) {
|
||||
isMatchHost = true;
|
||||
if (e.getKeyCode() == KeyEvent.VK_SPACE) {
|
||||
if (hostComboBox.isPopupVisible()) {
|
||||
e.setKeyCode(KeyEvent.VK_ENTER);
|
||||
}
|
||||
}
|
||||
if (e.getKeyCode() == KeyEvent.VK_ENTER
|
||||
|| e.getKeyCode() == KeyEvent.VK_UP
|
||||
|| e.getKeyCode() == KeyEvent.VK_DOWN) {
|
||||
e.setSource(hostComboBox);
|
||||
hostComboBox.dispatchEvent(e);
|
||||
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
|
||||
textField.setText(hostComboBox.getSelectedItem().toString());
|
||||
getInfoByHost(hostComboBox, tabbedPane, textField);
|
||||
hostComboBox.setPopupVisible(false);
|
||||
}
|
||||
}
|
||||
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
|
||||
hostComboBox.setPopupVisible(false);
|
||||
}
|
||||
isMatchHost = false;
|
||||
}
|
||||
});
|
||||
|
||||
textField.getDocument().addDocumentListener(new DocumentListener() {
|
||||
@Override
|
||||
public void insertUpdate(DocumentEvent e) {
|
||||
updateList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeUpdate(DocumentEvent e) {
|
||||
updateList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changedUpdate(DocumentEvent e) {
|
||||
updateList();
|
||||
}
|
||||
|
||||
private void updateList() {
|
||||
isMatchHost = true;
|
||||
comboBoxModel.removeAllElements();
|
||||
String input = textField.getText();
|
||||
if (!input.isEmpty()){
|
||||
for (String host : getHostByList()) {
|
||||
if (host.toLowerCase().contains(input.toLowerCase())) {
|
||||
if (host.length() == input.length()){
|
||||
comboBoxModel.insertElementAt(host,0);
|
||||
comboBoxModel.setSelectedItem(host);
|
||||
}else{
|
||||
comboBoxModel.addElement(host);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
hostComboBox.setPopupVisible(comboBoxModel.getSize() > 0);
|
||||
isMatchHost = false;
|
||||
}
|
||||
});
|
||||
|
||||
textField.setLayout(new BorderLayout());
|
||||
textField.add(hostComboBox, BorderLayout.SOUTH);
|
||||
}
|
||||
|
||||
private static void getInfoByHost(@NotNull JComboBox hostComboBox, JTabbedPane tabbedPane, JTextField textField) {
|
||||
if (hostComboBox.getSelectedItem() != null) {
|
||||
Map<String, Map<String, List<String>>> ruleMap = Config.globalDataMap;
|
||||
Map<String, List<String>> selectHost = new HashMap<>();
|
||||
String host = hostComboBox.getSelectedItem().toString();
|
||||
if (host.contains("*")) {
|
||||
// 通配符数据
|
||||
Map<String, List<String>> finalSelectHost = selectHost;
|
||||
ruleMap.keySet().forEach(i -> {
|
||||
if (i.contains(host.replace("*.", ""))) {
|
||||
ruleMap.get(i).keySet().forEach(e -> {
|
||||
if (finalSelectHost.containsKey(e)) {
|
||||
// 合并操作
|
||||
List<String> newList = new ArrayList<>(finalSelectHost.get(e));
|
||||
newList.addAll(ruleMap.get(i).get(e));
|
||||
// 去重操作
|
||||
HashSet tmpList = new HashSet(newList);
|
||||
newList.clear();
|
||||
newList.addAll(tmpList);
|
||||
// 添加操作
|
||||
finalSelectHost.put(e, newList);
|
||||
} else {
|
||||
finalSelectHost.put(e, ruleMap.get(i).get(e));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
selectHost = ruleMap.get(host);
|
||||
}
|
||||
|
||||
tabbedPane.removeAll();
|
||||
for(Map.Entry<String, List<String>> entry: selectHost.entrySet()){
|
||||
tabbedPane.addTab(entry.getKey(), new JScrollPane(new HitRuleDataList(entry.getValue())));
|
||||
}
|
||||
textField.setText(hostComboBox.getSelectedItem().toString());
|
||||
}
|
||||
}
|
||||
|
||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||
private JLabel hostLabel;
|
||||
private JTextField hostTextField;
|
||||
private JTabbedPane dataTabbedPane;
|
||||
private JButton clearButton;
|
||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||
|
||||
// 是否自动匹配Host
|
||||
private static Boolean isMatchHost = false;
|
||||
}
|
||||
class HitRuleDataList extends JTable {
|
||||
public HitRuleDataList(List<String> list){
|
||||
DefaultTableModel model = new DefaultTableModel();
|
||||
Object[][] data = new Object[list.size()][1];
|
||||
for (int x = 0; x < list.size(); x++) {
|
||||
data[x][0] = list.get(x);
|
||||
}
|
||||
model.setDataVector(data, new Object[]{"Information"});
|
||||
this.setModel(model);
|
||||
}
|
||||
}
|
||||
@@ -60,7 +60,6 @@ public class JTabbedPaneCloseButton extends JTabbedPane {
|
||||
|
||||
/** Button */
|
||||
public class CloseButtonTab extends JPanel {
|
||||
|
||||
public CloseButtonTab(final Component tab, String title, Icon icon) {
|
||||
setOpaque(false);
|
||||
FlowLayout flowLayout = new FlowLayout(FlowLayout.CENTER, 3, 3);
|
||||
|
||||
@@ -4,18 +4,21 @@ import burp.Config;
|
||||
import burp.yaml.LoadConfig;
|
||||
import burp.yaml.SetConfig;
|
||||
|
||||
import com.squareup.okhttp.OkHttpClient;
|
||||
import com.squareup.okhttp.Request;
|
||||
import com.squareup.okhttp.Response;
|
||||
import java.io.FileOutputStream;
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.event.ChangeListener;
|
||||
import javax.swing.event.DocumentEvent;
|
||||
import javax.swing.event.DocumentListener;
|
||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author LinChen
|
||||
* @author LinChen && EvilChen
|
||||
*/
|
||||
|
||||
public class MainUI extends JPanel{
|
||||
@@ -32,7 +35,7 @@ public class MainUI extends JPanel{
|
||||
setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
|
||||
ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
|
||||
ruleTabbedPane.setSelectedIndex(ruleTabbedPane.getSelectedIndex()-1);
|
||||
}else{
|
||||
} else {
|
||||
SetConfig setConn = new SetConfig();
|
||||
setConn.deleteRules(ruleTabbedPane.getTitleAt(ruleTabbedPane.getSelectedIndex()));
|
||||
ruleTabbedPane.remove(ruleTabbedPane.getSelectedIndex());
|
||||
@@ -41,19 +44,30 @@ public class MainUI extends JPanel{
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
private void onlineUpdateActionPerformed(ActionEvent e) {
|
||||
// 添加提示框防止用户误触导致配置更新
|
||||
int retCode = JOptionPane.showConfirmDialog(null, "Do you want to update config?", "Info",
|
||||
JOptionPane.YES_NO_CANCEL_OPTION);
|
||||
if (retCode == JOptionPane.YES_OPTION) {
|
||||
String url = "https://cdn.jsdelivr.net/gh/gh0stkey/HaE@gh-pages/Config.yml";
|
||||
OkHttpClient httpClient = new OkHttpClient();
|
||||
Request httpRequest = new Request.Builder().url(url).get().build();
|
||||
try {
|
||||
Response httpResponse = httpClient.newCall(httpRequest).execute();
|
||||
// 获取官方规则文件,在线更新写入
|
||||
String configFile = configTextField.getText();
|
||||
FileOutputStream fileOutputStream = new FileOutputStream(configFile);
|
||||
fileOutputStream.write(httpResponse.body().bytes());
|
||||
JOptionPane.showMessageDialog(null, "Config file updated successfully!", "Error",
|
||||
JOptionPane.INFORMATION_MESSAGE);
|
||||
} catch (Exception ignored) {
|
||||
JOptionPane.showMessageDialog(null, "Please check your network!", "Error",
|
||||
JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
|
||||
new LoadConfig();
|
||||
reloadRule();
|
||||
loadConn.setConfigPath(configPath);
|
||||
configTextField.setText(configPath);
|
||||
}
|
||||
new LoadConfig();
|
||||
}
|
||||
|
||||
private void reloadRule(){
|
||||
@@ -70,21 +84,21 @@ public class MainUI extends JPanel{
|
||||
ruleSwitch.setListen(true);
|
||||
}
|
||||
|
||||
private void reloadMouseClicked(MouseEvent e) {
|
||||
private void reloadActionPerformed(ActionEvent e) {
|
||||
reloadRule();
|
||||
}
|
||||
|
||||
private void excludeSuffixSaveMouseClicked(MouseEvent e) {
|
||||
private void excludeSuffixSaveActionPerformed(ActionEvent e) {
|
||||
LoadConfig loadCon = new LoadConfig();
|
||||
loadCon.setExcludeSuffix(excludeSuffixTextField.getText());
|
||||
}
|
||||
private void initComponents() {
|
||||
rulesTabbedPane = new JTabbedPane();
|
||||
mainTabbedPane = new JTabbedPane();
|
||||
ruleTabbedPane = new JTabbedPane();
|
||||
rulePanel = new JPanel();
|
||||
configTextField = new JTextField();
|
||||
configLabel = new JLabel();
|
||||
selectFileButton = new JButton();
|
||||
onlineUpdateButton = new JButton();
|
||||
reloadButton = new JButton();
|
||||
excludeSuffixLabel = new JLabel();
|
||||
excludeSuffixTextField = new JTextField();
|
||||
@@ -97,7 +111,7 @@ public class MainUI extends JPanel{
|
||||
((GridBagLayout)getLayout()).rowWeights = new double[] {1.0, 1.0E-4};
|
||||
|
||||
{
|
||||
rulesTabbedPane.addTab("Rules", ruleTabbedPane);
|
||||
mainTabbedPane.addTab("Rules", ruleTabbedPane);
|
||||
|
||||
{
|
||||
rulePanel.setLayout(new GridBagLayout());
|
||||
@@ -111,35 +125,25 @@ public class MainUI extends JPanel{
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(5, 0, 5, 5), 0, 0));
|
||||
|
||||
configLabel.setText("Config File Path:");
|
||||
configLabel.setText("Config 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));
|
||||
|
||||
selectFileButton.setText("Select File ...");
|
||||
selectFileButton.addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
selectFileMouseClicked(e);
|
||||
}
|
||||
});
|
||||
rulePanel.add(selectFileButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
||||
onlineUpdateButton.setText("Online Update");
|
||||
onlineUpdateButton.addActionListener(this::onlineUpdateActionPerformed);
|
||||
rulePanel.add(onlineUpdateButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(5, 0, 5, 5), 0, 0));
|
||||
|
||||
reloadButton.setText("Reload");
|
||||
reloadButton.addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
reloadMouseClicked(e);
|
||||
}
|
||||
});
|
||||
reloadButton.addActionListener(this::reloadActionPerformed);
|
||||
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));
|
||||
|
||||
excludeSuffixLabel.setText("ExcludeSuffix:");
|
||||
excludeSuffixLabel.setText("Exclude Suffix:");
|
||||
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));
|
||||
@@ -148,19 +152,15 @@ public class MainUI extends JPanel{
|
||||
new Insets(0, 0, 0, 5), 0, 0));
|
||||
|
||||
excludeSuffixSaveButton.setText("Save");
|
||||
excludeSuffixSaveButton.addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
excludeSuffixSaveMouseClicked(e);
|
||||
}
|
||||
});
|
||||
excludeSuffixSaveButton.addActionListener(this::excludeSuffixSaveActionPerformed);
|
||||
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));
|
||||
}
|
||||
rulesTabbedPane.addTab("Config", rulePanel);
|
||||
mainTabbedPane.addTab("Config", rulePanel);
|
||||
mainTabbedPane.addTab("Databoard", databoardPanel);
|
||||
}
|
||||
add(rulesTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
|
||||
add(mainTabbedPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(0, 0, 0, 0), 0, 0));
|
||||
|
||||
@@ -174,21 +174,21 @@ public class MainUI extends JPanel{
|
||||
ruleSwitch = new TabTitleEditListener(ruleTabbedPane);
|
||||
ruleTabbedPane.addChangeListener(ruleSwitch);
|
||||
ruleTabbedPane.addMouseListener(ruleSwitch);
|
||||
closeTabMenuItem.addActionListener(e -> closeTabActionPerformed(e));
|
||||
closeTabMenuItem.addActionListener(this::closeTabActionPerformed);
|
||||
tabMenu.add(closeTabMenuItem);
|
||||
}
|
||||
|
||||
private JTabbedPane rulesTabbedPane;
|
||||
private JTabbedPane mainTabbedPane;
|
||||
private JTabbedPane ruleTabbedPane;
|
||||
private JPanel rulePanel;
|
||||
private JTextField configTextField;
|
||||
private JLabel configLabel;
|
||||
private JButton selectFileButton;
|
||||
private JButton onlineUpdateButton;
|
||||
private JButton reloadButton;
|
||||
private JLabel excludeSuffixLabel;
|
||||
private JTextField excludeSuffixTextField;
|
||||
private JButton excludeSuffixSaveButton;
|
||||
|
||||
private Databoard databoardPanel = new Databoard();
|
||||
protected static JPopupMenu tabMenu = new JPopupMenu();
|
||||
private JMenuItem closeTabMenuItem = new JMenuItem("Delete");
|
||||
private TabTitleEditListener ruleSwitch;
|
||||
@@ -284,7 +284,7 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
|
||||
}
|
||||
|
||||
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", false}};
|
||||
insertTab(ruleEditTabbedPane, setConfig.newRules(),data);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,14 +2,14 @@ package burp.ui;
|
||||
|
||||
import burp.yaml.SetConfig;
|
||||
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.TableModelEvent;
|
||||
import javax.swing.event.TableModelListener;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
import javax.swing.table.TableRowSorter;
|
||||
import java.awt.*;
|
||||
import java.awt.event.MouseAdapter;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.util.Vector;
|
||||
|
||||
/**
|
||||
@@ -23,46 +23,54 @@ public class RulePane extends JPanel {
|
||||
private SetConfig setConfig = new SetConfig();
|
||||
private Boolean isEdit = false;
|
||||
|
||||
private void ruleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
|
||||
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.regexTextField.getText());
|
||||
data.add(add.colorComboBox.getSelectedItem().toString());
|
||||
data.add(add.scopeComboBox.getSelectedItem().toString());
|
||||
data.add(add.engineComboBox.getSelectedItem().toString());
|
||||
model.insertRow(model.getRowCount(), data);
|
||||
private void ruleAddActionPerformed(ActionEvent 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(data, pane.getTitleAt(pane.getSelectedIndex()));
|
||||
setConfig.add(ruleData, pane.getTitleAt(pane.getSelectedIndex()));
|
||||
}
|
||||
}
|
||||
|
||||
private void ruleEditMouseClicked(MouseEvent e, JTabbedPane pane){
|
||||
private void ruleEditActionPerformed(ActionEvent e, JTabbedPane pane){
|
||||
if (ruleTable.getSelectedRowCount() >= 1){
|
||||
RuleSetting edit = new RuleSetting();
|
||||
edit.Name.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 1).toString());
|
||||
edit.regexTextField.setText(ruleTable.getValueAt(ruleTable.getSelectedRow(), 2).toString());
|
||||
edit.colorComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 3).toString());
|
||||
edit.scopeComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 4).toString());
|
||||
edit.engineComboBox.setSelectedItem(ruleTable.getValueAt(ruleTable.getSelectedRow(), 5).toString());
|
||||
int isOk = JOptionPane.showConfirmDialog(null, edit, "RuleSetting - Edit Rule", JOptionPane.OK_OPTION);
|
||||
if (isOk == 0){
|
||||
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));
|
||||
|
||||
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(edit.Name.getText(), select, 1);
|
||||
model.setValueAt(edit.regexTextField.getText(), select, 2);
|
||||
model.setValueAt(edit.colorComboBox.getSelectedItem().toString(), select, 3);
|
||||
model.setValueAt(edit.scopeComboBox.getSelectedItem().toString(), select, 4);
|
||||
model.setValueAt(edit.engineComboBox.getSelectedItem().toString(), select, 5);
|
||||
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){
|
||||
private void ruleRemoveActionPerformed(ActionEvent e, JTabbedPane pane){
|
||||
if (ruleTable.getSelectedRowCount() >= 1){
|
||||
int isOk = JOptionPane.showConfirmDialog(null, "Are your sure?", "RuleSetting - Delete Rule", JOptionPane.OK_OPTION);
|
||||
if (isOk == 0){
|
||||
@@ -100,35 +108,35 @@ public class RulePane extends JPanel {
|
||||
//---- addButton ----
|
||||
addButton.setText("Add");
|
||||
|
||||
addButton.addMouseListener(new MouseAdapter() {
|
||||
addButton.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
isEdit = true;
|
||||
ruleAddMouseClicked(e, pane);
|
||||
ruleAddActionPerformed(e, pane);
|
||||
model = (DefaultTableModel) ruleTable.getModel();
|
||||
isEdit = false;
|
||||
}
|
||||
});
|
||||
|
||||
add(addButton, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
|
||||
GridBagConstraints.CENTER, GridBagConstraints.BOTH,
|
||||
new Insets(15, 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() {
|
||||
editButton.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
isEdit = true;
|
||||
ruleEditMouseClicked(e, pane);
|
||||
ruleEditActionPerformed(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));
|
||||
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 ========
|
||||
{
|
||||
@@ -142,26 +150,26 @@ public class RulePane extends JPanel {
|
||||
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));
|
||||
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() {
|
||||
removeButton.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
isEdit = true;
|
||||
ruleRemoveMouseClicked(e, pane);
|
||||
ruleRemoveActionPerformed(e, pane);
|
||||
model = (DefaultTableModel) ruleTable.getModel();
|
||||
isEdit = false;
|
||||
}
|
||||
});
|
||||
|
||||
add(removeButton, 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
|
||||
ruleTable.setModel(model);
|
||||
@@ -183,7 +191,7 @@ public class RulePane extends JPanel {
|
||||
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() {
|
||||
@Override
|
||||
public Class<?> getColumnClass (int column){
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
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;
|
||||
@@ -14,16 +18,18 @@ public class RuleSetting extends JPanel {
|
||||
}
|
||||
|
||||
public void initComponents() {
|
||||
sensitiveLabel = new JLabel();
|
||||
engineLabel = new JLabel();
|
||||
scopeLabel = new JLabel();
|
||||
regexTextField = new JTextField();
|
||||
regexLabel = new JLabel();
|
||||
nameLabel = new JLabel();
|
||||
Name = new JTextField();
|
||||
ruleNameTextField = new JTextField();
|
||||
scopeComboBox = new JComboBox<>();
|
||||
engineComboBox = new JComboBox<>();
|
||||
colorLabel = new JLabel();
|
||||
colorComboBox = new JComboBox<>();
|
||||
sensitiveComboBox = new JComboBox<>();
|
||||
|
||||
setLayout(null);
|
||||
|
||||
@@ -31,6 +37,10 @@ public class RuleSetting extends JPanel {
|
||||
add(engineLabel);
|
||||
engineLabel.setBounds(new Rectangle(new Point(10, 175), engineLabel.getPreferredSize()));
|
||||
|
||||
sensitiveLabel.setText("Sensitive:");
|
||||
add(sensitiveLabel);
|
||||
sensitiveLabel.setBounds(new Rectangle(new Point(10,215), sensitiveLabel.getPreferredSize()));
|
||||
|
||||
scopeLabel.setText("Scope:");
|
||||
add(scopeLabel);
|
||||
scopeLabel.setBounds(new Rectangle(new Point(10, 135), scopeLabel.getPreferredSize()));
|
||||
@@ -44,14 +54,25 @@ public class RuleSetting extends JPanel {
|
||||
nameLabel.setText("Name:");
|
||||
add(nameLabel);
|
||||
nameLabel.setBounds(new Rectangle(new Point(10, 15), nameLabel.getPreferredSize()));
|
||||
add(Name);
|
||||
Name.setBounds(70, 10, 265, 30);
|
||||
add(ruleNameTextField);
|
||||
ruleNameTextField.setBounds(70, 10, 265, 30);
|
||||
|
||||
scopeComboBox.setModel(new DefaultComboBoxModel<>(Config.scopeArray));
|
||||
add(scopeComboBox);
|
||||
scopeComboBox.setBounds(70, 130, 265, scopeComboBox.getPreferredSize().height);
|
||||
|
||||
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);
|
||||
|
||||
@@ -63,6 +84,10 @@ public class RuleSetting extends JPanel {
|
||||
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);
|
||||
|
||||
{
|
||||
Dimension preferredSize = new Dimension();
|
||||
for(int i = 0; i < getComponentCount(); i++) {
|
||||
@@ -79,13 +104,15 @@ public class RuleSetting extends JPanel {
|
||||
}
|
||||
|
||||
private JLabel engineLabel;
|
||||
private JLabel sensitiveLabel;
|
||||
private JLabel scopeLabel;
|
||||
public JTextField regexTextField;
|
||||
private JLabel regexLabel;
|
||||
private JLabel nameLabel;
|
||||
public JTextField Name;
|
||||
public JTextField ruleNameTextField;
|
||||
public JComboBox<String> scopeComboBox;
|
||||
public JComboBox<String> engineComboBox;
|
||||
private JLabel colorLabel;
|
||||
public JComboBox<String> colorComboBox;
|
||||
public JComboBox<Boolean> sensitiveComboBox;
|
||||
}
|
||||
|
||||
@@ -17,19 +17,26 @@ import org.yaml.snakeyaml.nodes.Tag;
|
||||
|
||||
public class LoadConfig {
|
||||
private static final Yaml yaml = new Yaml();
|
||||
private static final String SettingPath = "Setting.yml";
|
||||
private static final String ConfigPath = "Config.yml";
|
||||
private static String HaEConfigPath = String.format("%s/.config/HaE", System.getProperty("user.home"));
|
||||
private static String SettingPath = String.format("%s/%s", HaEConfigPath, "Setting.yml");
|
||||
private static String ConfigPath = String.format("%s/%s", HaEConfigPath, "Config.yml");
|
||||
|
||||
public LoadConfig() {
|
||||
// 构造函数,初始化配置
|
||||
File yamlSetting = new File(SettingPath);
|
||||
if (!(yamlSetting.exists() && yamlSetting.isFile())) {
|
||||
File HaEConfigPathFile = new File(HaEConfigPath);
|
||||
if (!(HaEConfigPathFile.exists() && HaEConfigPathFile.isDirectory())) {
|
||||
HaEConfigPathFile.mkdirs();
|
||||
}
|
||||
|
||||
File settingPathFile = new File(SettingPath);
|
||||
if (!(settingPathFile.exists() && settingPathFile.isFile())) {
|
||||
initSetting();
|
||||
initRules();
|
||||
}
|
||||
Config.ruleConfig = LoadConfig.getRules();
|
||||
}
|
||||
|
||||
|
||||
// 初始化设置信息
|
||||
public void initSetting() {
|
||||
Map<String, Object> r = new HashMap<>();
|
||||
@@ -52,6 +59,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<>();
|
||||
@@ -136,18 +145,6 @@ public class LoadConfig {
|
||||
return resRule;
|
||||
}
|
||||
|
||||
// 设置配置路径
|
||||
public void setConfigPath(String filePath){
|
||||
Map<String,Object> r = new HashMap<>();
|
||||
r.put("configPath", filePath);
|
||||
r.put("excludeSuffix", getExcludeSuffix());
|
||||
try{
|
||||
Writer ws = new OutputStreamWriter(new FileOutputStream(SettingPath), StandardCharsets.UTF_8);
|
||||
yaml.dump(r, ws);
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
// 设置不包含的后缀名
|
||||
public void setExcludeSuffix(String excludeSuffix){
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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 }";
|
||||
}
|
||||
}
|
||||
@@ -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";
|
||||
}
|
||||
|
||||