Package updates

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
AppThreat · Jan 30, 2024 · fc158f2 · fc158f2
1 parent 9eb99c1
commit fc158f2
Show file tree

Hide file tree

Showing 13 changed files with 270 additions and 312 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -20,11 +20,11 @@ jobs:
       contents: write
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -35,11 +35,11 @@ jobs:
           php-version: "8.3"
           tools: composer:v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '21.x'
       - name: Delete `.rustup` directory
@@ -48,7 +48,7 @@ jobs:
       - name: Delete `.cargo` directory # to save disk space
         run: rm -rf /home/runner/.cargo
         if: runner.os == 'Linux'
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.sbt
@@ -69,7 +69,7 @@ jobs:
         run: |
           cd target
           echo $GITHUB_TOKEN | oras login ghcr.io -u $GITHUB_USERNAME --password-stdin
-          oras push ghcr.io/$IMAGE_NAME:v1 \
+          oras push ghcr.io/$IMAGE_NAME:v2 \
             --annotation-file ../ci/annotations.json \
             ./chen.zip:application/vnd.appthreat.chen.layer.v1+tar \
             ./chen-science-requirements.txt:application/vnd.appthreat.chen.layer.v1+tar \

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -8,11 +8,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -23,11 +23,11 @@ jobs:
           php-version: "8.3"
           tools: composer:v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '21.x'
       - name: Delete `.rustup` directory
@@ -57,7 +57,7 @@ jobs:
           python3.11 -m poetry config virtualenvs.create false
           python3.11 -m poetry install --no-cache
           python3.11 -m poetry run flake8 chenpy --count --select=E9,F63,F7,F82 --show-source --statistics
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.sbt

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,11 +8,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         jvm: ['21']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.jvm }}
@@ -23,11 +23,11 @@ jobs:
           php-version: "8.3"
           tools: composer:v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '21.x'
       - name: Delete `.rustup` directory
@@ -57,7 +57,7 @@ jobs:
           python3 -m poetry config virtualenvs.create false
           python3 -m poetry install --no-cache
           poetry run flake8 chenpy --count --select=E9,F63,F7,F82 --show-source --statistics
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.sbt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,11 +12,11 @@ jobs:
       contents: write
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '21'
@@ -27,11 +27,11 @@ jobs:
           php-version: "8.3"
           tools: composer:v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '21.x'
       - name: Delete `.rustup` directory
@@ -40,7 +40,7 @@ jobs:
       - name: Delete `.cargo` directory # to save disk space
         run: rm -rf /home/runner/.cargo
         if: runner.os == 'Linux'
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.sbt

diff --git a/.github/workflows/win_compat.yml b/.github/workflows/win_compat.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install

diff --git a/chenpy/cli.py b/chenpy/cli.py
@@ -184,7 +184,7 @@ def install_py_modules(pack="database"):
 conda install -n chenpy-local -c pytorch pytorch torchtext cpuonly --solver=libmamba -y
 pip install pyg_lib -f https://data.pyg.org/whl/torch-2.1.0+cpu.html
 conda install -n chenpy-local -c conda-forge scipy numpy packageurl-python nbconvert jupyter_core jupyter_client notebook --solver=libmamba -y
-conda install -n chenpy-local -c conda-forge oras-py httpx websockets orjson rich appdirs psutil gitpython --solver=libmamba -y"""
+conda install -n chenpy-local -c conda-forge oras-py==0.1.26 httpx websockets orjson rich appdirs psutil gitpython --solver=libmamba -y"""
             for line in conda_install_script.split("\n"):
                 if line.strip():
                     task = progress.add_task(line, start=False, total=100)
@@ -227,6 +227,7 @@ def detect_python_lib_path():
         return lib_dir, py_version
     cp = subprocess.run(
         ["python3-config", "--ldflags", "--embed"],
+        check=True,
         capture_output=True,
         encoding="utf-8",
         shell=USE_SHELL,

diff --git a/chenpy/config.py b/chenpy/config.py
@@ -7,4 +7,4 @@
     os.makedirs(chen_home)
 
 # chen oras distribution url
-chen_distribution_url = "ghcr.io/appthreat/chen-platform:v1"
+chen_distribution_url = "ghcr.io/appthreat/chen-platform:v2"
diff --git a/contrib/README.md b/contrib/README.md
diff --git a/contrib/java21.patch b/contrib/java21.patch
diff --git a/meta.yaml b/meta.yaml
@@ -24,7 +24,7 @@ requirements:
     - conda-forge::websockets>=11.0.2,<12.0.0
     - conda-forge::orjson>=3.9.0,<4.0.0
     - conda-forge::rich>=13.4.1,<14.0.0
-    - conda-forge::oras-py>=0.1.25
+    - conda-forge::oras-py==0.1.26
     - conda-forge::appdirs>=1.4.4,<2.0.0
     - conda-forge::psutil>=5.9.5,<6.0.0
     - conda-forge::packageurl-python>=0.11.2,<0.12.0

diff --git a/platform/frontends/x2cpg/src/main/scala/io/appthreat/x2cpg/passes/taggers/EasyTagsPass.scala b/platform/frontends/x2cpg/src/main/scala/io/appthreat/x2cpg/passes/taggers/EasyTagsPass.scala
@@ -125,7 +125,7 @@ class EasyTagsPass(atom: Cpg) extends CpgPass(atom):
             atom.call.methodFullName("java.security.*doFinal.*").newTagNode(
               "crypto-generate"
             ).store()(dstGraph)
-            atom.call.methodFullName("org.bouncycastle.*(doFinal|generate).*").newTagNode(
+            atom.call.methodFullName("org.bouncycastle.*(doFinal|generate|build).*").newTagNode(
               "crypto-generate"
             ).store()(dstGraph)
             atom.call.methodFullName("javax.(security|crypto).*doFinal.*").newTagNode(