From a40037b52bf8b1fa1f8948c1049065ae04b0a738 Mon Sep 17 00:00:00 2001 From: itsacoderepo Date: Thu, 2 May 2024 17:38:16 +0200 Subject: [PATCH 1/2] [jimple] Remove jsp add html and json I would not consider jsp to be config files but code. Also added json and HTML files. The latter usually also does not contain configurations but i would expect it there (currently). --- .../scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala b/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala index 6da90123d9d5..a414d3d517ba 100644 --- a/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala +++ b/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala @@ -76,7 +76,7 @@ object ProgramHandlingUtil { f.zipInputStream.apply { zis => isValidZipFile(zis) } def isConfigFile: Boolean = { - val configExt = Set(".xml", ".properties", ".yaml", ".yml", ".tf", ".tfvars", ".vm", ".jsp", ".conf", ".mf") + val configExt = Set(".xml", ".properties", ".yaml", ".yml", ".tf", ".tfvars", ".vm", ".json", ".conf", ".mf", ".html") def hasConfigExt(f: File): Boolean = configExt.exists(f.`extension`.map(_.toLowerCase).contains(_)) From e73fc3614d48d65136ca073e8913dfeecca8fbef Mon Sep 17 00:00:00 2001 From: Niko Schmidt Date: Thu, 2 May 2024 17:49:08 +0200 Subject: [PATCH 2/2] scalafmt --- .../scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala b/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala index a414d3d517ba..2253d39ce68f 100644 --- a/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala +++ b/joern-cli/frontends/jimple2cpg/src/main/scala/io/joern/jimple2cpg/util/ProgramHandlingUtil.scala @@ -76,7 +76,8 @@ object ProgramHandlingUtil { f.zipInputStream.apply { zis => isValidZipFile(zis) } def isConfigFile: Boolean = { - val configExt = Set(".xml", ".properties", ".yaml", ".yml", ".tf", ".tfvars", ".vm", ".json", ".conf", ".mf", ".html") + val configExt = + Set(".xml", ".properties", ".yaml", ".yml", ".tf", ".tfvars", ".vm", ".json", ".conf", ".mf", ".html") def hasConfigExt(f: File): Boolean = configExt.exists(f.`extension`.map(_.toLowerCase).contains(_))