Java: automodel: additionally consider sources for alreadyAiModeled property

Author: Stephan Brandauer

java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql

@@ -72,10 +72,10 @@ where
   // assume that, if a sink has already been modeled in a MaD model, then it doesn't belong to any additional sink
   // types, and we don't need to reexamine it.
   (
-    not CharacteristicsImpl::isSink(endpoint, _, _) and alreadyAiModeled = ""
+    not CharacteristicsImpl::isModeled(endpoint, _, _, _) and alreadyAiModeled = ""
     or
     alreadyAiModeled.matches("%ai-%") and
-    CharacteristicsImpl::isSink(endpoint, _, alreadyAiModeled)
+    CharacteristicsImpl::isModeled(endpoint, _, _, alreadyAiModeled)
   ) and
   meta.hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, isVarargsArray) and
   includeAutomodelCandidate(package, type, name, signature) and

java/ql/automodel/src/AutomodelSharedCharacteristics.qll

@@ -96,6 +96,12 @@ module SharedCharacteristics<CandidateSig Candidate> {
 
   predicate isNeutral = Candidate::isNeutral/1;
 
+  predicate isModeled(Candidate::Endpoint e, string kind, string extensibleKind, string provenance) {
+    Candidate::isSink(e, kind, provenance) and extensibleKind = "sinkModel"
+    or
+    Candidate::isSource(e, kind, provenance) and extensibleKind = "sourceModel"
+  }
+
   /**
    * Holds if `endpoint` is modeled as `endpointType` (endpoint type must not be negative).
    */