Merge branch 'develop' of https://github.com/WebFuzzing/EMB

Author: arcuri82

.github/workflows/ci.yaml

@@ -9,19 +9,17 @@ on:
 
 jobs:
 
-# TODO need to use profiles to avoid dependencies to EM in the build... would work on master, but not on develop due to snapshot versions
-#  docker-build:
-#    # this one doesn't use EvoMaster drivers
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout WFD
-#        uses: actions/checkout@v6
-#      - name: Build All With Docker
-#        run: python scripts/dist-docker.py
+  docker-build:
+    # this one doesn't use EvoMaster drivers by default
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout WFD
+        uses: actions/checkout@v6
+      - name: Build All With Docker
+        run: python scripts/dist-docker.py
 
   direct-builds:
-#    TODO put back once issue fixed
-#    needs: docker-build
+    needs: docker-build
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix:

experiments/bb-exp.py

@@ -71,7 +71,7 @@ def __init__(self, name, auth, sleep, schemaformat, classfiles):
 
 
 
-SLEEP=120
+SLEEP=180
 YAML="yaml"
 JSON="json"
 
@@ -214,12 +214,40 @@ def writeScript(basedir, code, port, tool, sut):
 def dockerId(port):
     return "id"+str(port)
 
+def getWaitForSutFunction():
+    s  = "wait_for_sut() {\n"
+    s += "    local host_port=\"$1\"\n"
+    s += "    local max_wait=\"${2:-600}\"\n"
+    s += "    local interval=10\n"
+    s += "    local elapsed=0\n"
+    s += "\n"
+    s += "    echo \"Waiting for SUT on port $host_port (max: ${max_wait}s)...\"\n"
+    s += "\n"
+    s += "    while [ $elapsed -lt $max_wait ]; do\n"
+    s += "        sleep $interval\n"
+    s += "        elapsed=$((elapsed + interval))\n"
+    s += "\n"
+    s += "        http_code=$(curl -s -o /dev/null -w \"%{http_code}\" --connect-timeout 5 --max-time 10 \"http://localhost:$host_port\" 2>/dev/null)\n"
+    s += "        if [ -n \"$http_code\" ] && [ \"$http_code\" -ge 100 ] 2>/dev/null; then\n"
+    s += "            echo \"SUT is ready after ${elapsed}s (HTTP $http_code on port $host_port)\"\n"
+    s += "            return 0\n"
+    s += "        fi\n"
+    s += "\n"
+    s += "        echo \"Still waiting... ${elapsed}s / ${max_wait}s (port $host_port not responding)\"\n"
+    s += "    done\n"
+    s += "\n"
+    s += "    echo \"WARNING: Timeout after ${max_wait}s, proceeding anyway...\"\n"
+    s += "}\n\n"
+    return s
+
 def getScriptHead(port,tool,sut, exec_dir):
     s = ""
     s += "#!/bin/bash \n\n"
     s += "SUT=\"" + WFD_DIR + "/dockerfiles/"+sut.name+".yaml\" \n"
     s += "\n"
 
+    s += getWaitForSutFunction()
+
     # These environment variables are read inside Docker Compose
     # Must be on same line of docker, so that why using \.
     # Note: there must be NOTHING after the \, not even empty space " "...
@@ -234,8 +262,8 @@ def getScriptHead(port,tool,sut, exec_dir):
     #  Start SUT with Docker Compose
     s += "docker-compose --project-name "+dockerId(port)+" -f $SUT up --build --force-recreate " + getRedirectLog(getLogFile("sut",tool,sut.name,port)) + "  & \n\n"
 
-    # No easy way to check if all is up and running, so wait for enough time before fuzzing
-    s += "sleep " + str(sut.sleep) +"\n\n"
+    # Wait until HTTP endpoint on target port responds (or timeout)
+    s += "wait_for_sut " + str(port) + " " + str(sut.sleep) + "\n\n"
 
     return s
 

experiments/wb-exp.py

@@ -582,6 +582,7 @@ def addJobBody(port, sut, seed, setting, configName):
             else:
                 label += "_" + str(ps[1])
 
+    params += " --blackBox false"
     params += " --testSuiteFileName=EM_" + sut.name.replace("-","_") + label + "_" + str(seed) + "_Test"
     params += " --labelForExperiments=" + label
     params += " --labelForExperimentConfigs=" + configName

jdk_11_gradle/build.gradle

@@ -1,6 +1,6 @@
 
 allprojects {
     ext {
-        EVOMASTER_VERSION = "5.1.0"
+        EVOMASTER_VERSION = "6.0.0"
     }
 }

jdk_11_gradle/settings.gradle.kts

@@ -1,9 +1,11 @@
 rootProject.name = "emb_jdk_11_gradle"
 
 include("cs:graphql:patio-api")
-include("em:embedded:graphql:patio-api")
-include("em:external:graphql:patio-api")
-
 include("cs:rest:reservations-api")
-include("em:embedded:rest:reservations-api")
-include("em:external:rest:reservations-api")
+
+if (System.getenv("BUILD_EVOMASTER") != "false") {
+    include("em:embedded:graphql:patio-api")
+    include("em:external:graphql:patio-api")
+    include("em:embedded:rest:reservations-api")
+    include("em:external:rest:reservations-api")
+}

jdk_11_maven/cs/graphql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-benchmark-jdk11-cs</artifactId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
 
     <artifactId>evomaster-benchmark-jdk11-cs-graphql</artifactId>

jdk_11_maven/cs/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-benchmark-jdk11</artifactId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
 
     <artifactId>evomaster-benchmark-jdk11-cs</artifactId>

jdk_11_maven/cs/rest-gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-benchmark-jdk11-cs</artifactId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
 
     <artifactId>evomaster-benchmark-jdk11-cs-rest-gui</artifactId>

jdk_11_maven/cs/rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-benchmark-jdk11-cs</artifactId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
 
     <artifactId>evomaster-benchmark-jdk11-cs-rest</artifactId>

jdk_11_maven/em/embedded/graphql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-benchmark-jdk11-em-embedded</artifactId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
 
     <artifactId>evomaster-benchmark-jdk11-em-embedded-graphql</artifactId>