Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
doomedraven committed Sep 3, 2023
1 parent 840f9dd commit 872c53d
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 17 deletions.
8 changes: 1 addition & 7 deletions docs/book/src/installation/host/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,7 @@ Optional dependencies

.. code:: bash
sudo -u cape poetry run pip install https://github.com/CAPESandbox/peepdf/archive/20eda78d7d77fc5b3b652ffc2d8a5b0af796e3dd.zip#egg=peepdf==0.4.2
sudo -u cape poetry run pip install flare-floss
sudo -u cape poetry run pip install git+https://github.com/DissectMalware/batch_deobfuscator
sudo -u cape poetry run pip install git+https://github.com/CAPESandbox/httpreplay
sudo -u cape poetry run pip install networkx graphviz pydot
sudo -u cape poetry run pip install git+https://github.com/DissectMalware/XLMMacroDeobfuscator.git
sudo -u cape poetry run pip install git+https://github.com/CAPESandbox/binGraph
sudo -u cape poetry run pip install -r extras/optional_dependencies.txt
============================
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/installation/upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ PIP3:

PIP3+git:
$ poetry run pip install -U git+<repo_url>
$ poetry run pip install -U git+https://github.com/doomedraven/sflock
$ poetry run pip install -U git+https://github.com/CAPEsandbox/sflock

Troubleshooting:
================
Expand Down
23 changes: 23 additions & 0 deletions extra/optional_dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This is aux requirements file to install all side dependencies
# Run: poetry run pip -r extra/optional_dependencies.txt
ImageHash
deepdiff
flask
flask-restful
flask-sqlalchemy
git+https://github.com/CAPESandbox/binGraph
git+https://github.com/CAPESandbox/httpreplay
git+https://github.com/CAPESandbox/socks5man
git+https://github.com/DissectMalware/XLMMacroDeobfuscator.git
git+https://github.com/DissectMalware/batch_deobfuscator
graphviz>=0.8.4
https://github.com/CAPESandbox/peepdf/archive/20eda78d7d77fc5b3b652ffc2d8a5b0af796e3dd.zip#egg=peepdf==0.4.2
mmh3
networkx[default,extra]>=2.1
olefile
paramiko
pyclamd
pydot>=1.2.4
regex
ruff
scp
6 changes: 3 additions & 3 deletions lib/cuckoo/common/integrations/capa.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from capa.version import __version__ as capa_version

if capa_version[0] != "6":
print("FLARE-CAPA missed, poetry run pip install git+https://github.com/mandiant/capa")
print("FLARE-CAPA missed, poetry install")
else:
import capa.engine
import capa.features
Expand Down Expand Up @@ -78,7 +78,7 @@
except ImportError as e:
HAVE_FLARE_CAPA = False
print(e)
print("FLARE-CAPA missed: poetry run pip install -U flare-capa")
print("FLARE-CAPA missed: poetry install")


# == Render ddictionary helpers
Expand Down Expand Up @@ -259,7 +259,7 @@ def flare_capa_details(file_path: str, category: str = False, on_demand=False, d
except MemoryError:
log.warning("FLARE CAPA -> MemoryError")
except AttributeError:
log.warning("FLARE CAPA -> Use GitHub's version. poetry run pip3 install git+https://github.com/mandiant/capa")
log.warning("FLARE CAPA -> Use GitHub's version. poetry install")
except UnsupportedFormatError:
log.error("FLARE CAPA -> UnsupportedFormatError")
except Exception as e:
Expand Down
19 changes: 16 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ packaging = "23.1"
setuptools = "68.0.0"
# command line config manipulation
crudini = "0.9.4"
python-dateutil = "2.8.2"

# guac-session
pyguacamole = "^0.11"
Expand Down
2 changes: 1 addition & 1 deletion utils/dist.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
try:
import pyzipper
except ImportError:
sys.exti("Missed pyzipper dependency: poetry run pip install pyzipper -U")
sys.exti("Missed pyzipper dependency: poetry install")

CUCKOO_ROOT = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")
sys.path.append(CUCKOO_ROOT)
Expand Down
4 changes: 2 additions & 2 deletions web/analysis/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
try:
from ratelimit.decorators import ratelimit
except ImportError:
print("missed dependency: poetry run pip install django-ratelimit -U")
print("missed dependency: poetry install")

from lib.cuckoo.common.webadmin_utils import disable_user

Expand All @@ -64,7 +64,7 @@

HAVE_PYZIPPER = True
except ImportError:
print("Missed dependency: poetry run pip install pyzipper -U")
print("Missed dependency: poetry install")
HAVE_PYZIPPER = False

TASK_LIMIT = 25
Expand Down

0 comments on commit 872c53d

Please sign in to comment.