diff --git a/.gitignore b/.gitignore index e9c7f02..f85ff2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,137 @@ +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### JetBrains+all Patch ### +# Ignore everything but code style settings and run configurations +# that are supposed to be shared within teams. + +.idea/* + +!.idea/codeStyles +!.idea/runConfigurations + +### macOS ### +# General .DS_Store -.idea -.gradle \ No newline at end of file +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Gradle ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# End of https://www.toptal.com/developers/gitignore/api/macos,gradle,jetbrains+all \ No newline at end of file diff --git a/src/main/java/burp/BurpExtender.java b/src/main/java/burp/BurpExtender.java index 9023dd7..8fc641a 100644 --- a/src/main/java/burp/BurpExtender.java +++ b/src/main/java/burp/BurpExtender.java @@ -10,6 +10,8 @@ import java.nio.charset.StandardCharsets; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; /* * @author EvilChen & 0chencc @@ -30,7 +32,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito this.callbacks = callbacks; BurpExtender.helpers = callbacks.getHelpers(); - String version = "2.2"; + String version = "2.2.1"; callbacks.setExtensionName(String.format("HaE (%s) - Highlighter and Extractor", version)); // 定义输出 stdout = new PrintWriter(callbacks.getStdout(), true); @@ -96,7 +98,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito class MarkInfoTab implements IMessageEditorTab { private final JTabbedPane jTabbedPane = new JTabbedPane(); - private byte[] currentMessage; + private JTable jTable = new JTable(); private final IMessageEditorController controller; private Map extractRequestMap; private Map extractResponseMap; @@ -112,6 +114,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito @Override public Component getUiComponent() { + jTabbedPane.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent arg0) { + jTable = (JTable) ((JScrollPane)jTabbedPane.getSelectedComponent()).getViewport().getView(); + } + }); return this.jTabbedPane; } @@ -133,7 +141,7 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito @Override public byte[] getMessage() { - return this.currentMessage; + return null; } @Override @@ -143,7 +151,12 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito @Override public byte[] getSelectedData() { - return null; + 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()); } /* @@ -153,17 +166,17 @@ public class BurpExtender implements IBurpExtender, IHttpListener, IMessageEdito public void setMessage(byte[] content, boolean isRequest) { String c = new String(content, StandardCharsets.UTF_8).intern(); if (content.length > 0) { - this.jTabbedPane.removeAll(); if (isRequest) { makeTable(extractRequestMap); } else { makeTable(extractResponseMap); } } - this.currentMessage = content; + } public void makeTable(Map dataMap) { + this.jTabbedPane.removeAll(); dataMap.keySet().forEach(i->{ String[] extractData = dataMap.get(i).split("\n"); Object[][] data = new Object[extractData.length][1];