Skip to content

Commit b936edf

Browse files
committed
Merge branch 'master' into add_automatic_installation_for_rizin
2 parents f8e71a8 + 9af6e12 commit b936edf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+5532
-1333
lines changed

.github/workflows/pytest.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
python -m pip install --upgrade pip
26-
pip install pytest pipenv rzpipe meson ninja coverage
26+
python -m pip install pytest rzpipe meson==0.62.0 ninja coverage ciphey frida objection
2727
sudo apt-get install -y ninja-build
2828
2929
# Install graphviz
3030
sudo apt-get -y install graphviz
3131
32-
3332
# Install Rizin
3433
sudo git clone --branch v0.3.4 https://github.com/rizinorg/rizin /opt/rizin/
3534
cd /opt/rizin/
@@ -39,12 +38,19 @@ jobs:
3938
sudo ldconfig -v
4039
cd -
4140
42-
41+
# Install click >= 8.0.0 for CLI supports
42+
python -m pip install click==8.0.3
43+
44+
- name: Install Quark-Engine
45+
run: |
46+
python setup.py build
47+
python setup.py install
48+
4349
- name: Test with pytest
4450
run: |
45-
pipenv install --dev
46-
pipenv install coveralls codecov pytest-cov --skip-lock
47-
pipenv run pytest --cov=./
51+
python -m pip install black pytest sphinx sphinx-rtd-theme
52+
python -m pip install coveralls codecov pytest-cov
53+
pytest --cov=./
4854
4955
- name: Upload coverage to Codecov
5056
uses: codecov/codecov-action@v1

.github/workflows/smoke_test.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,60 @@ jobs:
2727

2828
steps:
2929
- uses: actions/checkout@v2
30+
3031
- name: Set up Python
3132
uses: actions/setup-python@v2
3233
with:
3334
python-version: ${{ matrix.python-version }}
3435

35-
# Runs a single command using the runners shell
3636
- name: Install dependencies
3737
run: |
3838
python -m pip install --upgrade pip
39-
python -m pip install pipenv
40-
pipenv install --skip-lock --dev
39+
python -m pip install ciphey frida objection
40+
python -m pip install black pytest sphinx sphinx-rtd-theme
41+
42+
# Install click >= 8.0.0 for CLI supports
43+
python -m pip install click==8.0.3
4144
4245
- run: sudo apt-get -y install graphviz
4346
if: matrix.os == 'ubuntu-latest'
4447
- run: brew install graphviz
4548
if: matrix.os == 'macOS-latest'
4649
- run: choco install graphviz
4750
if: matrix.os == 'windows-latest'
51+
52+
- name: Install Quark-Engine
53+
run: |
54+
python setup.py build
55+
python setup.py install
56+
4857
# Download the latest rule set
4958
- name: Download rule from https://github.com/quark-engine/quark-rules
50-
run: |
51-
pipenv run freshquark
59+
run: freshquark
5260

5361
# Runs a set of commands using the quark-engine
5462
- name: Run a multi-line script
5563
run: |
56-
pipenv run quark --help
64+
quark --help
5765
git clone https://github.com/quark-engine/apk-malware-samples
58-
pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s
59-
pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -d
60-
pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -g
61-
pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -d -g
62-
pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -c
66+
quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s
67+
quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -d
68+
quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -g
69+
quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -d -g
70+
quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -c
6371
6472
- name: Check Accuracy
6573
shell: bash
6674
run: |
67-
echo "Ahmyth_RESULT=$(pipenv run quark -a apk-malware-samples/Ahmyth.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
68-
echo "a4db_RESULT=$(pipenv run quark -a apk-malware-samples/13667fe3b0ad496a0cd157f34b7e0c991d72a4db.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
69-
echo "e273e_RESULT=$(pipenv run quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
75+
echo "Ahmyth_RESULT=$(quark -a apk-malware-samples/Ahmyth.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
76+
echo "a4db_RESULT=$(quark -a apk-malware-samples/13667fe3b0ad496a0cd157f34b7e0c991d72a4db.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
77+
echo "e273e_RESULT=$(quark -a apk-malware-samples/14d9f1a92dd984d6040cc41ed06e273e.apk -s -t 100 | grep 100% | wc -l | awk '{print $1}')" >> $GITHUB_ENV
7078
7179
- name: Check Ahmyt Result
7280
shell: bash
7381
# This sample should have 16 behaviors with 100% confidence
7482
run: |
75-
if [ "${{ env.Ahmyth_RESULT }}" == "28" ]; then
83+
if [ "${{ env.Ahmyth_RESULT }}" == "35" ]; then
7684
exit 0
7785
else
7886
exit 1
@@ -82,7 +90,7 @@ jobs:
8290
shell: bash
8391
# This sample should have 11 behaviors with 100% confidence
8492
run: |
85-
if [ "${{ env.a4db_RESULT }}" == "17" ]; then
93+
if [ "${{ env.a4db_RESULT }}" == "19" ]; then
8694
exit 0
8795
else
8896
exit 1
@@ -92,7 +100,7 @@ jobs:
92100
shell: bash
93101
# This sample should have 15 behaviors with 100% confidence
94102
run: |
95-
if [ "${{ env.e273e_RESULT }}" == "27" ]; then
103+
if [ "${{ env.e273e_RESULT }}" == "36" ]; then
96104
exit 0
97105
else
98106
exit 1

Pipfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ pandas = "<=1.3.4"
2222
plotly = "<=5.4.0"
2323
prompt-toolkit = "==3.0.19"
2424
rzpipe = "<=0.1.2"
25+
objection = "<=1.11.0"
26+
frida = "<=15.2.2"
27+
ciphey = ">=5.0.0,<=5.14.0"
2528

2629
[requires]
2730
python_version = "3.8"

0 commit comments

Comments
 (0)