Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37ca315aba | ||
|
|
241247a4a0 | ||
|
|
08bfb69fce | ||
|
|
a6d5f3a204 | ||
|
|
c4d8743fe3 | ||
|
|
903077c830 |
@@ -48,7 +48,7 @@ https://gh0st.cn/HaE/
|
|||||||
|
|
||||||
访问该地址,在`Proxy - HTTP History`中可以看见高亮请求,响应标签页中含有`MarkINFO`标签,其中将匹配到的信息提取了出来。
|
访问该地址,在`Proxy - HTTP History`中可以看见高亮请求,响应标签页中含有`MarkINFO`标签,其中将匹配到的信息提取了出来。
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## 正则优化
|
## 正则优化
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 297 KiB |
BIN
images/16000720732854.png
Normal file
BIN
images/16000720732854.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 167 KiB |
@@ -3,6 +3,7 @@ package burp;
|
|||||||
import burp.action.*;
|
import burp.action.*;
|
||||||
import burp.ui.MainUI;
|
import burp.ui.MainUI;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
@@ -11,7 +12,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @author EvilChen
|
* @author EvilChen & 0chencc
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
|
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
|
||||||
@@ -29,12 +30,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
this.callbacks = callbacks;
|
this.callbacks = callbacks;
|
||||||
BurpExtender.helpers = callbacks.getHelpers();
|
BurpExtender.helpers = callbacks.getHelpers();
|
||||||
|
|
||||||
String version = "2.1.2";
|
String version = "2.2";
|
||||||
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
|
callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version));
|
||||||
// 定义输出
|
// 定义输出
|
||||||
stdout = new PrintWriter(callbacks.getStdout(), true);
|
stdout = new PrintWriter(callbacks.getStdout(), true);
|
||||||
stdout.println("@Core Author: EvilChen");
|
stdout.println("@Core Author: EvilChen");
|
||||||
stdout.println("@UI Author: 0chencc");
|
stdout.println("@Architecture Author: 0chencc");
|
||||||
stdout.println("@Github: https://github.com/gh0stkey/HaE");
|
stdout.println("@Github: https://github.com/gh0stkey/HaE");
|
||||||
// UI
|
// UI
|
||||||
SwingUtilities.invokeLater(this::initialize);
|
SwingUtilities.invokeLater(this::initialize);
|
||||||
@@ -42,10 +43,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
callbacks.registerHttpListener(BurpExtender.this);
|
callbacks.registerHttpListener(BurpExtender.this);
|
||||||
callbacks.registerMessageEditorTabFactory(BurpExtender.this);
|
callbacks.registerMessageEditorTabFactory(BurpExtender.this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initialize(){
|
private void initialize(){
|
||||||
callbacks.customizeUiComponent(main);
|
callbacks.customizeUiComponent(main);
|
||||||
callbacks.addSuiteTab(BurpExtender.this);
|
callbacks.addSuiteTab(BurpExtender.this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTabCaption(){
|
public String getTabCaption(){
|
||||||
return "HaE";
|
return "HaE";
|
||||||
@@ -69,14 +72,9 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
} else {
|
} else {
|
||||||
content = messageInfo.getResponse();
|
content = messageInfo.getResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||||
IHttpService iHttpService = null;
|
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, messageIsRequest, true);
|
||||||
try {
|
|
||||||
iHttpService = messageInfo.getHttpService();
|
|
||||||
} catch(Exception e) {
|
|
||||||
// stdout.println("iHttpService Error: " + e);
|
|
||||||
}
|
|
||||||
List<String> result = pm.processMessageByContent(helpers, iHttpService, content, messageIsRequest, true);
|
|
||||||
if (result != null && !result.isEmpty() && result.size() > 0) {
|
if (result != null && !result.isEmpty() && result.size() > 0) {
|
||||||
String originalColor = messageInfo.getHighlight();
|
String originalColor = messageInfo.getHighlight();
|
||||||
String originalComment = messageInfo.getComment();
|
String originalComment = messageInfo.getComment();
|
||||||
@@ -84,30 +82,27 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
if (originalColor != null) {
|
if (originalColor != null) {
|
||||||
colorList.add(originalColor);
|
colorList.add(originalColor);
|
||||||
}
|
}
|
||||||
colorList.add(result.get(0));
|
colorList.add(result.get(0).get("color"));
|
||||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||||
|
|
||||||
messageInfo.setHighlight(color);
|
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;
|
String resComment = originalComment != null ? String.format("%s, %s", originalComment, addComment) : addComment;
|
||||||
|
|
||||||
messageInfo.setComment(resComment);
|
messageInfo.setComment(resComment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class MarkInfoTab implements IMessageEditorTab {
|
class MarkInfoTab implements IMessageEditorTab {
|
||||||
private final ITextEditor markInfoText;
|
private final JTabbedPane jTabbedPane = new JTabbedPane();
|
||||||
private byte[] currentMessage;
|
private byte[] currentMessage;
|
||||||
private final IMessageEditorController controller;
|
private final IMessageEditorController controller;
|
||||||
private byte[] extractRequestContent;
|
private Map<String, String> extractRequestMap;
|
||||||
private byte[] extractResponseContent;
|
private Map<String, String> extractResponseMap;
|
||||||
|
|
||||||
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
|
public MarkInfoTab(IMessageEditorController controller, boolean editable) {
|
||||||
this.controller = controller;
|
this.controller = controller;
|
||||||
markInfoText = callbacks.createTextEditor();
|
|
||||||
markInfoText.setEditable(editable);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -117,45 +112,38 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Component getUiComponent() {
|
public Component getUiComponent() {
|
||||||
return markInfoText.getComponent();
|
return this.jTabbedPane;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isEnabled(byte[] content, boolean isRequest) {
|
public boolean isEnabled(byte[] content, boolean isRequest) {
|
||||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||||
IHttpService iHttpService = null;
|
List<Map<String, String>> result = pm.processMessageByContent(helpers, content, isRequest, false);
|
||||||
try {
|
|
||||||
iHttpService = controller.getHttpService();
|
|
||||||
} catch(Exception e) {
|
|
||||||
// stdout.println("iHttpService Error: " + e);
|
|
||||||
}
|
|
||||||
List<String> result = pm.processMessageByContent(helpers, iHttpService, content, isRequest, false);
|
|
||||||
if (result != null && !result.isEmpty()) {
|
if (result != null && !result.isEmpty()) {
|
||||||
|
Map<String, String> dataMap = result.get(0);
|
||||||
if (isRequest) {
|
if (isRequest) {
|
||||||
extractRequestContent = result.get(0).getBytes();
|
extractRequestMap = dataMap;
|
||||||
} else {
|
} else {
|
||||||
extractResponseContent = result.get(0).getBytes();
|
extractResponseMap = dataMap;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] getMessage() {
|
public byte[] getMessage() {
|
||||||
return currentMessage;
|
return this.currentMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isModified() {
|
public boolean isModified() {
|
||||||
return markInfoText.isTextModified();
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public byte[] getSelectedData() {
|
public byte[] getSelectedData() {
|
||||||
return markInfoText.getSelectedText();
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -165,16 +153,30 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
|
|||||||
public void setMessage(byte[] content, boolean isRequest) {
|
public void setMessage(byte[] content, boolean isRequest) {
|
||||||
String c = new String(content, StandardCharsets.UTF_8).intern();
|
String c = new String(content, StandardCharsets.UTF_8).intern();
|
||||||
if (content.length > 0) {
|
if (content.length > 0) {
|
||||||
|
this.jTabbedPane.removeAll();
|
||||||
if (isRequest) {
|
if (isRequest) {
|
||||||
markInfoText.setText(extractRequestContent);
|
makeTable(extractRequestMap);
|
||||||
} else {
|
} else {
|
||||||
markInfoText.setText(extractResponseContent);
|
makeTable(extractResponseMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
currentMessage = content;
|
this.currentMessage = content;
|
||||||
|
}
|
||||||
|
|
||||||
|
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];
|
||||||
|
}
|
||||||
|
this.jTabbedPane.addTab(i, new JScrollPane(new JTable(data, new Object[] {"Information"})));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
|
public IMessageEditorTab createNewInstance(IMessageEditorController controller, boolean editable) {
|
||||||
return new MarkInfoTab(controller, editable);
|
return new MarkInfoTab(controller, editable);
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ package burp;
|
|||||||
* @author EvilChen
|
* @author EvilChen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.util.HashMap;
|
import burp.yaml.LoadConfig;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class Config {
|
public class Config {
|
||||||
public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|arc|au|avi|azw|bin|bmp|bz|bz2|cmx|cod|csh|css|csv|doc|docx|eot|epub|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|m3u|mid|midi|mjs|mp2|mp3|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|snd|svg|swf|tar|tif|tiff|ttf|vsd|wav|weba|webm|webp|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip|zip";
|
public static String excludeSuffix = "3g2|3gp|7z|aac|abw|aif|aifc|aiff|arc|au|avi|azw|bin|bmp|bz|bz2|cmx|cod|csh|css|csv|doc|docx|eot|epub|gif|gz|ico|ics|ief|jar|jfif|jpe|jpeg|jpg|m3u|mid|midi|mjs|mp2|mp3|mpa|mpe|mpeg|mpg|mpkg|mpp|mpv2|odp|ods|odt|oga|ogv|ogx|otf|pbm|pdf|pgm|png|pnm|ppm|ppt|pptx|ra|ram|rar|ras|rgb|rmi|rtf|snd|svg|swf|tar|tif|tiff|ttf|vsd|wav|weba|webm|webp|woff|woff2|xbm|xls|xlsx|xpm|xul|xwd|zip|zip";
|
||||||
@@ -24,7 +25,6 @@ public class Config {
|
|||||||
"dfa"
|
"dfa"
|
||||||
};
|
};
|
||||||
|
|
||||||
public static String outputTplString = "[%s]\n%s\n\n";
|
|
||||||
|
|
||||||
public static String[] colorArray = new String[] {
|
public static String[] colorArray = new String[] {
|
||||||
"red",
|
"red",
|
||||||
@@ -37,4 +37,6 @@ public class Config {
|
|||||||
"magenta",
|
"magenta",
|
||||||
"gray"
|
"gray"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public static Map<String,Object[][]> ruleConfig = null;
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package burp.action;
|
package burp.action;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import burp.Config;
|
import burp.Config;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -10,15 +11,14 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public class DoAction {
|
public class DoAction {
|
||||||
public String extractString(Map<String, Map<String, Object>> obj) {
|
public Map<String, String> extractString(Map<String, Map<String, Object>> obj) {
|
||||||
String[] result = {""};
|
Map<String, String> resultMap = new HashMap<String, String>();
|
||||||
obj.keySet().forEach(i->{
|
obj.keySet().forEach(i->{
|
||||||
Map<String, Object> tmpMap = obj.get(i);
|
Map<String, Object> tmpMap = obj.get(i);
|
||||||
String data = tmpMap.get("data").toString();
|
String data = tmpMap.get("data").toString();
|
||||||
String tmpStr = String.format(Config.outputTplString, i, data).intern();
|
resultMap.put(i, String.format("%s\n", data).intern());
|
||||||
result[0] += tmpStr;
|
|
||||||
});
|
});
|
||||||
return result[0];
|
return resultMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {
|
public List<List<String>> highlightAndComment(Map<String, Map<String, Object>> obj) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package burp.action;
|
|||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
import burp.Config;
|
||||||
import burp.yaml.LoadConfig;
|
import burp.yaml.LoadConfig;
|
||||||
import dk.brics.automaton.Automaton;
|
import dk.brics.automaton.Automaton;
|
||||||
import dk.brics.automaton.AutomatonMatcher;
|
import dk.brics.automaton.AutomatonMatcher;
|
||||||
@@ -19,10 +20,9 @@ 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) {
|
||||||
Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
|
Map<String, Map<String, Object>> map = new HashMap<>(); // 最终返回的结果
|
||||||
Map<String,Object[][]> rules = LoadConfig.getRules();
|
Config.ruleConfig.keySet().forEach(i -> {
|
||||||
rules.keySet().forEach(i -> {
|
|
||||||
String matchContent = "";
|
String matchContent = "";
|
||||||
for (Object[] objects : rules.get(i)) {
|
for (Object[] objects : Config.ruleConfig.get(i)) {
|
||||||
// 遍历获取规则
|
// 遍历获取规则
|
||||||
List<String> result = new ArrayList<>();
|
List<String> result = new ArrayList<>();
|
||||||
Map<String, Object> tmpMap = new HashMap<>();
|
Map<String, Object> tmpMap = new HashMap<>();
|
||||||
@@ -34,7 +34,7 @@ public class ExtractContent {
|
|||||||
String scope = objects[4].toString();
|
String scope = objects[4].toString();
|
||||||
String engine = objects[5].toString();
|
String engine = objects[5].toString();
|
||||||
// 判断规则是否开启与作用域
|
// 判断规则是否开启与作用域
|
||||||
if (loaded && (scope.contains(scopeString) || scope.equals("any"))) {
|
if (loaded && (scope.contains(scopeString) || "any".equals(scope))) {
|
||||||
switch (scope) {
|
switch (scope) {
|
||||||
case "any":
|
case "any":
|
||||||
case "request":
|
case "request":
|
||||||
@@ -49,9 +49,11 @@ public class ExtractContent {
|
|||||||
case "response body":
|
case "response body":
|
||||||
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
matchContent = new String(body, StandardCharsets.UTF_8).intern();
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (engine.equals("nfa")) {
|
if ("nfa".equals(engine)) {
|
||||||
Pattern pattern = new Pattern(regex);
|
Pattern pattern = new Pattern(regex);
|
||||||
Matcher matcher = pattern.matcher(matchContent);
|
Matcher matcher = pattern.matcher(matchContent);
|
||||||
while (matcher.find()) {
|
while (matcher.find()) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import burp.IHttpService;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -15,14 +16,19 @@ public class ProcessMessage {
|
|||||||
GetColorKey gck = new GetColorKey();
|
GetColorKey gck = new GetColorKey();
|
||||||
UpgradeColor uc = new UpgradeColor();
|
UpgradeColor uc = new UpgradeColor();
|
||||||
|
|
||||||
public List<String> processMessageByContent(IExtensionHelpers helpers, IHttpService httpService, byte[] content, boolean isRequest, boolean messageInfo) {
|
public List<Map<String, String>> processMessageByContent(IExtensionHelpers helpers, byte[] content, boolean isRequest, boolean messageInfo) {
|
||||||
List<String> result = new ArrayList<>();;
|
List<Map<String, String>> result = new ArrayList<>();;
|
||||||
Map<String, Map<String, Object>> obj;
|
Map<String, Map<String, Object>> obj;
|
||||||
|
|
||||||
if (isRequest) {
|
if (isRequest) {
|
||||||
|
|
||||||
|
// 获取报文头
|
||||||
|
List<String> requestTmpHeaders = helpers.analyzeRequest(content).getHeaders();
|
||||||
|
String requestHeaders = String.join("\n", requestTmpHeaders);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 流量清洗
|
// 流量清洗
|
||||||
String urlString = helpers.analyzeRequest(httpService, content).getUrl().toString();
|
String urlString = requestTmpHeaders.get(0).split(" ")[1];
|
||||||
urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
|
urlString = urlString.indexOf("?") > 0 ? urlString.substring(0, urlString.indexOf("?")) : urlString;
|
||||||
|
|
||||||
// 正则判断
|
// 正则判断
|
||||||
@@ -32,12 +38,10 @@ public class ProcessMessage {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
// 获取报文头
|
|
||||||
List<String> requestTmpHeaders = helpers.analyzeRequest(httpService, content).getHeaders();
|
|
||||||
String requestHeaders = String.join("\n", requestTmpHeaders);
|
|
||||||
|
|
||||||
// 获取报文主体
|
// 获取报文主体
|
||||||
int requestBodyOffset = helpers.analyzeRequest(httpService, content).getBodyOffset();
|
int requestBodyOffset = helpers.analyzeRequest(content).getBodyOffset();
|
||||||
byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
|
byte[] requestBody = Arrays.copyOfRange(content, requestBodyOffset, content.length);
|
||||||
|
|
||||||
obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
|
obj = ec.matchRegex(content, requestHeaders, requestBody, "request");
|
||||||
@@ -70,8 +74,14 @@ public class ProcessMessage {
|
|||||||
List<String> commentList = resultList.get(1);
|
List<String> commentList = resultList.get(1);
|
||||||
if (colorList.size() != 0 && commentList.size() != 0) {
|
if (colorList.size() != 0 && commentList.size() != 0) {
|
||||||
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
String color = uc.getEndColor(gck.getColorKeys(colorList));
|
||||||
result.add(color);
|
Map<String, String> colorMap = new HashMap<String, String>(){{
|
||||||
result.add(String.join(", ", commentList));
|
put("color", color);
|
||||||
|
}};
|
||||||
|
Map<String, String> commentMap = new HashMap<String, String>(){{
|
||||||
|
put("comment", String.join(", ", commentList));
|
||||||
|
}};
|
||||||
|
result.add(colorMap);
|
||||||
|
result.add(commentMap);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (obj.size() > 0) {
|
if (obj.size() > 0) {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package burp.ui;
|
package burp.ui;
|
||||||
|
|
||||||
|
import burp.Config;
|
||||||
import burp.yaml.LoadConfig;
|
import burp.yaml.LoadConfig;
|
||||||
import burp.yaml.SetConfig;
|
import burp.yaml.SetConfig;
|
||||||
|
|
||||||
@@ -44,30 +45,26 @@ public class MainUI extends JPanel{
|
|||||||
selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
|
selectFile.setFileSelectionMode(JFileChooser.FILES_ONLY);
|
||||||
FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
|
FileNameExtensionFilter filter = new FileNameExtensionFilter("Yaml File (.yml/.yaml)","yaml", "yml");
|
||||||
selectFile.setFileFilter(filter);
|
selectFile.setFileFilter(filter);
|
||||||
int selectframe = selectFile.showDialog(new JLabel(),"Select");
|
int selectFrame = selectFile.showDialog(new JLabel(),"Select");
|
||||||
if (selectframe == JFileChooser.APPROVE_OPTION){
|
if (selectFrame == JFileChooser.APPROVE_OPTION){
|
||||||
String configpath = selectFile.getSelectedFile().toString();
|
String configPath = selectFile.getSelectedFile().toString();
|
||||||
reloadRule(configpath);
|
reloadRule();
|
||||||
loadConn.setConfigPath(configpath);
|
loadConn.setConfigPath(configPath);
|
||||||
|
configFilepathtext.setText(configPath);
|
||||||
}
|
}
|
||||||
configFilepathtext.setText(loadConn.getConfigPath());
|
|
||||||
reloadRule();
|
|
||||||
}
|
|
||||||
private void reloadRule(String configFile){
|
|
||||||
tabbedPane1.removeAll();
|
|
||||||
Map<String,Object[][]> config = loadConn.getRules();
|
|
||||||
ruleSwitch.setListen(false);
|
|
||||||
config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
|
|
||||||
tabbedPane1.addTab("...",new JLabel());
|
|
||||||
ruleSwitch.setListen(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void reloadRule(){
|
private void reloadRule(){
|
||||||
tabbedPane1.removeAll();
|
tabbedPane1.removeAll();
|
||||||
Map<String,Object[][]> config = loadConn.getRules();
|
|
||||||
ruleSwitch.setListen(false);
|
ruleSwitch.setListen(false);
|
||||||
config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1))
|
Map<String,Object[][]> rules = LoadConfig.getRules();
|
||||||
|
rules.keySet().forEach(
|
||||||
|
i->tabbedPane1.addTab(
|
||||||
|
i,
|
||||||
|
new RulePane(rules.get(i), tabbedPane1)
|
||||||
|
)
|
||||||
);
|
);
|
||||||
tabbedPane1.addTab("...",new JLabel());
|
tabbedPane1.addTab("...", new JLabel());
|
||||||
ruleSwitch.setListen(true);
|
ruleSwitch.setListen(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +73,6 @@ public class MainUI extends JPanel{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void ESSaveMouseClicked(MouseEvent e) {
|
private void ESSaveMouseClicked(MouseEvent e) {
|
||||||
// TODO add your code here
|
|
||||||
LoadConfig loadCon = new LoadConfig();
|
LoadConfig loadCon = new LoadConfig();
|
||||||
loadCon.setExcludeSuffix(EStext.getText());
|
loadCon.setExcludeSuffix(EStext.getText());
|
||||||
}
|
}
|
||||||
@@ -175,13 +171,12 @@ public class MainUI extends JPanel{
|
|||||||
new Insets(0, 0, 0, 0), 0, 0));
|
new Insets(0, 0, 0, 0), 0, 0));
|
||||||
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
||||||
|
|
||||||
Map<String,Object[][]> config = loadConn.getRules();
|
Config.ruleConfig.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(Config.ruleConfig.get(i),tabbedPane1)));
|
||||||
config.keySet().forEach(i->tabbedPane1.addTab(i,new RulePane(config.get(i),tabbedPane1)));
|
|
||||||
|
|
||||||
tabbedPane1.addTab("...",new JLabel());
|
tabbedPane1.addTab("...",new JLabel());
|
||||||
|
|
||||||
//TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1);
|
//TabTitleEditListener ruleSwitch = new TabTitleEditListener(tabbedPane1);
|
||||||
configFilepathtext.setText(loadConn.getConfigPath());
|
configFilepathtext.setText(LoadConfig.getConfigPath());
|
||||||
EStext.setText(loadConn.getExcludeSuffix());
|
EStext.setText(loadConn.getExcludeSuffix());
|
||||||
ruleSwitch = new TabTitleEditListener(tabbedPane1);
|
ruleSwitch = new TabTitleEditListener(tabbedPane1);
|
||||||
tabbedPane1.addChangeListener(ruleSwitch);
|
tabbedPane1.addChangeListener(ruleSwitch);
|
||||||
@@ -275,12 +270,12 @@ class TabTitleEditListener extends MouseAdapter implements ChangeListener, Docum
|
|||||||
editor.getDocument().addDocumentListener(this);
|
editor.getDocument().addDocumentListener(this);
|
||||||
tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing");
|
tabbedPane.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "start-editing");
|
||||||
tabbedPane.getActionMap().put("start-editing", startEditing);
|
tabbedPane.getActionMap().put("start-editing", startEditing);
|
||||||
}
|
}
|
||||||
@Override public void stateChanged(ChangeEvent e) {
|
@Override public void stateChanged(ChangeEvent e) {
|
||||||
if (e.getSource() instanceof JTabbedPane && listen) {
|
if (e.getSource() instanceof JTabbedPane && listen) {
|
||||||
JTabbedPane pane = (JTabbedPane) e.getSource();
|
JTabbedPane pane = (JTabbedPane) e.getSource();
|
||||||
if (!isRenameOk){
|
if (!isRenameOk){
|
||||||
if (pane.getSelectedIndex() == pane.getComponentCount()-1){
|
if (pane.getSelectedIndex() == pane.getComponentCount()-1){
|
||||||
newTab();
|
newTab();
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class RulePane extends JPanel {
|
|||||||
private SetConfig setruleconfig = new SetConfig();
|
private SetConfig setruleconfig = new SetConfig();
|
||||||
private Boolean isEdit = false;
|
private Boolean isEdit = false;
|
||||||
private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
|
private void RuleAddMouseClicked(MouseEvent e, JTabbedPane pane) {
|
||||||
// TODO add your code here
|
|
||||||
RuleSetting add = new RuleSetting();
|
RuleSetting add = new RuleSetting();
|
||||||
int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
|
int isOk = JOptionPane.showConfirmDialog(null,add,"RuleSetting - Add Rule",JOptionPane.OK_OPTION);
|
||||||
if(isOk == 0){
|
if(isOk == 0){
|
||||||
@@ -178,6 +177,7 @@ public class RulePane extends JPanel {
|
|||||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||||
private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"};
|
private final String[] title = new String[]{"Loaded", "Name", "Regex", "Color", "Scope", "Engine"};
|
||||||
private DefaultTableModel model = new DefaultTableModel() {
|
private DefaultTableModel model = new DefaultTableModel() {
|
||||||
|
@Override
|
||||||
public Class<?> getColumnClass ( int column){
|
public Class<?> getColumnClass ( int column){
|
||||||
if (column == 0) {
|
if (column == 0) {
|
||||||
return Boolean.class;
|
return Boolean.class;
|
||||||
@@ -185,6 +185,8 @@ public class RulePane extends JPanel {
|
|||||||
return String.class;
|
return String.class;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public boolean isCellEditable(int row,int column){
|
public boolean isCellEditable(int row,int column){
|
||||||
if (column ==0){
|
if (column ==0){
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ public class LoadConfig {
|
|||||||
initSetting();
|
initSetting();
|
||||||
initRules();
|
initRules();
|
||||||
}
|
}
|
||||||
|
Config.ruleConfig = LoadConfig.getRules();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 初始化设置信息
|
// 初始化设置信息
|
||||||
@@ -80,26 +81,32 @@ public class LoadConfig {
|
|||||||
public static String getConfigPath(){
|
public static String getConfigPath(){
|
||||||
try {
|
try {
|
||||||
InputStream inorder = new FileInputStream(SettingPath);
|
InputStream inorder = new FileInputStream(SettingPath);
|
||||||
Map<String,Object> r;
|
Map<String,Object> r = yaml.load(inorder);
|
||||||
r = yaml.load(inorder);
|
|
||||||
return r.get("configPath").toString();
|
return r.get("configPath").toString();
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return ConfigPath;
|
return ConfigPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取不包含的后缀名
|
// 获取不包含的后缀名
|
||||||
public String getExcludeSuffix(){
|
public String getExcludeSuffix(){
|
||||||
try {
|
String excludeSuffix = "";
|
||||||
InputStream inorder = new FileInputStream(SettingPath);
|
File yamlSetting = new File(SettingPath);
|
||||||
Map<String,Object> r;
|
if (yamlSetting.exists() && yamlSetting.isFile()) {
|
||||||
r = yaml.load(inorder);
|
try {
|
||||||
return r.get("excludeSuffix").toString();
|
InputStream inorder = new FileInputStream(SettingPath);
|
||||||
} catch (FileNotFoundException e) {
|
Map<String,Object> r = yaml.load(inorder);
|
||||||
e.printStackTrace();
|
excludeSuffix = r.get("excludeSuffix").toString();
|
||||||
return Config.excludeSuffix;
|
} catch (Exception e) {
|
||||||
|
// e.printStackTrace();
|
||||||
|
excludeSuffix = "";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
excludeSuffix = Config.excludeSuffix;
|
||||||
}
|
}
|
||||||
|
return excludeSuffix;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取规则配置
|
// 获取规则配置
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package burp.yaml;
|
package burp.yaml;
|
||||||
|
|
||||||
|
import burp.Config;
|
||||||
import burp.yaml.template.Rule;
|
import burp.yaml.template.Rule;
|
||||||
import burp.yaml.template.Rules;
|
import burp.yaml.template.Rules;
|
||||||
import org.yaml.snakeyaml.DumperOptions;
|
import org.yaml.snakeyaml.DumperOptions;
|
||||||
@@ -17,8 +18,6 @@ import java.util.*;
|
|||||||
|
|
||||||
public class SetConfig {
|
public class SetConfig {
|
||||||
|
|
||||||
private Map<String, Object[][]> ruleConfig = LoadConfig.getRules();
|
|
||||||
|
|
||||||
public void format() {
|
public void format() {
|
||||||
DumperOptions dop = new DumperOptions();
|
DumperOptions dop = new DumperOptions();
|
||||||
dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
|
dop.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
|
||||||
@@ -28,12 +27,12 @@ public class SetConfig {
|
|||||||
RulesConfig con = new RulesConfig();
|
RulesConfig con = new RulesConfig();
|
||||||
List<Rules> rls = new ArrayList<>();
|
List<Rules> rls = new ArrayList<>();
|
||||||
|
|
||||||
ruleConfig.keySet().forEach(i->
|
Config.ruleConfig.keySet().forEach(i->
|
||||||
{
|
{
|
||||||
Rules rlsTmp = new Rules();
|
Rules rlsTmp = new Rules();
|
||||||
rlsTmp.setType(i);
|
rlsTmp.setType(i);
|
||||||
List<Rule> rl = new ArrayList<>();
|
List<Rule> rl = new ArrayList<>();
|
||||||
for (Object[] objects : ruleConfig.get(i)) {
|
for (Object[] objects : Config.ruleConfig.get(i)) {
|
||||||
Rule rlTmp = new Rule();
|
Rule rlTmp = new Rule();
|
||||||
rlTmp.setName((String) objects[1]);
|
rlTmp.setName((String) objects[1]);
|
||||||
rlTmp.setLoaded((Boolean) objects[0]);
|
rlTmp.setLoaded((Boolean) objects[0]);
|
||||||
@@ -57,47 +56,45 @@ public class SetConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void edit(Vector data, int select, String type) {
|
public void edit(Vector data, int select, String type) {
|
||||||
ruleConfig = LoadConfig.getRules();
|
Config.ruleConfig.get(type)[select] = data.toArray();
|
||||||
ruleConfig.get(type)[select] = data.toArray();
|
|
||||||
this.format();
|
this.format();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void add(Vector data, String type) {
|
public void add(Vector data, String type) {
|
||||||
ruleConfig = LoadConfig.getRules();
|
ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
|
||||||
ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(ruleConfig.get(type)));
|
|
||||||
x.add(data.toArray());
|
x.add(data.toArray());
|
||||||
ruleConfig.put(type,x.toArray(new Object[x.size()][]));
|
Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
|
||||||
this.format();
|
this.format();
|
||||||
}
|
}
|
||||||
public void remove(int select,String type) {
|
public void remove(int select,String type) {
|
||||||
ruleConfig = LoadConfig.getRules();
|
ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(Config.ruleConfig.get(type)));
|
||||||
ArrayList<Object[]> x = new ArrayList<>(Arrays.asList(ruleConfig.get(type)));
|
|
||||||
x.remove(select);
|
x.remove(select);
|
||||||
ruleConfig.put(type,x.toArray(new Object[x.size()][]));
|
Config.ruleConfig.put(type,x.toArray(new Object[x.size()][]));
|
||||||
this.format();
|
this.format();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void rename(String oldName, String newName) {
|
public void rename(String oldName, String newName) {
|
||||||
ruleConfig = LoadConfig.getRules();
|
Config.ruleConfig.put(newName, Config.ruleConfig.remove(oldName));
|
||||||
ruleConfig.put(newName, ruleConfig.remove(oldName));
|
|
||||||
this.format();
|
this.format();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteRules(String Rules) {
|
public void deleteRules(String Rules) {
|
||||||
ruleConfig = LoadConfig.getRules();
|
Config.ruleConfig.remove(Rules);
|
||||||
ruleConfig.remove(Rules);
|
|
||||||
this.format();
|
this.format();
|
||||||
}
|
}
|
||||||
public String newRules() {
|
public String newRules() {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
ruleConfig = LoadConfig.getRules();
|
|
||||||
String name = "New ";
|
String name = "New ";
|
||||||
Object[][] data = new Object[][]{{false, "New Name", "(New Regex)", "gray", "any", "nfa"}};
|
Object[][] data = new Object[][]{
|
||||||
while (ruleConfig.containsKey(name + i)) {
|
{
|
||||||
|
false, "New Name", "(New Regex)", "gray", "any", "nfa"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
while (Config.ruleConfig.containsKey(name + i)) {
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
ruleConfig.put(name+i, data);
|
Config.ruleConfig.put(name + i, data);
|
||||||
this.format();
|
this.format();
|
||||||
return name+i;
|
return name + i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user