Merge pull request #1515 from WebFuzzing/faul-existing-endpoints

Fault existing endpoints

Author: arcuri82

core/src/main/kotlin/org/evomaster/core/problem/rest/service/CallGraphService.kt

@@ -24,13 +24,16 @@ class CallGraphService {
      */
     private val deleteDependencies = mutableMapOf<Endpoint, RestCallAction>()
 
+    private lateinit var endpointsInUse: Set<Endpoint>
 
     @PostConstruct
     private fun init() {
 
         val calls = sampler.seeAvailableActions()
             .filterIsInstance<RestCallAction>()
 
+        endpointsInUse = calls.map{it.endpoint}.toSet()
+
         val deletes = calls.filter { it.verb == HttpVerb.DELETE }
         val creates = calls.filter { it.verb == HttpVerb.POST || it.verb == HttpVerb.PUT }
 
@@ -63,14 +66,25 @@ class CallGraphService {
     }
 
     fun endpointsForPath(path: RestPath): List<Endpoint> {
-        return sampler.seeAvailableActions()
-            .filterIsInstance<RestCallAction>()
+        return endpointsInUse
             .filter { it.path == path }
-            .map { Endpoint(it.verb, it.path) }
     }
 
+    /**
+     * Check if the given endpoint(verb,path) is declared in the schema.
+     * This is regardless of whether some endpoints were marked as ignored/to-skip
+     * during the fuzzing
+     */
     fun isDeclared(verb: HttpVerb, path: RestPath): Boolean {
-        return endpointsForPath(path).any{it.verb == verb}
+        return isInUse(verb, path) || sampler.skippedEndpoints.contains(Endpoint(verb, path))
+    }
+
+    /**
+     * When fuzzing an API with N endpoint, we might select a subset K of endpoints in use.
+     * Check if input endpoint is among those.
+     */
+    fun isInUse(verb: HttpVerb, path: RestPath): Boolean {
+        return endpointsInUse.any { it.path == path && it.verb == verb }
     }
 
     fun findStrictTopGETResourceAncestor(path: RestPath) : RestCallAction?{
@@ -346,4 +360,4 @@ class CallGraphService {
          */
         return deletes.find { action.path.isSameOrAncestorOf(it.path) }
     }
-}
+}

core/src/main/kotlin/org/evomaster/core/problem/rest/service/fitness/AbstractRestFitness.kt

@@ -804,7 +804,11 @@ abstract class AbstractRestFitness : HttpWsFitness<RestIndividual>() {
         rcr: RestCallResult,
         fv: FitnessValue
     ) {
-        if (!config.schemaOracles || !schemaOracle.canValidate() || a.id == CALL_TO_SWAGGER_ID) {
+        if (!config.schemaOracles
+            || !schemaOracle.canValidate()
+            || a.id == CALL_TO_SWAGGER_ID
+            || !callGraphService.isDeclared(a.verb,a.path)
+            ) {
             return
         }
 

core/src/main/kotlin/org/evomaster/core/problem/rest/service/sampler/AbstractRestSampler.kt

@@ -19,6 +19,7 @@ import org.evomaster.core.problem.httpws.service.HttpWsSampler
 import org.evomaster.core.problem.rest.*
 import org.evomaster.core.problem.rest.builder.RestActionBuilderV3
 import org.evomaster.core.problem.rest.builder.RestActionBuilderV3.buildActionBasedOnUrl
+import org.evomaster.core.problem.rest.data.Endpoint
 import org.evomaster.core.problem.rest.data.HttpVerb
 import org.evomaster.core.problem.rest.data.RestCallAction
 import org.evomaster.core.problem.rest.data.RestIndividual
@@ -55,25 +56,26 @@ abstract class AbstractRestSampler : HttpWsSampler<RestIndividual>() {
     @Inject
     protected lateinit var configuration: EMConfig
 
-    @Inject
-    protected lateinit var partialOracles: PartialOracles
-
     @Inject
     protected lateinit var builder: RestIndividualBuilder
 
     @Inject
     protected lateinit var responseClassifier: AIResponseClassifier
 
+    // TODO: This will moved under ApiWsSampler once RPC and GraphQL support is completed
+    @Inject
+    protected lateinit var externalServiceHandler: HttpWsExternalServiceHandler
+
     protected val adHocInitialIndividuals: MutableList<RestIndividual> = mutableListOf()
 
     lateinit var schemaHolder: RestSchema
         protected set
 
     private lateinit var infoDto: SutInfoDto
 
-    // TODO: This will moved under ApiWsSampler once RPC and GraphQL support is completed
-    @Inject
-    protected lateinit var externalServiceHandler: HttpWsExternalServiceHandler
+    lateinit var skippedEndpoints : List<Endpoint>
+        private set
+
 
     @PostConstruct
     open fun initialize() {
@@ -120,8 +122,8 @@ abstract class AbstractRestSampler : HttpWsSampler<RestIndividual>() {
 
         // The code should never reach this line without a valid swagger.
         actionCluster.clear()
-        val skip = EndpointFilter.getEndpointsToSkip(config, schemaHolder, infoDto)
-        val messages = RestActionBuilderV3.addActionsFromSwagger(schemaHolder, actionCluster, skip, RestActionBuilderV3.Options(config))
+        skippedEndpoints = EndpointFilter.getEndpointsToSkip(config, schemaHolder, infoDto)
+        val messages = RestActionBuilderV3.addActionsFromSwagger(schemaHolder, actionCluster, skippedEndpoints, RestActionBuilderV3.Options(config))
         printMessages(messages)
 
         if(config.extraQueryParam){
@@ -321,16 +323,14 @@ abstract class AbstractRestSampler : HttpWsSampler<RestIndividual>() {
 
         actionCluster.clear()
         // Add all paths to list of paths to ignore except endpointFocus
-        val endpointsToSkip = EndpointFilter.getEndpointsToSkip(config,schemaHolder)
-        val messages = RestActionBuilderV3.addActionsFromSwagger(schemaHolder, actionCluster, endpointsToSkip, RestActionBuilderV3.Options(config))
+        skippedEndpoints = EndpointFilter.getEndpointsToSkip(config,schemaHolder)
+        val messages = RestActionBuilderV3.addActionsFromSwagger(schemaHolder, actionCluster, skippedEndpoints, RestActionBuilderV3.Options(config))
         printMessages(messages)
 
         initAdHocInitialIndividuals()
-        if (config.seedTestCases)
+        if (config.seedTestCases) {
             initSeededTests()
-
-
-        //partialOracles.setupForRest(swagger, config)
+        }
 
         log.debug("Done initializing {}", AbstractRestSampler::class.simpleName)
     }

core/src/main/kotlin/org/evomaster/core/search/service/Statistics.kt

@@ -566,10 +566,11 @@ class Statistics : SearchListener {
         return solution.individuals
                 .flatMap { it.evaluatedMainActions() }
                 .filter {
-                    it.result is HttpWsCallResult && (it.result as HttpWsCallResult).getStatusCode()?.let { c -> c in 200..299 } ?: false
+                    it.result is HttpWsCallResult &&
+                            (it.result).getStatusCode()?.let { c -> c in 200..299 } ?: false
                 }
                 // in phases like Security we might create calls that do not exist in schema
-                .filter{ it.action is RestCallAction && callGraphService.isDeclared(it.action.verb,it.action.path)}
+                .filter{ it.action is RestCallAction && callGraphService.isInUse(it.action.verb,it.action.path)}
                 .map { it.action.getName() }
                 .distinct()
                 .count()