Merge branch 'dev' of github.com:doyensec/inql into dev

doyensec · Oct 23, 2023 · 611d61e · 611d61e
2 parents 1878a26 + 66e8a06
commit 611d61e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/main/kotlin/burp/BurpExtender.kt b/src/main/kotlin/burp/BurpExtender.kt
@@ -10,9 +10,10 @@ import java.util.*
 @Suppress("unused")
 class BurpExtender : IBurpExtender, ExtensionUnloadingHandler, BurpExtension {
 
-    val version =
-        Properties().also { it.load(this.javaClass.getResourceAsStream("/version.properties")) }.getProperty("version")
-            ?: ""
+    companion object {
+        val version =
+            Properties().also { it.load(this::class.java.getResourceAsStream("/version.properties")) }.getProperty("version") ?: ""
+    }
     private lateinit var callbacks: IBurpExtenderCallbacks
     private lateinit var inql: InQL
 
@@ -64,7 +65,7 @@ class BurpExtender : IBurpExtender, ExtensionUnloadingHandler, BurpExtension {
         Burp.initialize(montoyaApi)
 
         // Set the name of the extension
-        montoyaApi.extension().setName(if (version.isNotEmpty()) "InQL $version" else "InQL")
+        montoyaApi.extension().setName("InQL")
 
         inql = InQL()
         montoyaApi.extension().registerUnloadingHandler(this)

diff --git a/src/main/kotlin/inql/InQL.kt b/src/main/kotlin/inql/InQL.kt
@@ -1,6 +1,7 @@
 package inql
 
 import burp.Burp
+import burp.BurpExtender
 import burp.BurpIcons
 import burp.api.montoya.persistence.PersistedObject
 import inql.attacker.Attacker
@@ -30,7 +31,7 @@ class InQL : TabbedPane(), SavesAndLoadData {
     val attacker = Attacker(this)
 
     init {
-        Burp.Montoya.logging().raiseInfoEvent("InQL Started")
+        Burp.Montoya.logging().raiseInfoEvent("InQL ${BurpExtender.version} Started")
 
         // Cleanup from previous versions
         // FIXME: Remove this once this is exposed through Settings UI

diff --git a/src/main/kotlin/inql/graphql/formatting/SyntaxParser.kt b/src/main/kotlin/inql/graphql/formatting/SyntaxParser.kt
@@ -12,13 +12,16 @@ import java.util.*
    FloatValue
    StringValue     but """ starts a block string
  */
-class SyntaxParser private constructor(val tokens: LinkedList<Token>, val fixIntrospection: Boolean = false) {
+class SyntaxParser private constructor(val originalTokens: LinkedList<Token>, val fixIntrospection: Boolean = false) {
     companion object {
         fun parse(tokens: List<Token>, fixIntrospection: Boolean = false): List<Token> {
             return SyntaxParser(LinkedList(tokens), fixIntrospection).parse()
         }
     }
 
+    /* Get only tokens with syntactic relevance */
+    val tokens = originalTokens.filter { t -> t.type != Token.Type.COMMENT && t.text != "," }
+
     private var idx = 0
 
     private val current: Token
@@ -34,13 +37,11 @@ class SyntaxParser private constructor(val tokens: LinkedList<Token>, val fixInt
             Logger.error("Error while parsing GraphQL")
             Logger.error((e.stackTraceToString()))
         }
-        return this.tokens.filter { it.type != Token.Type.EMPTY }
+        return this.originalTokens.filter { it.type != Token.Type.EMPTY }
     }
 
     private fun consume() {
-        do {
-            idx++
-        } while (idx < this.tokens.size && (this.current.type == Token.Type.COMMENT || this.current.text == ","))
+        idx++
     }
 
     private fun consumeText(text: String) {
@@ -53,7 +54,8 @@ class SyntaxParser private constructor(val tokens: LinkedList<Token>, val fixInt
     }
 
     private fun delete() {
-        this.tokens[this.idx] = Token(Token.Type.EMPTY, "")
+        this.tokens[this.idx].type = Token.Type.EMPTY
+        this.tokens[this.idx].text = ""
     }
 
     private fun document() {

diff --git a/src/main/kotlin/inql/graphql/formatting/Token.kt b/src/main/kotlin/inql/graphql/formatting/Token.kt
@@ -2,7 +2,7 @@ package inql.graphql.formatting
 
 import org.apache.commons.text.StringEscapeUtils
 
-class Token(val type: Type, var text: String) {
+class Token(var type: Type, var text: String) {
 
     var subtype: Subtype = Subtype.NONE