Merge branch 'master' of https://github.com/NetsOSS/headless-burp

NetsOSS · Jul 9, 2018 · 30e7403 · 30e7403
2 parents 6bf2086 + fde4512
commit 30e7403
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/burp-maven-plugin/findbugs-base.xml → burp-maven-plugin/spotbugs-base.xml b/burp-maven-plugin/findbugs-base.xml → burp-maven-plugin/spotbugs-base.xml
diff --git a/findbugs-base.xml → headless-burp-proxy/spotbugs-base.xml b/findbugs-base.xml → headless-burp-proxy/spotbugs-base.xml
diff --git a/headless-burp-proxy/findbugs-base.xml → headless-burp-scanner/spotbugs-base.xml b/headless-burp-proxy/findbugs-base.xml → headless-burp-scanner/spotbugs-base.xml
diff --git a/pom.xml b/pom.xml
@@ -20,8 +20,8 @@
     <java.version>1.8</java.version>
     <dependency-check.skip>false</dependency-check.skip>
     <checkstyle-config.location>${project.basedir}</checkstyle-config.location>
-    <findbugs-excludefilter.location>${project.basedir}/../findbugs-excludefilter.xml
-    </findbugs-excludefilter.location>
+    <spotbugs-excludefilter.location>${project.basedir}/../spotbugs-excludefilter.xml
+    </spotbugs-excludefilter.location>
   </properties>
 
   <dependencyManagement>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.4</version>
+      <version>2.9.5</version>
     </dependency>
 
     <!-- test -->
@@ -206,15 +206,15 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.5</version>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>3.1.3</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
-          <excludeFilterFile>${findbugs-excludefilter.location}</excludeFilterFile>
-          <excludeBugsFile>${project.basedir}/findbugs-base.xml</excludeBugsFile>
+          <excludeFilterFile>${spotbugs-excludefilter.location}</excludeFilterFile>
+          <excludeBugsFile>${project.basedir}/spotbugs-base.xml</excludeBugsFile>
           <plugins>
             <plugin>
               <groupId>com.h3xstream.findsecbugs</groupId>
@@ -291,10 +291,10 @@
       <id>quick</id>
       <properties>
         <checkstyle.skip>true</checkstyle.skip>
-        <findbugs.skip>true</findbugs.skip>
+        <spotbugs.skip>true</spotbugs.skip>
         <dependency-check.skip>true</dependency-check.skip>
       </properties>
     </profile>
   </profiles>
 
-</project>
+</project>
diff --git a/headless-burp-scanner/findbugs-base.xml → spotbugs-base.xml b/headless-burp-scanner/findbugs-base.xml → spotbugs-base.xml
diff --git a/findbugs-excludefilter.xml → spotbugs-excludefilter.xml b/findbugs-excludefilter.xml → spotbugs-excludefilter.xml
@@ -1,4 +1,7 @@
-<FindBugsFilter>
+<FindBugsFilter
+        xmlns="https://github.com/spotbugs/filter/3.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
   <!--headless burp specific exclusions-->
   <Match>
     <Class name="HelpMojo"/>
@@ -21,6 +24,10 @@
   </Match>
   <Match>
     <Class name="eu.nets.burp.JUnitXmlGenerator"/>
-    <Bug code="SECXSLT"/>
+    <Bug pattern="MALICIOUS_XSLT,URLCONNECTION_SSRF_FD,XXE_DTD_TRANSFORM_FACTORY,XXE_XSLT_TRANSFORM_FACTORY"/>
+  </Match>
+  <Match>
+    <Class name="eu.nets.burp.maven.StreamLog"/>
+    <Bug pattern="INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE"/>
   </Match>
 </FindBugsFilter>