Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New internal module "unarchive" #1918

Merged
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
57622c2
Added an internal module to always extract different file types
domwhewell-sage Nov 4, 2024
2665bd9
Fix some tests
domwhewell-sage Nov 6, 2024
f9777a7
Merge branch 'dev' into extract_internal_module
domwhewell-sage Nov 6, 2024
f329ecb
Add `extra_opts` to ansible unarchive
domwhewell-sage Nov 6, 2024
95b4cbb
Ugh have to include the libs
domwhewell-sage Nov 6, 2024
363cd6d
Merge branch 'dev' into extract_internal_module
domwhewell-sage Nov 12, 2024
f72315f
Add a map of the different compression types, comment them until a te…
domwhewell-sage Nov 12, 2024
d679d0c
Merge branch 'dev' into extract_internal_module
domwhewell-sage Nov 21, 2024
9536b57
Added more compression formats to extract
domwhewell-sage Nov 21, 2024
3a68fbc
Add imports
domwhewell-sage Nov 21, 2024
d935444
Change to use OS commands
domwhewell-sage Dec 2, 2024
6c6a511
Made changes to the tests
domwhewell-sage Dec 8, 2024
b71841a
Remove jadx compatable types from compression map
domwhewell-sage Dec 8, 2024
bf8a1b3
Merge branch 'dev' into extract_internal_module
domwhewell-sage Dec 8, 2024
7db38fd
Rename to unarchive, move jar exclusions into module and restore helper
domwhewell-sage Dec 15, 2024
892663d
Change lzma to 7zip
domwhewell-sage Dec 19, 2024
9238d66
Merge branch 'dev' into extract_internal_module
domwhewell-sage Dec 20, 2024
3dfe07b
Remove apt_deps
domwhewell-sage Dec 20, 2024
12c68fb
Move file creation to setup_after_prep
domwhewell-sage Dec 20, 2024
0aa69b2
Swap unarchive and speculate
domwhewell-sage Dec 20, 2024
4e22bb2
Add rar to the `CORE_DEPS`
domwhewell-sage Dec 20, 2024
a4a3712
Remove rar install and move it to /test
domwhewell-sage Jan 1, 2025
7f3f222
include the test.rar file in the python test
domwhewell-sage Jan 6, 2025
5589a02
Dont create the directory without checking the compression type first
domwhewell-sage Jan 11, 2025
9a78768
List out the files in the rar folder to see why ubuntu is failing in …
domwhewell-sage Jan 11, 2025
3340882
List the parent folder
domwhewell-sage Jan 11, 2025
a50a775
Dont accept files that are not compressed
domwhewell-sage Jan 11, 2025
849924b
We dont want trufflehog re-scanning folders it has already done
domwhewell-sage Jan 11, 2025
fe4f456
Merge branch 'dev' into extract_internal_module
domwhewell-sage Jan 12, 2025
b58288b
Remove failing line
domwhewell-sage Jan 12, 2025
91b71f5
Try with an older rar file created on ubuntu:22.04
domwhewell-sage Jan 12, 2025
2548289
Use 7z instead to extract the rar file instead as ubuntu:22.04 has a …
domwhewell-sage Jan 12, 2025
bad3a44
Adding 7zip plugins for fedora as without it uses 7za
domwhewell-sage Jan 13, 2025
b21ab37
Add p7zip-plugins on fedora
domwhewell-sage Jan 13, 2025
7bfb7b0
How did you fix the bug? I commented the code... !?
domwhewell-sage Jan 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bbot/test/test_step_1/test_cli.py
Original file line number Diff line number Diff line change
@@ -342,7 +342,7 @@ async def test_cli_args(monkeypatch, caplog, capsys, clean_default_config):
monkeypatch.setattr("sys.argv", ["bbot", "-y"])
result = await cli._main()
assert result is True
assert "Loaded 6/6 internal modules (aggregate,cloudcheck,dnsresolve,excavate,unarchive,speculate)" in caplog.text
assert "Loaded 6/6 internal modules (aggregate,cloudcheck,dnsresolve,excavate,speculate,unarchive)" in caplog.text
caplog.clear()
monkeypatch.setattr("sys.argv", ["bbot", "-em", "excavate", "speculate", "-y"])
result = await cli._main()