Merge pull request #6 from joernio/andrei/remove-owasp

[Datasets] Remove OWASP
joernio · Jun 18, 2024 · e1c8580 · e1c8580
2 parents a0ba2f9 + dfa1d98
commit e1c8580
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 58 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -44,8 +44,6 @@ jobs:
           mv workspace/ichnaea.zip ichnaea.zip
           mv workspace/securibench-micro-JAVA.zip securibench-micro-JAVA.zip
           mv workspace/securibench-micro-JAVASRC.zip securibench-micro-JAVASRC.zip
-          mv workspace/OWASP-BenchmarkJava-JAVA.zip OWASP-BenchmarkJava-JAVA.zip
-          mv workspace/OWASP-BenchmarkJava-JAVASRC.zip OWASP-BenchmarkJava-JAVASRC.zip
           mv workspace/THORAT.zip THORAT.zip
       - name: Set next release version
         id: taggerFinal
@@ -61,6 +59,4 @@ jobs:
             ichnaea.zip
             securibench-micro-JAVA.zip
             securibench-micro-JAVASRC.zip
-            OWASP-BenchmarkJava-JAVA.zip
-            OWASP-BenchmarkJava-JAVASRC.zip
             THORAT.zip
diff --git a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala
@@ -5,7 +5,6 @@ import io.joern.benchmarks.datasets.AvailableBenchmarks
 import io.joern.benchmarks.datasets.runner.{
   DatasetDownloader,
   IchnaeaDownloader,
-  OWASPJavaDownloader,
   SecuribenchMicroDownloader,
   ThoratDownloader
 }
@@ -37,9 +36,6 @@ class BenchmarkDataset(config: BenchmarkDatasetConfig) {
 
 object BenchmarkDataset {
   val benchmarkConstructors: Map[AvailableBenchmarks.Value, BenchmarkDatasetConfig => DatasetDownloader] = Map(
-    // TODO: Add when implementing
-    (AvailableBenchmarks.OWASP_JAVASRC, x => new OWASPJavaDownloader(x.datasetDir, JavaCpgTypes.JAVASRC)),
-    (AvailableBenchmarks.OWASP_JAVA, x => new OWASPJavaDownloader(x.datasetDir, JavaCpgTypes.JAVA)),
     (
       AvailableBenchmarks.SECURIBENCH_MICRO_JAVASRC,
       x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.JAVASRC)
@@ -50,7 +46,6 @@ object BenchmarkDataset {
       AvailableBenchmarks.SECURIBENCH_MICRO_SEMGREP,
       x => new SecuribenchMicroDownloader(x.datasetDir, JavaCpgTypes.SEMGREP)
     ),
-    (AvailableBenchmarks.OWASP_SEMGREP, x => new OWASPJavaDownloader(x.datasetDir, JavaCpgTypes.SEMGREP)),
     (AvailableBenchmarks.ICHNAEA_SEMGREP, x => new IchnaeaDownloader(x.datasetDir)),
     (AvailableBenchmarks.THORAT_PYSRC, x => new ThoratDownloader(x.datasetDir)),
     (AvailableBenchmarks.THORAT_SEMGREP, x => new ThoratDownloader(x.datasetDir))

diff --git a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDatasetConfig.scala
@@ -11,8 +11,6 @@ object AvailableBenchmarks extends Enumeration {
   val ALL = Value
 
   // Joern
-  val OWASP_JAVASRC             = Value
-  val OWASP_JAVA                = Value
   val SECURIBENCH_MICRO_JAVASRC = Value
   val SECURIBENCH_MICRO_JAVA    = Value
   val ICHNAEA_JSSRC             = Value

diff --git a/src/main/scala/io/joern/benchmarks/datasets/runner/OWASPJavaDownloader.scala b/src/main/scala/io/joern/benchmarks/datasets/runner/OWASPJavaDownloader.scala