p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,965 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

4965 Commits

Author SHA1 Message Date
Mike Salvatore c6fd04e2b6
Merge pull request #1054 from shreyamalviya/bugfix_pba_file_delete 
Fix error when removing uploaded post breach file on config reset
 2021-04-26 09:06:49 -04:00
Shreya 9b38303346 Rearrange functions' order in `monkey_island/cc/resources/pba_file_upload.py` to follow stepdown rule 2021-04-26 16:07:53 +05:30
Shreya 4f94e9de74 Break PBA file deletion into functions: attempt to delete PBA file in another function 2021-04-24 13:18:00 +05:30
Shreya 4854c9cfc9 Attempt to remove custom PBA file when resetting config only if filename exists in DB 2021-04-24 13:18:00 +05:30
Mike Salvatore df67ba554e agent: Add pyinstaller-hooks-contrib and importlib-metadata to Pipfile 
Pipenv fails to install these dependencies in the
cdrx/pyinstaller:python3 container when pyinstaller is installed from
our fork. Adding them to the Pipfile ensures they get installed and
resolves the issue.
 2021-04-23 11:20:13 -04:00
VakarisZ fd8ef7f39e Refactored test_telems to exported_telems and moved them from the test folder, because they are generated in production 2021-04-23 08:39:19 -04:00
VakarisZ 8121f08aa9 Refactored test_telems to exported_telems and moved them from the test folder, because they are generated in production 2021-04-23 11:12:14 +03:00
VakarisZ c3f31c0c78 pre-commit hooks update 2021-04-23 10:48:11 +03:00
Mike Salvatore 3b32ef2f4a Remove PostgreSQL fingerprinter 
Issue #1077
 2021-04-22 10:33:06 -04:00
Mike Salvatore 6a54c1e85a agent: Add sys_platform == win32 to Pipfile 2021-04-22 09:50:30 -04:00
Mike Salvatore 6412391ff8 docs: Add pipenv instructions to manual monkey setup guide for Windows 2021-04-22 09:50:30 -04:00
Mike Salvatore 57d6552433 docs: Add pipenv instructions to manual monkey setup guide for Linux 2021-04-22 09:50:30 -04:00
Mike Salvatore 6e2f473f02 Removing unused docker build scripts 2021-04-22 09:50:30 -04:00
VakarisZ 0120c027b0 Fixed run server bat script 2021-04-22 09:50:30 -04:00
Mike Salvatore 20a575ecb7 Add note about $PATH in deployment_scripts/README.md 2021-04-22 09:50:30 -04:00
Mike Salvatore 051621bdfa Modify monkey_island/linux/run.sh to use pipenv 2021-04-22 09:50:30 -04:00
Mike Salvatore de8e306786 Install python3.7-venv in deploy_linux.sh 
pipx requires ensurepip, which is provided by python3.7-venv
 2021-04-22 09:50:30 -04:00
Mike Salvatore 7a1588152d zoo: remove requirements.txt 2021-04-22 09:50:30 -04:00
Mike Salvatore 98c9b2a907 appimage: Use pipenv to install python dependencies 2021-04-22 09:50:30 -04:00
Mike Salvatore 6d0dcd4a7a appimage: Add clean.sh script 2021-04-22 09:50:29 -04:00
VakarisZ c9b3d3a92d Fixed pipenv bugs for linux deployment scripts 2021-04-22 09:50:29 -04:00
VakarisZ c2024d06f6 Fixed requirements to use cryptography 2.5, so that linux builds of agents on ubuntu12 could install requirements 2021-04-22 09:50:29 -04:00
VakarisZ ffb761ef4b Updated monkey pipfile and pipfile.lock in attempt to fix brokend jenkins build 2021-04-22 09:50:29 -04:00
VakarisZ 47f1bd31cc Converted deployment scripts to use pipenv instead of pip 2021-04-22 09:50:29 -04:00
VakarisZ c00754a3a4 Moved dev requirements of black, coverage, flake and others to dev dependencies of the island to be a single source of truth 2021-04-22 09:50:29 -04:00
VakarisZ e4415d822a Fixed requirement installation in travis to install from lock files, so that travis would ideally replicate our development 2021-04-22 09:50:29 -04:00
VakarisZ 00e9940a0b Using pymssql v2.2.0 or later results in the following error message: 
ImportError: /tmp/_MEISNYzdG/pymssql/_pymssql.cpython-37m-x86_64-linux-gnu.so: ELF load command address/offset not properly aligned
 2021-04-22 09:50:29 -04:00
