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.

Sign up for GitHub

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

Jump to bottom

Remove temp fix (pycryptodome) #309

Merged
merged 5 commits into from
Feb 22, 2024
Merged

Remove temp fix (pycryptodome) #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b32a16
Remove fix temp
QU35T-code Feb 21, 2024
e493bfc
Remove all pycryptodome injection
QU35T-code Feb 22, 2024
c1b6b7c
Update following review
QU35T-code Feb 22, 2024
f4f259f
Resolve shellcheck
QU35T-code Feb 22, 2024
e7915e5
Fix syntax
QU35T-code Feb 22, 2024
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
18 changes: 2 additions & 16 deletions sources/install/package_ad.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function install_responder() {
source ./venv/bin/activate
pip3 install -r requirements.txt
# following requirements needed by MultiRelay.py
pip3 install pycryptodome pycryptodomex six
pip3 install pycryptodomex six
deactivate
sed -i 's/ Random/ 1122334455667788/g' /opt/tools/Responder/Responder.conf
sed -i 's/files\/AccessDenied.html/\/opt\/tools\/Responder\/files\/AccessDenied.html/g' /opt/tools/Responder/Responder.conf
Expand Down Expand Up @@ -256,12 +256,6 @@ function install_impacket() {
colorecho "Installing Impacket scripts"
pipx install git+https://github.com/ThePorgs/impacket
pipx inject impacket chardet
local temp_fix_limit="2024-03-20"
if [[ "$(date +%Y%m%d)" -gt "$(date -d $temp_fix_limit +%Y%m%d)" ]]; then
criticalecho "Temp fix expired. Exiting."
else
pipx inject impacket pycryptodome
fi
cp -v /root/sources/assets/grc/conf.ntlmrelayx /usr/share/grc/conf.ntlmrelayx
cp -v /root/sources/assets/grc/conf.secretsdump /usr/share/grc/conf.secretsdump
cp -v /root/sources/assets/grc/conf.getgpppassword /usr/share/grc/conf.getgpppassword
Expand Down Expand Up @@ -415,7 +409,7 @@ function install_krbrelayx() {
cd /opt/tools/krbrelayx || exit
python3 -m venv ./venv
source ./venv/bin/activate
pip3 install dnspython ldap3 impacket dsinternals pycryptodome
pip3 install dnspython ldap3 impacket dsinternals
deactivate
cp -v /root/sources/assets/grc/conf.krbrelayx /usr/share/grc/conf.krbrelayx
add-aliases krbrelayx
Expand Down Expand Up @@ -668,7 +662,6 @@ function install_adidnsdump() {
# CODE-CHECK-WHITELIST=add-aliases
colorecho "Installing adidnsdump"
pipx install git+https://github.com/dirkjanm/adidnsdump
pipx inject adidnsdump pycryptodome
add-history adidnsdump
add-test-command "adidnsdump --help"
add-to-list "adidnsdump,https://github.com/dirkjanm/adidnsdump,Active Directory Integrated DNS dump utility"
Expand Down Expand Up @@ -924,13 +917,6 @@ function install_gmsadumper() {
python3 -m venv ./venv
source ./venv/bin/activate
pip3 install -r requirements.txt
# https://github.com/micahvandeusen/gMSADumper/issues/12
local temp_fix_limit="2024-03-20"
if [[ "$(date +%Y%m%d)" -gt "$(date -d $temp_fix_limit +%Y%m%d)" ]]; then
criticalecho "Temp fix expired. Exiting."
else
pip3 install pycryptodome
fi
deactivate
add-aliases gmsadumper
add-history gmsadumper
Expand Down
3 changes: 2 additions & 1 deletion sources/install/package_forensic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ function install_volatility3() {
git -C /opt/tools/ clone --depth 1 https://github.com/volatilityfoundation/volatility3
pipx install /opt/tools/volatility3
# volatility's setup.py installs requirements from requirements-minimal.txt. Some reqs from requirements.txt are missing, injecting now
pipx inject volatility3 yara-python capstone pycryptodome
# pipx doesn't support injection of a requirements file : https://github.com/pypa/pipx/issues/934
sed -e 's/#.*//' /opt/tools/volatility3/requirements.txt | xargs pipx inject volatility3
add-aliases volatility3
add-history volatility3
add-test-command "volatility3 --help"
Expand Down
Loading