diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 3ec4b43..cf4ed86 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -44,6 +44,10 @@ jobs: with: repository: 'DefectDojo/django-DefectDojo' path: 'repotests/django-DefectDojo' + - uses: actions/checkout@v3 + with: + repository: 'nodejs/node' + path: 'repotests/nodejs' - uses: coursier/cache-action@v6 - name: Set up JDK uses: actions/setup-java@v3 @@ -79,6 +83,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + - run: | + ./atom.sh usages -o /tmp/v8.atom -l h $GITHUB_WORKSPACE/repotests/nodejs/deps/v8 -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/v8.slices.json + ./atom.sh usages -o /tmp/uv.atom -l h $GITHUB_WORKSPACE/repotests/nodejs/deps/uv -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/uv.slices.json + ./atom.sh usages -o /tmp/openssl.atom -l h $GITHUB_WORKSPACE/repotests/nodejs/deps/openssl -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/openssl.slices.json + env: + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + if: runner.os != 'Windows' - run: | npm install -g @cyclonedx/cdxgen --omit=optional cdxgen -t java --deep -o $GITHUB_WORKSPACE/repotests/java-sec-code/bom.json $GITHUB_WORKSPACE/repotests/java-sec-code diff --git a/build.sbt b/build.sbt index db86a18..9dc2821 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ name := "atom" ThisBuild / organization := "io.appthreat" -ThisBuild / version := "1.5.4" +ThisBuild / version := "1.5.5" ThisBuild / scalaVersion := "3.3.1" -val chenVersion = "0.5.4" +val chenVersion = "0.6.0" lazy val atom = Projects.atom diff --git a/src/main/scala/io/appthreat/atom/Atom.scala b/src/main/scala/io/appthreat/atom/Atom.scala index eceb5dd..8340eb3 100644 --- a/src/main/scala/io/appthreat/atom/Atom.scala +++ b/src/main/scala/io/appthreat/atom/Atom.scala @@ -357,7 +357,7 @@ object Atom { .withInputPath(config.inputPath.pathAsString) .withOutputPath(outputAtomFile) .withFunctionBodies(false) - .withIgnoredFilesRegex(".*(test|docs|examples|samples|mocks|Documentation|demos).*") + .withIgnoredFilesRegex(".*(test|docs|example|samples|mocks|Documentation|demos).*") ) case Languages.C | Languages.NEWC | "CPP" | "C++" => new C2Cpg() @@ -367,7 +367,7 @@ object Atom { .withInputPath(config.inputPath.pathAsString) .withOutputPath(outputAtomFile) .withFunctionBodies(true) - .withIgnoredFilesRegex(".*(test|docs|examples|samples|mocks|Documentation|demos).*") + .withIgnoredFilesRegex(".*(test|docs|example|samples|mocks|Documentation|demos).*") ) case "JAR" | "JIMPLE" | "ANDROID" | "APK" | "DEX" => new Jimple2Cpg() diff --git a/wrapper/nodejs/package-lock.json b/wrapper/nodejs/package-lock.json index b6af4c8..140f9bf 100644 --- a/wrapper/nodejs/package-lock.json +++ b/wrapper/nodejs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@appthreat/atom", - "version": "1.5.4", + "version": "1.5.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@appthreat/atom", - "version": "1.5.4", + "version": "1.5.5", "license": "Apache-2.0", "dependencies": { "@babel/parser": "^7.23.0", diff --git a/wrapper/nodejs/package.json b/wrapper/nodejs/package.json index 93bddb8..f119d85 100644 --- a/wrapper/nodejs/package.json +++ b/wrapper/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@appthreat/atom", - "version": "1.5.4", + "version": "1.5.5", "description": "Create atom (⚛) representation for your application, packages and libraries", "exports": "./index.js", "type": "module",