diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e8fa442..0e90dea 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,8 +8,7 @@ - - + @@ -73,7 +72,7 @@ - + @@ -82,11 +81,11 @@ - + - - + + @@ -94,7 +93,7 @@ - + @@ -228,11 +227,11 @@ @@ -456,13 +455,13 @@ - + - + @@ -903,16 +902,6 @@ - - - - - - - - - - @@ -947,9 +936,19 @@ + + + + + + + + + + - + @@ -957,20 +956,20 @@ - + - - + + - + - - + + diff --git a/out/artifacts/Burp_Extractor_jar/Burp_Extractor.jar b/out/artifacts/Burp_Extractor_jar/Burp_Extractor.jar index bbf0462..9098aa8 100644 Binary files a/out/artifacts/Burp_Extractor_jar/Burp_Extractor.jar and b/out/artifacts/Burp_Extractor_jar/Burp_Extractor.jar differ diff --git a/src/main/java/burp/ExtractorTab.java b/src/main/java/burp/ExtractorTab.java index b724e23..e7a34bc 100644 --- a/src/main/java/burp/ExtractorTab.java +++ b/src/main/java/burp/ExtractorTab.java @@ -229,7 +229,7 @@ private JPanel getHelpContents() { scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); scrollPane.setViewportView(helpScrollPanel); - scrollPane.setPreferredSize(new Dimension(345,200)); +// scrollPane.setPreferredSize(new Dimension(500,300)); helpPanel.add(scrollPane); // Add text selection instructions @@ -237,12 +237,13 @@ private JPanel getHelpContents() { highlightTitle.setBorder(new EmptyBorder(5,5,5,5)); highlightTitle.setFont(this.boldFont); helpScrollPanel.add(highlightTitle); - JLabel highlightInstructions = new JLabel("

Highlight the text in the " + + JLabel highlightInstructions = new JLabel("

Highlight the text in the " + "request you would like to replace with data from the response. In the response, highlight the text " + "you would like to extract and have inserted into the request. Extractor will " + - "define regex for you when you select text in the request and response editors. If you want to " + + "define regex for you when you select text in the request and response editors.

If you want to " + "make customizations to those regex strings, you can! Just make sure that you escape characters that " + - "are have special regex meaning. That seems to be anything in this list, though there may be something missing: !$^&*()-+{[}]|\\:,.?

"); + "are have special regex meaning. That seems to be anything in this list, though there may be " + + "something missing: !$^&*()-+{[}]|\\:,.?

"); helpScrollPanel.add(highlightInstructions); // Add scope instructions @@ -250,21 +251,21 @@ private JPanel getHelpContents() { scopeTitle.setBorder(new EmptyBorder(5,5,5,5)); scopeTitle.setFont(this.boldFont); helpScrollPanel.add(scopeTitle); - helpScrollPanel.add(new JLabel("

There are two options for defining " + - "scope in Extractor. Either a user can select \"Use suite scope\" which will cause Extractor to " + + helpScrollPanel.add(new JLabel("

Users can define scope using both " + + "the host and the tools to target. Either a user can select \"Use suite scope\" which will cause Extractor to " + "examine a request if it is in Burp Suite's scope. Otherwise, the \"Target host\" field will be " + - "examined, and a message from a matching (non-regex) host will cause Extractor to examine it." + - "


You can also select the tools that will be included when looking for text in requests " + - "and responses using the \"Select in-scope tools\" button.

")); + "examined, and a message from a matching host will cause Extractor to examine it." + + "

Use the \"Select in-scope tools\" button to select the tools that Extractor will " + + "examine for matching tokens.

")); // Running Extractor JLabel runningTitle = new JLabel("Running Extractor"); runningTitle.setBorder(new EmptyBorder(5,5,5,5)); runningTitle.setFont(this.boldFont); helpScrollPanel.add(runningTitle); - helpScrollPanel.add(new JLabel("

To start altering requests with " + + helpScrollPanel.add(new JLabel("

To start altering requests with " + "Extractor, just click \"Turn Extractor on\". Extractor will begin examining in-scope requests and " + - "responses which match the defined scope for text which matches the regex fields. Once Extractor " + + "responses for text which matches the before and after regex fields. Once Extractor " + "has found a match in a response, it will save the text, and write it to the selected location in the " + "request. Multiple Extractor tabs can be used at once, and will execute in the order they were created." + "

"));