Merge pull request PortSwigger#2 from NetSPI/master

Update PortSwigger Repo With Latest Changes

Author: Hannah-PortSwigger

.idea/misc.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -34,5 +38,6 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
   </component>
 </module>

.idea/workspace.xml

@@ -6,6 +6,7 @@ repositories {
 
 dependencies {
     compile 'net.portswigger.burp.extender:burp-extender-api:1.7.22'
+    compile 'com.google.code.gson:gson:2.8.6'
 }
 
 sourceSets {

Burp_Extractor.iml

@@ -1,15 +1,23 @@
 package burp;
 
-public class BurpExtender implements burp.IBurpExtender {
+import burp.persistence.Persistor;
+
+public class BurpExtender implements IBurpExtender {
 
     @Override
-    public void registerExtenderCallbacks(burp.IBurpExtenderCallbacks callbacks) {
+    public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
         callbacks.setExtensionName("Extractor");
 
         // Create main extractor tab and an extractor, which actually does the work
         ExtractorMainTab extractorMainTab = new ExtractorMainTab(callbacks);
         Extractor extractor = new Extractor(extractorMainTab, callbacks);
 
+        // Initialize the Persistor
+        Persistor.init(extractorMainTab, callbacks);
+
+        // Attempt to load a saved state
+		Persistor.restoreExtractor();
+
         // Register Extractor as an HTTP listener
         callbacks.registerHttpListener(extractor);
 

build.gradle

@@ -52,7 +52,6 @@ public void actionPerformed(ActionEvent e) {
                 extractorMainTab.removeTab(index);
                 extractorMainTab.removeExtractor(tabNum);
                 ExtractorMainTab.tabsRemoved++;
-
             }
         }
     }