Merge branch 'main' into rb/summarize-more

Author: asgerf

config/identical-files.json

@@ -33,8 +33,9 @@
     "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
     "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
     "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll",
+    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForRegExp.qll",
     "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
+    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
     "swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"
   ],
   "DataFlow Java/C++/C#/Python Common": [
@@ -69,7 +70,7 @@
     "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
     "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll",
     "ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/tainttrackingforlibraries/TaintTrackingImpl.qll",
+    "ruby/ql/lib/codeql/ruby/dataflow/internal/tainttrackingforregexp/TaintTrackingImpl.qll",
     "swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
   ],
   "DataFlow Java/C++/C#/Python Consistency checks": [

csharp/ql/integration-tests/all-platforms/dotnet_run/test.py

@@ -41,3 +41,7 @@ def check_build_out(msg, s):
 # to `dotnet run -p:UseSharedCompilation=true -p:UseSharedCompilation=false -- hello world`
 s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test6-db', 'dotnet run -p:UseSharedCompilation=true -- hello world'], "test7-db")
 check_build_out("hello, world", s)
+
+# option passed into `dotnet run`
+s = run_codeql_database_create_stdout(['dotnet clean', 'rm -rf test7-db', 'dotnet build', 'dotnet run --no-build hello world'], "test8-db")
+check_build_out("hello, world", s)

csharp/tools/tracing-config.lua

@@ -21,8 +21,8 @@ function RegisterExtractorPack(id)
         -- if that's `build`, we append `-p:UseSharedCompilation=false` to the command line,
         -- otherwise we do nothing.
         local match = false
-        local needsSeparator = false;
-        local injectionIndex = nil;
+        local dotnetRunNeedsSeparator = false;
+        local dotnetRunInjectionIndex = nil;
         local argv = compilerArguments.argv
         if OperatingSystem == 'windows' then
             -- let's hope that this split matches the escaping rules `dotnet` applies to command line arguments
@@ -34,7 +34,9 @@ function RegisterExtractorPack(id)
             -- dotnet options start with either - or / (both are legal)
             local firstCharacter = string.sub(arg, 1, 1)
             if not (firstCharacter == '-') and not (firstCharacter == '/') then
-                Log(1, 'Dotnet subcommand detected: %s', arg)
+                if (not match) then
+                    Log(1, 'Dotnet subcommand detected: %s', arg)
+                end
                 if arg == 'build' or arg == 'msbuild' or arg == 'publish' or arg == 'pack' or arg == 'test' then
                     match = true
                     break
@@ -43,22 +45,29 @@ function RegisterExtractorPack(id)
                     -- for `dotnet run`, we need to make sure that `-p:UseSharedCompilation=false` is
                     -- not passed in as an argument to the program that is run
                     match = true
-                    needsSeparator = true
-                    injectionIndex = i + 1
+                    dotnetRunNeedsSeparator = true
+                    dotnetRunInjectionIndex = i + 1
                 end
             end
+            -- if we see a separator to `dotnet run`, inject just prior to the existing separator
             if arg == '--' then
-                needsSeparator = false
-                injectionIndex = i
+                dotnetRunNeedsSeparator = false
+                dotnetRunInjectionIndex = i
                 break
             end
+            -- if we see an option to `dotnet run` (e.g., `--project`), inject just prior
+            -- to the last option
+            if firstCharacter == '-' then
+                dotnetRunNeedsSeparator = false
+                dotnetRunInjectionIndex = i
+            end
         end
         if match then
             local injections = { '-p:UseSharedCompilation=false' }
-            if needsSeparator then
+            if dotnetRunNeedsSeparator then
                 table.insert(injections, '--')
             end
-            if injectionIndex == nil then
+            if dotnetRunInjectionIndex == nil then
                 -- Simple case; just append at the end
                 return {
                     order = ORDER_REPLACE,
@@ -69,7 +78,7 @@ function RegisterExtractorPack(id)
 
             -- Complex case; splice injections into the middle of the command line
             for i, injectionArg in ipairs(injections) do
-                table.insert(argv, injectionIndex + i - 1, injectionArg)
+                table.insert(argv, dotnetRunInjectionIndex + i - 1, injectionArg)
             end
 
             if OperatingSystem == 'windows' then

java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt

@@ -84,7 +84,7 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
                                     // file information if needed:
                                     val ftw = tw.makeFileTrapWriter(binaryPath, irDecl is IrClass)
 
-                                    val fileExtractor = KotlinFileExtractor(logger, ftw, binaryPath, manager, this, primitiveTypeMapping, pluginContext, globalExtensionState)
+                                    val fileExtractor = KotlinFileExtractor(logger, ftw, binaryPath, manager, this, primitiveTypeMapping, pluginContext, KotlinFileExtractor.DeclarationStack(), globalExtensionState)
 
                                     if (irDecl is IrClass) {
                                         // Populate a location and compilation-unit package for the file. This is similar to

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

@@ -322,7 +322,7 @@ private fun doFile(
                 // file information
                 val sftw = tw.makeSourceFileTrapWriter(srcFile, true)
                 val externalDeclExtractor = ExternalDeclExtractor(logger, invocationTrapFile, srcFilePath, primitiveTypeMapping, pluginContext, globalExtensionState, fileTrapWriter)
-                val fileExtractor = KotlinFileExtractor(logger, sftw, srcFilePath, null, externalDeclExtractor, primitiveTypeMapping, pluginContext, globalExtensionState)
+                val fileExtractor = KotlinFileExtractor(logger, sftw, srcFilePath, null, externalDeclExtractor, primitiveTypeMapping, pluginContext, KotlinFileExtractor.DeclarationStack(), globalExtensionState)
 
                 fileExtractor.extractFileContents(srcFile, sftw.fileId)
                 externalDeclExtractor.extractExternalClasses()