Merge pull request #7656 from bmuskalla/excludeMainLoggingGenerator

Java: Exclude irrelevant rows from models

java/ql/src/utils/model-generator/CaptureSinkModels.ql

@@ -48,6 +48,7 @@ string captureSink(TargetAPI api) {
     config.hasFlow(src, sink) and
     sinkNode(sink, kind) and
     api = src.getEnclosingCallable() and
+    not kind = "logging" and
     result = asSinkModel(api, asInputArgument(src), kind)
   )
 }

java/ql/src/utils/model-generator/ModelGeneratorUtils.qll

@@ -29,7 +29,8 @@ private string isExtensible(RefType ref) {
 
 predicate isRelevantForModels(Callable api) {
   not isInTestFile(api.getCompilationUnit().getFile()) and
-  not isJdkInternal(api.getCompilationUnit())
+  not isJdkInternal(api.getCompilationUnit()) and
+  not api instanceof MainMethod
 }
 
 private predicate isInTestFile(File file) {

java/ql/test/utils/model-generator/p/Sinks.java

@@ -7,6 +7,7 @@ import java.nio.file.CopyOption;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.logging.Logger;
 
 public class Sinks {
     
@@ -21,4 +22,13 @@ public class Sinks {
         }
     }
 
+    public static void main(String[] args) throws IOException {
+        String foo = new Sinks().readUrl(new URL(args[0]), Charset.defaultCharset());
+    }
+
+    public void propagate(String s) {
+        Logger logger = Logger.getLogger(Sinks.class.getSimpleName());
+        logger.warning(s);
+    }
+
 }