Modified all requests to utilize Burp instead of build-in Java methods

Author: egru

src/main/java/burp/Menu.java

@@ -43,7 +43,7 @@ public void mousePressed(MouseEvent e) {
 
 
             public void mouseReleased(MouseEvent e) {
-                WSDLParser parser = new WSDLParser(helpers, tab);
+                WSDLParser parser = new WSDLParser(callbacks,helpers, tab);
                 try {
                     new Worker(parser,invocation, tab, callbacks).execute();
                 } catch (Exception e1) {

src/main/java/burp/WSDLParser.java

@@ -19,18 +19,21 @@
 
 public class WSDLParser {
 
-    private IExtensionHelpers helpers;
+    public static IExtensionHelpers helpers;
+    public static IBurpExtenderCallbacks callbacks;
+    public static IHttpRequestResponse httpRequestResponse;
     private WSDLParserTab tab;
     public static List<String> headers;
 
-    public WSDLParser(IExtensionHelpers helpers, WSDLParserTab tab) {
-        this.helpers = helpers;
+    public WSDLParser(IBurpExtenderCallbacks callbacks, IExtensionHelpers helpers, WSDLParserTab tab) {
+        WSDLParser.helpers = helpers;
         this.tab = tab;
+        WSDLParser.callbacks = callbacks;
 
     }
 
     public int parseWSDL(IHttpRequestResponse requestResponse, IBurpExtenderCallbacks callbacks) throws ParserConfigurationException, IOException, SAXException, WSDLException, ExecutionException, InterruptedException {
-
+        httpRequestResponse = requestResponse;
         byte[] response = requestResponse.getResponse();
 
         if (response == null){

src/main/java/com/ibm/wsdl/xml/WSDLReaderImpl.java

@@ -10,6 +10,8 @@
 import javax.xml.namespace.*;
 import javax.xml.parsers.*;
 
+import burp.IHttpRequestResponse;
+import burp.IResponseInfo;
 import burp.WSDLParser;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
 import org.w3c.dom.*;
@@ -41,13 +43,13 @@ public class WSDLReaderImpl implements WSDLReader
 {
   // Used for determining the style of operations.
   private static final List STYLE_ONE_WAY =
-    Arrays.asList(new String[]{Constants.ELEM_INPUT});
+    Arrays.asList(Constants.ELEM_INPUT);
   private static final List STYLE_REQUEST_RESPONSE =
-    Arrays.asList(new String[]{Constants.ELEM_INPUT, Constants.ELEM_OUTPUT});
+    Arrays.asList(Constants.ELEM_INPUT, Constants.ELEM_OUTPUT);
   private static final List STYLE_SOLICIT_RESPONSE =
-    Arrays.asList(new String[]{Constants.ELEM_OUTPUT, Constants.ELEM_INPUT});
+    Arrays.asList(Constants.ELEM_OUTPUT, Constants.ELEM_INPUT);
   private static final List STYLE_NOTIFICATION =
-    Arrays.asList(new String[]{Constants.ELEM_OUTPUT});
+    Arrays.asList(Constants.ELEM_OUTPUT);
 
   protected boolean verbose = true;
   protected boolean importDocuments = true;
@@ -412,17 +414,13 @@ protected Import parseImport(Element importEl,
 
               if (importedDef == null)
               {
-                URLConnection connection = new URL(url.toString()).openConnection();
-                for(Iterator<String> i = WSDLParser.headers.iterator(); i.hasNext(); ) {
-                  String item = i.next();
-                  if (item.contains(":") && !item.contains("Accept-Encoding:")) {
-                    String headerName = item.split(":")[0];
-                    String headerValue = item.split(":")[1];
-                    connection.setRequestProperty(headerName, headerValue);
-                  }
-                }
-                connection.connect();
-                inputStream = connection.getInputStream();
+                  byte[] request = WSDLParser.helpers.buildHttpRequest(url);
+                  IHttpRequestResponse httpRequestResponse =  WSDLParser.callbacks.makeHttpRequest(WSDLParser.httpRequestResponse.getHttpService(),request);
+                  byte[] response = httpRequestResponse.getResponse();
+                  IResponseInfo responseInfo = WSDLParser.helpers.analyzeResponse(response);
+                  int bodyOffset = responseInfo.getBodyOffset();
+                  String body = new String(response, bodyOffset, response.length - bodyOffset);
+                  inputStream = new ByteArrayInputStream(body.getBytes());
 
                 //inputStream = StringUtils.getContentAsInputStream(url);
 
@@ -817,17 +815,13 @@ protected ExtensibilityElement parseSchema( Class parentType,
   	  	    if (referencedSchema == null)
   	  	    {
   	  	      // We haven't read this schema in before so do it now
-              URLConnection connection = new URL(url.toString()).openConnection();
-              for(Iterator<String> i = WSDLParser.headers.iterator(); i.hasNext(); ) {
-                String item = i.next();
-                if (item.contains(":") && !item.contains("Accept-Encoding:")) {
-                  String headerName = item.split(":")[0];
-                  String headerValue = item.split(":")[1];
-                  connection.setRequestProperty(headerName, headerValue);
-                }
-              }
-              connection.connect();
-              inputStream = connection.getInputStream();
+                byte[] request = WSDLParser.helpers.buildHttpRequest(url);
+                IHttpRequestResponse httpRequestResponse =  WSDLParser.callbacks.makeHttpRequest(WSDLParser.httpRequestResponse.getHttpService(),request);
+                byte[] response = httpRequestResponse.getResponse();
+                IResponseInfo responseInfo = WSDLParser.helpers.analyzeResponse(response);
+                int bodyOffset = responseInfo.getBodyOffset();
+                String body = new String(response, bodyOffset, response.length - bodyOffset);
+                inputStream = new ByteArrayInputStream(body.getBytes());
 
   	  	      if (inputStream != null)
   	  	      {
@@ -2292,17 +2286,13 @@ public Definition readWSDL(String contextURI, String wsdlURI)
                        ? StringUtils.getURL(null, contextURI)
                        : null;
       URL url = StringUtils.getURL(contextURL, wsdlURI);
-      URLConnection connection = new URL(url.toString()).openConnection();
-      for(Iterator<String> i = WSDLParser.headers.iterator(); i.hasNext(); ) {
-        String item = i.next();
-        if (item.contains(":") && !item.contains("Accept-Encoding:")) {
-          String headerName = item.split(":")[0];
-          String headerValue = item.split(":")[1];
-          connection.setRequestProperty(headerName, headerValue);
-        }
-      }
-      connection.connect();
-      InputStream inputStream = connection.getInputStream();
+      byte[] request = WSDLParser.helpers.buildHttpRequest(url);
+      IHttpRequestResponse httpRequestResponse =  WSDLParser.callbacks.makeHttpRequest(WSDLParser.httpRequestResponse.getHttpService(),request);
+      byte[] response = httpRequestResponse.getResponse();
+      IResponseInfo responseInfo = WSDLParser.helpers.analyzeResponse(response);
+      int bodyOffset = responseInfo.getBodyOffset();
+      String body = new String(response, bodyOffset, response.length - bodyOffset);
+      InputStream inputStream = new ByteArrayInputStream(body.getBytes());
       InputSource inputSource = new InputSource(inputStream);
       inputSource.setSystemId(url.toString());
       Document doc = getDocument(inputSource, url.toString());