Fix pipeline (#454)

Author: ebehner

.github/workflows/extended-pipeline.yml

@@ -17,7 +17,7 @@ jobs:
           echo "${{ secrets.BINJA_LICENSE }}" | base64 --decode > license.txt
       - name: Download BinayNinja.zip
         run: |
-          curl -v --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_BINJA_TOKEN }}" https://gitlab.fkie.fraunhofer.de/api/v4/projects/1250/repository/files/BinaryNinja.zip/raw?ref=main --output BinaryNinja.zip
+          curl -L --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_BINJA_TOKEN }}" "https://gitlab.fkie.fraunhofer.de/api/v4/projects/1250/repository/archive.zip?sha=Binja5" -o complete_repo.zip
       - name: Build Docker Image
         run: |
           docker build -t dewolf .

.github/workflows/pipeline.yml

@@ -18,7 +18,7 @@ jobs:
           echo "${{ secrets.BINJA_LICENSE }}" | base64 --decode > license.txt
       - name: Download BinayNinja.zip
         run: |
-          curl -v --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_BINJA_TOKEN }}" https://gitlab.fkie.fraunhofer.de/api/v4/projects/1250/repository/files/BinaryNinja.zip/raw?ref=main --output BinaryNinja.zip
+          curl -L --header "PRIVATE-TOKEN: ${{ secrets.GITLAB_BINJA_TOKEN }}" "https://gitlab.fkie.fraunhofer.de/api/v4/projects/1250/repository/archive.zip?sha=Binja5" -o complete_repo.zip
       - name: Build Docker Image
         run: |
           docker build -t dewolf .

Dockerfile

@@ -28,7 +28,9 @@ RUN apt -y update && apt -y upgrade && apt install -y --no-install-recommends \
     z3
 
 # set up binaryninja
-COPY BinaryNinja.zip /tmp/BinaryNinja.zip
+COPY complete_repo.zip /tmp/complete_repo.zip
+RUN unzip /tmp/complete_repo.zip -d /tmp/repo/ && rm /tmp/complete_repo.zip
+RUN cp /tmp/repo/`ls /tmp/repo/ | grep dewolf-binja`/BinaryNinja.zip /tmp/BinaryNinja.zip
 RUN unzip /tmp/BinaryNinja.zip -d /opt/ && rm /tmp/BinaryNinja.zip && mkdir -p /root/.binaryninja/
 # set up binaryninja license
 COPY license.txt /root/.binaryninja/license.dat

decompiler/pipeline/expressions/bitfieldcomparisonunrolling.py

@@ -139,13 +139,17 @@ def _get_switch_var_and_bitfield(self, subexpr: Expression) -> Optional[Tuple[Ex
                     right=Constant(),
                 ),
                 right=Constant() as bit_field,
-            ) if bit_field.value != 0xFFFFFFFF:
+            ) if (
+                bit_field.value != 0xFFFFFFFF
+            ):
                 return switch_var, bit_field
             case BinaryOperation(
                 operation=OperationType.bitwise_and,
                 left=BinaryOperation(operation=OperationType.left_shift, left=Constant(value=1), right=switch_var),
                 right=Constant() as bit_field,
-            ) if bit_field.value != 0xFFFFFFFF:
+            ) if (
+                bit_field.value != 0xFFFFFFFF
+            ):
                 return switch_var, bit_field
             case _:
                 debug(f"no match for {subexpr}")

tests/pipeline/controlflowanalysis/restructuring_commons/test_condition_aware_refinement.py

@@ -1,4 +1,4 @@
-""" Tests for the PatternIndependentRestructuring pipeline stage condition aware refinement."""
+"""Tests for the PatternIndependentRestructuring pipeline stage condition aware refinement."""
 
 from itertools import combinations
 from typing import List, Tuple, Union

tests/pipeline/controlflowanalysis/test_pattern_independent_restructuring.py

@@ -1,4 +1,4 @@
-""" Tests for the PatternIndependentRestructuring pipeline stage"""
+"""Tests for the PatternIndependentRestructuring pipeline stage"""
 
 import pytest
 from decompiler.pipeline.controlflowanalysis.restructuring import PatternIndependentRestructuring

tests/pipeline/controlflowanalysis/test_pattern_independent_restructuring_blackbox.py

@@ -1,4 +1,4 @@
-""" Tests for the PatternIndependentRestructuring pipeline stage"""
+"""Tests for the PatternIndependentRestructuring pipeline stage"""
 
 import pytest
 from decompiler.pipeline.controlflowanalysis.restructuring import PatternIndependentRestructuring

tests/pipeline/dataflowanalysis/test_dead-code-elimination.py

@@ -1,4 +1,4 @@
-""" Tests for the DeadCodeElimination pipeline stage"""
+"""Tests for the DeadCodeElimination pipeline stage"""
 
 from abc import ABC, abstractmethod
 

tests/structures/ast/test_syntaxforest.py

@@ -1,4 +1,4 @@
-""" Tests for the AbstractSyntaxTree base class."""
+"""Tests for the AbstractSyntaxTree base class."""
 
 from itertools import combinations
 

tests/structures/ast/test_syntaxgraph.py

@@ -1,4 +1,4 @@
-""" Tests for the AbstractSyntaxTree base class."""
+"""Tests for the AbstractSyntaxTree base class."""
 
 from itertools import combinations