VakarisZ e7cef5fd9f Updated travis to use pipenv 2021-04-22 09:50:29 -04:00
VakarisZ 7f928fa90d Migrated from monkey agents requirements.txt to pipenv requirements 2021-04-22 09:50:29 -04:00
VakarisZ eca26b596b Fixed island requirements frozen in PipFile to better correlate with already deleted requirements.txt 2021-04-22 09:50:29 -04:00
VakarisZ 465023b64d Removed cryptography dependency from infection monkey agent dependencies and added eggs to git dependencies 2021-04-22 09:50:29 -04:00
VakarisZ 33de5aac60 Converted island requirement.txt file to pipenv files 2021-04-22 09:50:29 -04:00
VakarisZ 0f5cda52c2
Merge pull request #1113 from guardicore/import-fix 
Fixed a broken import in mitigation.py
 2021-04-22 11:44:14 +03:00
VakarisZ 26e10e9ed2 Fixed a broken import in mitigation.py 2021-04-22 11:33:14 +03:00
VakarisZ ffec6f6e8a
Merge pull request #1112 from guardicore/import-fix 
Import fix
 2021-04-22 11:24:17 +03:00
VakarisZ 2480dc8cdb Fixed a broken import in attack_mitigations.py 2021-04-22 11:13:18 +03:00
Mike Salvatore 297c702427 Merge branch 'unit-tests' into develop 2021-04-21 08:11:02 -04:00
Mike Salvatore 7c452d0c6f tests: Remove debug print statement in conftest.py 2021-04-21 08:03:01 -04:00
Mike Salvatore a42e6312b1 tests: Remove unnecessary server configs 2021-04-21 08:00:24 -04:00
Mike Salvatore e3a0105b04 Set default_stages to commit only 2021-04-20 12:16:13 -04:00
Mike Salvatore 4b02e3bc63 docs: Add pre-push hooks to manual pre-commit install instructions 2021-04-20 12:13:00 -04:00
Mike Salvatore 6571e0e4fa Install pre-push hooks in deployment scripts 2021-04-20 12:11:46 -04:00
Mike Salvatore 753c0586c1 cc: Move config files and other testing resources to tests/ dir 2021-04-20 11:27:30 -04:00
shreyamalviya 88a3ab5bf1 Modify pre-commit-config.yaml to make pytest run only pre-push 
(Run `pre-commit install --hook-type pre-push`)
 2021-04-20 18:49:40 +05:30
Mike Salvatore 83e93928e7 Only run pytest pre-commit hook when files in monkey/ are modified 2021-04-19 14:59:03 -04:00
Mike Salvatore 3f66e95a90 Use addopts instead of testpaths to specify path in pytest config 
The pytest documentation states that the testpaths configuration option
"Sets list of directories that should be searched ... when executing
pytest from the rootdir directory." Since pytest is not executed from
the rootdir directory, testpaths has no effect. Appending the "tests/"
directory to the end of addopts reduces the time required to run the
test suite by approximately 6 seconds.
 2021-04-19 14:39:39 -04:00
Shreya c37ae1e0ea Modify pytest configuration 
Shift it from monkey/pytest.ini to pyproject.toml.
Add conftest.py in tests/ to add monkey directory to sys.path so test files recognize paths.
 2021-04-19 17:36:09 +05:30
Shreya dc0e155c31 Add pytest to pre-commit 2021-04-19 17:28:40 +05:30
Shreya 4680193375 Put unit test files in the right directories 
Some test files were in their own "tests/" directory. Deleted the extra "tests/" directories.
 2021-04-19 13:54:48 +05:30
Shreya a2115e4254 Fix imports for unit test files 2021-04-19 13:54:48 +05:30