diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 52d394d..c4858d5 100644 --- 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 \ No newline at end of file diff --git a/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala b/src/main/scala/io/joern/benchmarks/datasets/BenchmarkDataset.scala index bd8c8ad..5d2718c 100644 --- 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 index 5c28c7d..31d6ffb 100644 --- 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 deleted file mode 100644 index ac4d221..0000000 --- a/src/main/scala/io/joern/benchmarks/datasets/runner/OWASPJavaDownloader.scala +++ /dev/null @@ -1,47 +0,0 @@ -package io.joern.benchmarks.datasets.runner - -import better.files.File -import io.joern.benchmarks.* -import io.joern.benchmarks.datasets.JavaCpgTypes -import org.slf4j.LoggerFactory - -import java.net.{URI, URL} -import scala.util.{Failure, Success, Try} - -class OWASPJavaDownloader(datasetDir: File, cpgCreatorType: JavaCpgTypes.Value) - extends DatasetDownloader(datasetDir) - with SingleFileDownloader { - - private val logger = LoggerFactory.getLogger(getClass) - - override val benchmarkName = s"OWASP Java v1.2" - - override protected val benchmarkUrl: URL = URI( - "https://github.com/OWASP-Benchmark/BenchmarkJava/archive/refs/tags/1.2beta.zip" - ).toURL - override protected val benchmarkFileName: String = "BenchmarkJava-1.2beta" - override protected val benchmarkBaseDir: File = datasetDir / benchmarkFileName - - private val apacheJdo = URI("https://repo1.maven.org/maven2/javax/jdo/jdo-api/3.1/jdo-api-3.1.jar").toURL - - override def initialize(): Try[File] = Try { - downloadBenchmarkAndUnarchive(CompressionTypes.ZIP) - - val datasetLabel = - if cpgCreatorType == JavaCpgTypes.JAVA then JavaCpgTypes.JAVA.toString - else JavaCpgTypes.JAVASRC.toString - - compressBenchmark( - benchmarkBaseDir, - Option(File(s"${datasetDir.pathAsString}/OWASP-BenchmarkJava-$datasetLabel.zip")) - ) - } - - override def run(): Unit = { - initialize() match { - case Failure(exception) => - logger.error(s"Unable to initialize benchmark '$getClass'", exception) - case Success(benchmarkDir) => - } - } -}