Merge pull request #297 from Privado-Inc/dev

Dev
Privado-Inc · Jan 25, 2023 · c47db82 · c47db82
2 parents 2de5d14 + 669e5a8
commit c47db82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/src/main/scala/ai/privado/entrypoint/ScanProcessor.scala b/src/main/scala/ai/privado/entrypoint/ScanProcessor.scala
@@ -39,6 +39,8 @@ import org.slf4j.LoggerFactory
 import java.util.Calendar
 import scala.sys.exit
 import scala.util.{Failure, Success, Try}
+import scala.collection.parallel.CollectionConverters.ImmutableIterableIsParallelizable
+
 
 object ScanProcessor extends CommandProcessor {
   private val logger = LoggerFactory.getLogger(this.getClass)
@@ -78,7 +80,7 @@ object ScanProcessor extends CommandProcessor {
       rule.language == langToFilter || rule.language == Language.DEFAULT || rule.language == Language.UNKNOWN
     val parsedRules =
       try
-        ir.listRecursively
+        ir.listRecursively.toList.par
           .filter(f =>
             ((f.extension(toLowerCase = true).toString.contains(".yaml") ||
               f.extension(toLowerCase = true).toString.contains(".yml")) &&

diff --git a/src/main/scala/ai/privado/languageEngine/java/passes/config/PropertiesFilePass.scala b/src/main/scala/ai/privado/languageEngine/java/passes/config/PropertiesFilePass.scala
@@ -25,6 +25,7 @@ package ai.privado.languageEngine.java.passes.config
 
 import ai.privado.cache.RuleCache
 import ai.privado.model.RuleInfo
+import ai.privado.utility.Utilities
 import io.joern.x2cpg.SourceFiles
 import io.shiftleft.codepropertygraph.generated.{Cpg, EdgeTypes}
 import io.shiftleft.codepropertygraph.generated.nodes.{Literal, MethodParameterIn, NewFile, NewJavaProperty}
@@ -161,7 +162,9 @@ class PropertiesFilePass(cpg: Cpg, projectRoot: String) extends ForkJoinParallel
   }
 
   private def propertiesFiles(projectRoot: String): List[String] = {
-    SourceFiles.determine(Set(projectRoot), Set(".properties", ".yml", ".yaml"))
+    SourceFiles
+      .determine(Set(projectRoot), Set(".properties", ".yml", ".yaml"))
+      .filter(Utilities.isFileProcessable)
   }
 
   private def addFileNode(name: String, builder: BatchedUpdate.DiffGraphBuilder): NewFile = {