Merge branch 'master' into develop

.gitignore

@@ -1,61 +1,7 @@
-# General
-.DS_Store
-.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
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
@@ -73,8 +19,7 @@ hs_err_pid*
 .idea/**/libraries
 
 # CMake
-cmake-build-debug/
-cmake-build-release/
+cmake-build-*/
 
 # Mongo Explorer plugin
 .idea/**/mongoSettings.xml
@@ -83,8 +28,7 @@ cmake-build-release/
 *.iws
 
 # IntelliJ
-out/
-.idea/
+out/production/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -104,5 +48,30 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
-# Manifest
-META-INF/
+# MacOS General
+.DS_Store
+.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

BappDescription.html

@@ -0,0 +1,24 @@
+<p>Similar Request Excluder (also referred to as GraphWave) is an extension that enables you to automatically reduce the target scope of your active scan by excluding similar (and therefore redundant) requests.</p>
+
+<p>Reducing the target scope can be done by ignoring similar HTTP responses from the spider. If two HTTP responses have the same HTML structure it is likely that they have the same code flow and therefore the same security vulnerabilities. By measuring the similarity of HTTP responses it is possible to automatically reduce the target scope by removing the similar (and therefore redundant) HTTP responses.</p>
+
+<p>For more information, please refer to the thesis <a href="https://github.com/tijme/graphwave/raw/master/.github/thesis-graphwave-tijme-gommers.pdf">Github</a>.</p>
+
+<p><b>Usage</b></p>
+
+<p>Since version 1.1.0, Similar Request Excluder is completely automated. There is no need to mark your requests as 'out-of-scope' anymore. It will all be done automatically.</p>
+
+<ol>
+    <li>Make sure the extension is enabled by ticking the <i>Status</i> checkbox in the GraphWave tab.</li>
+    <li>Adjust the settings to your needs (default should be sufficient).</li>
+    <li>Spider a complete host or a specific branch of a host.</li>
+    <li>Now start an active scan and make sure to check <i>remove out-of-scope items</i>.</li>
+</ol>
+
+<p><b>Documentation</b></p>
+
+<p>The full documentation is available on <a href="https://github.com/tijme/graphwave/wiki">Github</a>. It contains, among other things, extra installation <a href="https://github.com/tijme/graphwave/wiki/Installation">instructions</a> and the <a href="https://github.com/tijme/graphwave/wiki/F.A.Q">FAQ</a>.
+
+<p><b>Issues</b></p>
+
+<p>If you are experiencing problems with Similar Request Excluder, please file an issue on the GitHub <a href="https://github.com/tijme/graphwave/issues">issue tracker</a> or contact me personally via <a href="https://twitter.com/finnwea">Twitter</a>.</p>

BappManifest.bmf

@@ -0,0 +1,11 @@
+Uuid: 9ecd51851baf4ae6b69c6a951257387a
+ExtensionType: 1
+Name: Similar Request Excluder
+RepoName: similar-request-excluder
+ScreenVersion: 1.1.0
+SerialVersion: 2
+MinPlatformVersion: 0
+ProOnly: False
+Author: Tijme Gommers
+ShortDescription: Improves efficiency by automatically marking similar requests as 'out-of-scope'.
+EntryPoint: out/artifacts/similar_request_excluder_jar/similar-request-excluder.jar

similar-request-excluder.iml

@@ -9,5 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="json-20180130" level="project" />
+    <orderEntry type="library" name="burp-extender-api-1.7.22" level="project" />
   </component>
-</module>
+</module>

src/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: burp-extender-api-1.7.22.jar json-20180130.jar
+

src/burp/BurpExtender.java

@@ -55,7 +55,7 @@ public void run() {
     }
 
     @Override
-    public void registerExtenderCallbacks(final IBurpExtenderCallbacks callbacks) {
+    public void registerExtenderCallbacks(IBurpExtenderCallbacks callbacks) {
         ExtensionDetails.initialize();
         ExtensionDebugger.initialize(callbacks);