Re-structuring the code.

.github/ISSUE_TEMPLATE/request-for-query.md

@@ -34,6 +34,7 @@ The following tasks will need to be carried out:
     * [ ] Set up an `.expected` file and make sure the results only contain findings in the vulnerable class(es).
     * [ ] Set up an `options` file.
     * [ ] Set up a `pom.xml` file.
+* [ ] Update the documentation.
 
 # Useful Commands
 

.github/workflows/build-and-publish.yml

@@ -57,7 +57,7 @@ jobs:
           fi
           
           # The version of the CodeQL query pack
-          version=`cat vertx-codeql-queries/ql/src/qlpack.yml | yq e ".version" -`
+          version=`cat vertx-codeql-queries/src/main/ql/qlpack.yml | yq e ".version" -`
           
           # Check if this is a snapshot version
           isSnapshot=false
@@ -161,7 +161,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          cd vertx-codeql-queries/ql/src
+          cd src/main/ql
           codeql pack install
           codeql pack publish --allow-prerelease
 

vertx-codeql-queries/ql/src/InsecureHttpServer.ql → src/main/ql/InsecureHttpServer.ql

@@ -11,14 +11,14 @@ import java
 
 class Vertx extends RefType {
   Vertx() {
-    this.getASourceSupertype*().hasQualifiedName("io.vertx.core", "Vertx")
+    getASourceSupertype*().hasQualifiedName("io.vertx.core", "Vertx")
   }
 }
 
 class VertxCreateHttpServerMethodAccess extends MethodAccess {
   VertxCreateHttpServerMethodAccess() {
     exists(Method m |
-      this.getMethod() = m and
+      getMethod() = m and
       m.getName().matches("createHttpServer") and
       m.getDeclaringType() instanceof Vertx
     )

vertx-codeql-queries/ql/src/SecureCorsServer.java → src/test/ql/query-tests/InsecureHttpServer/SecureCorsServer.java

@@ -3,6 +3,8 @@
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.net.JksOptions;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.handler.CorsHandler;
 

src/test/ql/query-tests/InvocationOfVertxVertx/InvocationOfVertxVertx.java

@@ -0,0 +1,16 @@
+package org.carlspring.security.vertx.http;
+
+import io.vertx.core.Vertx;
+
+/**
+ * @author carlspring
+ */
+public class InvocationOfVertxVertx
+{
+
+    public void start()
+    {
+        Vertx.vertx();
+    }
+
+}