Added import dependencies from conf to code

Author: oxisto

cpg-concepts/src/integrationTest/kotlin/de/fraunhofer/aisec/cpg/concepts/ConfigurationPassTest.kt

@@ -39,10 +39,12 @@ import de.fraunhofer.aisec.cpg.graph.concepts.config.ReadConfigurationOption
 import de.fraunhofer.aisec.cpg.graph.concepts.config.RegisterConfigurationGroup
 import de.fraunhofer.aisec.cpg.graph.concepts.config.RegisterConfigurationOption
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.SubscriptExpression
+import de.fraunhofer.aisec.cpg.passes.ImportResolver
 import de.fraunhofer.aisec.cpg.passes.PassConfiguration
 import de.fraunhofer.aisec.cpg.passes.concepts.ConceptPass
 import de.fraunhofer.aisec.cpg.passes.concepts.config.ProvideConfigTask
 import de.fraunhofer.aisec.cpg.passes.concepts.config.ini.IniFileConfigurationSourceTask
+import de.fraunhofer.aisec.cpg.passes.concepts.config.ini.IniFileImportTask
 import de.fraunhofer.aisec.cpg.passes.concepts.config.python.PythonStdLibConfigurationTask
 import de.fraunhofer.aisec.cpg.test.analyze
 import java.io.File
@@ -66,6 +68,9 @@ class ConfigurationPassTest {
                         .registerTask<PythonStdLibConfigurationTask>()
                         .registerTask<ProvideConfigTask>()
                 )
