Compare commits

...

12 Commits
2.1.2 ... 2.2.2

Author SHA1 Message Date
AnonymousUser
1238e536d1 Version: 2.2.2 Update 2022-05-04 23:17:24 +08:00
AnonymousUser
5d23a68c0e Version: 2.2.2 Update 2022-05-04 22:51:58 +08:00
AnonymousUser
d7f04526b4 Version: 2.2.2 Update 2022-05-04 22:48:44 +08:00
AnonymousUser
acff96ed7b Version: 2.2.2 Update 2022-05-04 22:47:28 +08:00
AnonymousUser
350c093162 Update 2022-05-04 20:50:53 +08:00
AnonymousUser
0d3d4f88e9 Version: 2.2.1 Update 2022-04-21 10:50:10 +08:00
AnonymousUser
37ca315aba Version: 2.2 Update 2022-04-08 17:25:35 +08:00
AnonymousUser
241247a4a0 Version: 2.2 Update 2022-04-08 17:21:40 +08:00
AnonymousUser
08bfb69fce Version: 2.1.6 Update 2022-03-31 13:54:12 +08:00
AnonymousUser
a6d5f3a204 Version: 2.1.5 Update 2022-02-25 13:22:14 +08:00
AnonymousUser
c4d8743fe3 Version: 2.1.4 Update 2022-02-21 09:31:03 +08:00
AnonymousUser
903077c830 Version: 2.1.3 Update 2022-01-11 14:46:25 +08:00
21 changed files with 414 additions and 232 deletions

138
.gitignore vendored
View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 KiB

BIN
images/16000720732854.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 KiB

BIN
images/reward.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

View File

@@ -3,15 +3,18 @@ package burp;
import burp.action.*; import burp.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;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
/* /**
* @author EvilChen * @author EvilChen & 0chencc
*/ */
public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab { public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEditorTabFactory, ITab {
@@ -29,12 +32,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.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 +45,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";
@@ -56,7 +61,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
return main; return main;
} }
/* /**
* 使用processHttpMessage用来做Highlighter * 使用processHttpMessage用来做Highlighter
*/ */
@Override @Override
@@ -69,14 +74,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 +84,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 JTable jTable = new JTable();
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,48 +114,55 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
@Override @Override
public Component getUiComponent() { public Component getUiComponent() {
return markInfoText.getComponent(); jTabbedPane.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent arg0) {
jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView();
}
});
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 null;
} }
@Override @Override
public boolean isModified() { public boolean isModified() {
return markInfoText.isTextModified(); return false;
} }
/**
* 快捷键复制功能
*/
@Override @Override
public byte[] getSelectedData() { public byte[] getSelectedData() {
return markInfoText.getSelectedText(); int[] selectRows = jTable.getSelectedRows();
StringBuilder selectData = new StringBuilder();
for (int row : selectRows) {
selectData.append(jTable.getValueAt(row, 0).toString()).append("\n");
}
return helpers.stringToBytes(selectData.toString());
} }
/* /**
* 使用setMessage用来做Extractor * 使用setMessage用来做Extractor
*/ */
@Override @Override
@@ -166,15 +170,36 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito
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) {
if (isRequest) { if (isRequest) {
markInfoText.setText(extractRequestContent); makeTable(extractRequestMap);
} else { } else {
markInfoText.setText(extractResponseContent); makeTable(extractResponseMap);
} }
} }
currentMessage = content; }
/**
* 创建MarkInfo表单
*/
public void makeTable(Map<String, String> dataMap) {
dataMap.keySet().forEach(i->{
String[] extractData = dataMap.get(i).split("\n");
Object[][] data = new Object[extractData.length][1];
for (int x = 0; x < extractData.length; x++) {
data[x][0] = extractData[x];
}
int indexOfTab = this.jTabbedPane.indexOfTab(i);
JScrollPane jScrollPane = new JScrollPane(new JTable(data, new Object[] {"Information"}));
this.jTabbedPane.addTab(i, jScrollPane);
// 使用removeAll会导致UI出现空白的情况为了改善用户侧体验采用remove的方式进行删除
if (indexOfTab != -1) {
this.jTabbedPane.remove(indexOfTab);
}
});
} }
} }
@Override @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);

View File

@@ -1,10 +1,11 @@
package burp; 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;
} }

View File

@@ -1,24 +1,24 @@
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;
import java.util.List; import java.util.List;
/* /**
* @author EvilChen * @author EvilChen
*/ */
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) {

View File

@@ -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;
@@ -11,7 +12,7 @@ import dk.brics.automaton.RunAutomaton;
import jregex.Matcher; import jregex.Matcher;
import jregex.Pattern; import jregex.Pattern;
/* /**
* @author EvilChen * @author EvilChen
*/ */
@@ -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()) {

View File

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

View File

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

View File

@@ -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) {

View File

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

View File

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

View File

@@ -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;
@@ -13,7 +14,7 @@ import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import java.util.Map; import java.util.Map;
/* /**
* @author LinChen * @author LinChen
*/ */
@@ -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{

View File

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

View File

@@ -4,7 +4,7 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
import burp.Config; import burp.Config;
/* /**
* @author LinChen * @author LinChen
*/ */

View File

@@ -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;
} }
// 获取规则配置 // 获取规则配置

View File

@@ -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;
} }
} }

View File

@@ -3,7 +3,7 @@ package burp.yaml.template;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/* /**
* @author LinChen * @author LinChen
*/ */

View File

@@ -4,7 +4,7 @@ import burp.yaml.template.Rule;
import java.util.List; import java.util.List;
/* /**
* @author LinChen * @author LinChen
*/ */