Merge pull request #20 from augustd/fix-load-from-file

Fix loading rules from file

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codemagi</groupId>
     <artifactId>burp-suite-utils</artifactId>
-    <version>1.0.10</version>
+    <version>1.0.11</version>
     <packaging>jar</packaging>
     <name>Burp Suite Utils</name>
     <description>The Burp Suite Utils project provides developers with APIs for building Burp Suite Extensions.</description>

src/main/java/burp/impl/HttpService.java

@@ -76,4 +76,8 @@ public void setProtocol(String protocol) {
         this.protocol = protocol;
     }
 
+    public boolean useHttps() {
+        return PROTOCOL_HTTPS.equalsIgnoreCase(protocol);
+    }
+
 }

src/main/java/com/codemagi/burp/HttpRequestThread.java

@@ -16,6 +16,8 @@
 package com.codemagi.burp;
 
 import burp.IBurpExtenderCallbacks;
+import burp.IHttpService;
+import burp.impl.HttpService;
 
 /**
  *
@@ -38,6 +40,14 @@ public HttpRequestThread(String host, int port, boolean useHttps, byte[] request
         this.callbacks = callbacks;
     }
 
+    public HttpRequestThread(IHttpService service, byte[] request, IBurpExtenderCallbacks callbacks) {
+        this.host = service.getHost();
+        this.port = service.getPort();
+        this.useHttps = HttpService.PROTOCOL_HTTPS.equalsIgnoreCase(service.getProtocol());
+        this.request = request;
+        this.callbacks = callbacks;
+    }
+
     @Override
     public void run() {
         synchronized(this){

src/main/java/com/codemagi/burp/RuleTableComponent.java

@@ -113,15 +113,22 @@ public void tableChanged(TableModelEvent e) {
     private boolean loadMatchRules(String rulesUrl) {
 	//load match rules from file
 	try {
+            //check for file URL 
+            if (rulesUrl != null && rulesUrl.toLowerCase().startsWith("file:")) {
+                return loadMatchRulesFromFile(rulesUrl);
+            }
+
             //request match rules from remote URL 
     	    mCallbacks.printOutput("Loading match rules from: " + rulesUrl);
 	    URL url = new URL(rulesUrl);
             IHttpService service = new HttpService(url);
             HttpRequest request = new HttpRequest(url);
-            IHttpRequestResponse ihrr = mCallbacks.makeHttpRequest(service, request.getBytes());
+            HttpRequestThread requestThread = new HttpRequestThread(service, request.getBytes(), mCallbacks);
+            requestThread.start();
+            requestThread.join();
 
             //parse the response
-            byte[] responseBytes = ihrr.getResponse();
+            byte[] responseBytes = requestThread.getResponse();
             if (responseBytes == null) return false; //no response received from server 
             HttpResponse response = HttpResponse.parseMessage(responseBytes);
 
@@ -166,6 +173,29 @@ private boolean loadMatchRulesFromJar(String rulesUrl) {
 
         return false;
     }
+
+    /**
+     * Load match rules from a file URL 
+     */
+    private boolean loadMatchRulesFromFile(String rulesUrl) {
+	//load match rules from a local file
+	try {
+	    mCallbacks.printOutput("Loading match rules from file: " + rulesUrl);
+            InputStream in = new URL(rulesUrl).openStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+
+            processMatchRules(reader);
+
+            return true;
+
+	} catch (IOException e) {
+	    scan.printStackTrace(e);
+	} catch (NumberFormatException e) {
+	    scan.printStackTrace(e);
+	}
+
+        return false;
+    }
 
     private void processMatchRules(BufferedReader reader) throws IOException {
         DefaultTableModel model = (DefaultTableModel)rules.getModel();