Fix numeric sorting & rare response-duplication with empty responses

PortSwigger · Feb 8, 2019 · 5650500 · 5650500
1 parent 69bb0ff
commit 5650500
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/RequestTable.kt b/src/RequestTable.kt
@@ -148,7 +148,7 @@ class RequestTable(val service: IHttpService, val handler: AttackHandler): JPane
     }
 
 
-    override fun add(req: Request) {
+    @Synchronized override fun add(req: Request) {
         model.addRequest(req)
     }
 

diff --git a/src/RequestTableModel.kt b/src/RequestTableModel.kt
@@ -19,6 +19,17 @@ class RequestTableModel : AbstractTableModel() {
         return columns[column]
     }
 
+    override fun getColumnClass(columnIndex: Int): Class<*> {
+        return when (columnIndex) {
+            0 -> java.lang.Integer::class.java
+            1 -> String::class.java
+            2 -> java.lang.Integer::class.java
+            3 -> java.lang.Integer::class.java
+            4 -> java.lang.Integer::class.java
+            else -> throw RuntimeException()
+        }
+    }
+
     override fun getValueAt(rowIndex: Int, columnIndex: Int): Any? {
         val request = requests[rowIndex]
 

diff --git a/src/ThreadedRequestEngine.kt b/src/ThreadedRequestEngine.kt
@@ -187,6 +187,7 @@ open class ThreadedRequestEngine(url: String, val threads: Int, maxQueueSize: In
 
                         if (bodyStart+4 == buffer.length) {
                             // no need to read the body
+                            buffer = ""
                         }
                         else if (contentLength != -1) {
                             val responseLength = bodyStart + contentLength + 4