+                it.configurePass<ImportResolver>(
+                    PassConfiguration().registerTask<IniFileImportTask>()
+                )
                 it.softwareComponents(
                     mutableMapOf(
                         "conf" to listOf(topLevel.resolve("conf")),

cpg-concepts/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/concepts/config/ProvideConfigTask.kt

@@ -55,6 +55,7 @@ import de.fraunhofer.aisec.cpg.passes.concepts.config.python.stringValues
 class ProvideConfigTask(target: Component, pass: ConceptPass, ctx: TranslationContext) :
     ConceptTask(target, pass, ctx) {
     override fun handleNode(node: Node) {
+        val loadsConfigs = node.overlays.filterIsInstance<LoadConfiguration>()
         when (node) {
             is TranslationUnitDeclaration -> handleTranslationUnit(node)
         }
@@ -63,25 +64,21 @@ class ProvideConfigTask(target: Component, pass: ConceptPass, ctx: TranslationCo
     private fun handleTranslationUnit(
         tu: TranslationUnitDeclaration
     ): List<ConfigurationOperation>? {
-        return tu.translationResult
-            ?.operationNodes
-            ?.filterIsInstance<LoadConfiguration>()
-            ?.flatMap { loadConfig ->
-                // Loop through all configuration sources
-                val sources =
-                    tu.translationResult
-                        ?.conceptNodes
-                        ?.filterIsInstance<ConfigurationSource>()
-                        ?.filter { source ->
-                            loadConfig.fileExpression.stringValues?.contains(
-                                source.name.toString()
-                            ) == true
-                        }
-
-                // And create a ProvideConfiguration node for each source
-                sources?.flatMap { handleConfiguration(it, loadConfig.conf, tu, loadConfig) }
-                    ?: listOf()
-            }
+        return tu?.operationNodes?.filterIsInstance<LoadConfiguration>()?.flatMap { loadConfig ->
+            // Loop through all configuration sources
+            val sources =
+                tu.translationResult
+                    ?.conceptNodes
+                    ?.filterIsInstance<ConfigurationSource>()
+                    ?.filter { source ->
+                        loadConfig.fileExpression.stringValues?.contains(source.name.toString()) ==
+                            true
+                    }
+
+            // And create a ProvideConfiguration node for each source
+            sources?.flatMap { handleConfiguration(it, loadConfig.conf, tu, loadConfig) }
+                ?: listOf()
+        }
     }
 
     private fun handleConfiguration(

cpg-concepts/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/concepts/config/ini/IniFileConfigurationSourceTask.kt

@@ -26,6 +26,7 @@
 package de.fraunhofer.aisec.cpg.passes.concepts.config.ini
 
 import de.fraunhofer.aisec.cpg.TranslationContext
+import de.fraunhofer.aisec.cpg.TranslationResult
 import de.fraunhofer.aisec.cpg.graph.Component
 import de.fraunhofer.aisec.cpg.graph.Node
 import de.fraunhofer.aisec.cpg.graph.conceptNodes
@@ -37,6 +38,8 @@ import de.fraunhofer.aisec.cpg.graph.declarations.RecordDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.TranslationUnitDeclaration
 import de.fraunhofer.aisec.cpg.graph.translationUnit
 import de.fraunhofer.aisec.cpg.helpers.Util.warnWithFileLocation
+import de.fraunhofer.aisec.cpg.passes.ImportResolver
+import de.fraunhofer.aisec.cpg.passes.ImportResolverTask
 import de.fraunhofer.aisec.cpg.passes.concepts.ConceptPass
 import de.fraunhofer.aisec.cpg.passes.concepts.ConceptTask
 import de.fraunhofer.aisec.cpg.passes.concepts.config.ProvideConfigTask
@@ -131,3 +134,23 @@ class IniFileConfigurationSourceTask(
         return option
     }
 }
+
+class IniFileImportTask(target: TranslationResult, pass: ImportResolver, ctx: TranslationContext) :
+    ImportResolverTask(target, pass, ctx) {
+    override fun handleNode(node: Node) {
+        // Check, if we have components with INI files
+        val iniComponents =
+            target.components.filter { it.language.name.localName == "IniFileLanguage" }
+
+        // Add them to as a dependency to all other components. At this point, we cannot know yet
+        // which component does import which INI file, but we need to make sure that the
+        // configuration is processed first
+        iniComponents.forEach { iniComponent ->
+            target.components.forEach { component ->
+                if (component != iniComponent) {
+                    target.componentDependencies?.add(component, iniComponent)
+                }
+            }
+        }
+    }
+}

cpg-concepts/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/concepts/memory/cxx/CXXDynamicLoadingTask.kt

@@ -218,10 +218,7 @@ class CXXDynamicLoadingImportTask(
         val libraryComponent = call.extractComponentFromLoadLibrary()
         if (libraryComponent != null) {
             ctx.currentComponent?.let {
-                val added = target.componentDependencies?.add(it, libraryComponent) == true
-                if (added) {
-                    log.debug("Added {} as an dependency of {}", libraryComponent.name, it.name)
-                }
+                target.componentDependencies?.add(it, libraryComponent) == true
             }
         }
     }

cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/ImportResolver.kt

@@ -83,6 +83,10 @@ class ImportDependencies<T : Node>(modules: MutableList<T>) : IdentityHashMap<T,
         var list = this.computeIfAbsent(importer) { identitySetOf<T>() }
         var added = list.add(imported)
 
+        if (added) {
+            log.debug("Added {} as an dependency of {}", imported.name, importer.name)
+        }
+
         return added
     }
 
@@ -324,21 +328,10 @@ class ImportResolver(ctx: TranslationContext) : TranslationResultPass(ctx) {
 
                 // Lastly, store the namespace module as an import dependency of the module where
                 // the import was
-                var added =
-                    currentComponent.translationUnitDependencies?.add(importTu, namespaceTu) == true
-                if (added) {
-                    log.debug("Added {} as an dependency of {}", namespaceTu.name, importTu.name)
-                }
+                currentComponent.translationUnitDependencies?.add(importTu, namespaceTu) == true
 
                 // Add it on translation result level as well
-                added = tr.componentDependencies?.add(currentComponent, namespaceComponent) == true
-                if (added) {
-                    log.debug(
-                        "Added {} as an dependency of {}",
-                        namespaceComponent.name,
-                        currentComponent.name,
-                    )
-                }
+                tr.componentDependencies?.add(currentComponent, namespaceComponent) == true
             }
 
             // If we had any imported namespaces, we break here