diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1796d1e3..97017beb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
- MS08-067 (Conficker) exploiter. #1677
- Agent bootloader. #1676
- Zero Trust integration with ScoutSuite. #1669
+- ShellShock exploiter. #1733
### Fixed
- A bug in network map page that caused delay of telemetry log loading. #1545
diff --git a/README.md b/README.md
index 6100219df..7342c49a7 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ The Infection Monkey uses the following techniques and exploits to propagate to
* SSH
* SMB
* WMI
- * Shellshock
+ * Log4Shell
* Elastic Search (CVE-2015-1427)
* Weblogic server
* and more, see our [Documentation hub](https://www.guardicore.com/infectionmonkey/docs/reference/exploiters/) for more information about our RCE exploiters.
diff --git a/docs/content/development/_index.md b/docs/content/development/_index.md
index 37a5978e7..85b15adcb 100644
--- a/docs/content/development/_index.md
+++ b/docs/content/development/_index.md
@@ -26,7 +26,7 @@ You can take a look at [our roadmap](https://github.com/guardicore/monkey/projec
The best way to find weak spots in a network is by attacking it. The [*Adding Exploits*](./adding-exploits/) page will help you add exploits.
-It's important to note that the Infection Monkey must be absolutely reliable. Otherwise, no one will use it, so avoid memory corruption exploits unless they're rock solid and focus on the logical vulns such as Shellshock.
+It's important to note that the Infection Monkey must be absolutely reliable. Otherwise, no one will use it, so avoid memory corruption exploits unless they're rock solid and focus on the logical vulns such as Hadoop.
### Analysis plugins 🔬
diff --git a/docs/content/reference/exploiters/shellshock.md b/docs/content/reference/exploiters/shellshock.md
deleted file mode 100644
index 20aee282f..000000000
--- a/docs/content/reference/exploiters/shellshock.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: "ShellShock"
-date: 2020-07-14T08:41:32+03:00
-draft: false
-tags: ["exploit", "linux"]
----
-### Description
-
-This exploit, CVE-2014-6271, is based on the [logic in NCC group's GitHub](https://github.com/nccgroup/shocker/blob/master/shocker.py).
-
-> In GNU Bash (through 4.3), processes trailing strings after function definitions in the values of environment variables allow remote attackers to execute arbitrary code via a crafted environment. This is demonstrated by vectors involving the ForceCommand feature in OpenSSH sshd, the mod_cgi and mod_cgid modules in the Apache HTTP Server, scripts executed by unspecified DHCP clients and other situations in which setting the environment occurs across a privilege boundary from Bash execution, AKA "ShellShock."
diff --git a/envs/monkey_zoo/blackbox/config_templates/performance.py b/envs/monkey_zoo/blackbox/config_templates/performance.py
index eafa82d28..6108664a7 100644
--- a/envs/monkey_zoo/blackbox/config_templates/performance.py
+++ b/envs/monkey_zoo/blackbox/config_templates/performance.py
@@ -16,7 +16,6 @@ class Performance(ConfigTemplate):
"SmbExploiter",
"WmiExploiter",
"SSHExploiter",
- "ShellShockExploiter",
"ElasticGroovyExploiter",
"Struts2Exploiter",
"WebLogicExploiter",
diff --git a/envs/monkey_zoo/blackbox/config_templates/shellshock.py b/envs/monkey_zoo/blackbox/config_templates/shellshock.py
deleted file mode 100644
index b3620e5b9..000000000
--- a/envs/monkey_zoo/blackbox/config_templates/shellshock.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from copy import copy
-
-from envs.monkey_zoo.blackbox.config_templates.base_template import BaseTemplate
-from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemplate
-
-
-class ShellShock(ConfigTemplate):
- config_values = copy(BaseTemplate.config_values)
-
- config_values.update(
- {
- "basic.exploiters.exploiter_classes": ["ShellShockExploiter"],
- "basic_network.scope.subnet_scan_list": ["10.2.2.8"],
- "internal.network.tcp_scanner.HTTP_PORTS": [80, 8080],
- "internal.network.tcp_scanner.tcp_target_ports": [],
- }
- )
diff --git a/envs/monkey_zoo/blackbox/gcp_test_machine_list.py b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py
index a4dc02447..eadbd6213 100644
--- a/envs/monkey_zoo/blackbox/gcp_test_machine_list.py
+++ b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py
@@ -17,7 +17,6 @@ GCP_TEST_MACHINE_LIST = {
"tunneling-12",
"weblogic-18",
"weblogic-19",
- "shellshock-8",
"zerologon-25",
"drupal-28",
],
diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index e6e64d3cc..2db234ed2 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -20,7 +20,6 @@ from envs.monkey_zoo.blackbox.config_templates.powershell import PowerShell
from envs.monkey_zoo.blackbox.config_templates.powershell_credentials_reuse import (
PowerShellCredentialsReuse,
)
-from envs.monkey_zoo.blackbox.config_templates.shellshock import ShellShock
from envs.monkey_zoo.blackbox.config_templates.smb_mimikatz import SmbMimikatz
from envs.monkey_zoo.blackbox.config_templates.smb_pth import SmbPth
from envs.monkey_zoo.blackbox.config_templates.ssh import Ssh
@@ -200,9 +199,6 @@ class TestMonkeyBlackbox:
def test_weblogic_exploiter(self, island_client):
TestMonkeyBlackbox.run_exploitation_test(island_client, Weblogic, "Weblogic_exploiter")
- def test_shellshock_exploiter(self, island_client):
- TestMonkeyBlackbox.run_exploitation_test(island_client, ShellShock, "Shellshock_exploiter")
-
def test_log4j_solr_exploiter(self, island_client):
TestMonkeyBlackbox.run_exploitation_test(
island_client, Log4jSolr, "Log4Shell_Solr_exploiter"
diff --git a/envs/monkey_zoo/blackbox/utils/config_generation_script.py b/envs/monkey_zoo/blackbox/utils/config_generation_script.py
index 305d71658..3f787870d 100644
--- a/envs/monkey_zoo/blackbox/utils/config_generation_script.py
+++ b/envs/monkey_zoo/blackbox/utils/config_generation_script.py
@@ -12,7 +12,6 @@ from envs.monkey_zoo.blackbox.config_templates.log4j_tomcat import Log4jTomcat
from envs.monkey_zoo.blackbox.config_templates.mssql import Mssql
from envs.monkey_zoo.blackbox.config_templates.performance import Performance
from envs.monkey_zoo.blackbox.config_templates.powershell import PowerShell
-from envs.monkey_zoo.blackbox.config_templates.shellshock import ShellShock
from envs.monkey_zoo.blackbox.config_templates.smb_mimikatz import SmbMimikatz
from envs.monkey_zoo.blackbox.config_templates.smb_pth import SmbPth
from envs.monkey_zoo.blackbox.config_templates.ssh import Ssh
@@ -45,7 +44,6 @@ CONFIG_TEMPLATES = [
Mssql,
Performance,
PowerShell,
- ShellShock,
SmbMimikatz,
SmbPth,
Ssh,
diff --git a/envs/monkey_zoo/docs/fullDocs.md b/envs/monkey_zoo/docs/fullDocs.md
index 682e82fcf..0381eae34 100644
--- a/envs/monkey_zoo/docs/fullDocs.md
+++ b/envs/monkey_zoo/docs/fullDocs.md
@@ -11,7 +11,6 @@ This document describes Infection Monkey’s test network, how to deploy and use
[Nr. 3 Hadoop](#_Toc526517183)
[Nr. 4 Elastic](#_Toc526517184)
[Nr. 5 Elastic](#_Toc526517185)
-[Nr. 8 Shellshock](#_Toc536021461)
[Nr. 9 Tunneling M1](#_Toc536021462)
[Nr. 10 Tunneling M2](#_Toc536021463)
[Nr. 11 SSH key steal](#_Toc526517190)
@@ -326,38 +325,6 @@ Update all requirements using deployment script:
-
Nr. 8 Shellshock -(10.2.2.8) |
-(Vulnerable) | -
---|---|
OS: | -Ubuntu 12.04 LTS x64 | -
Software: | -Apache2, bash 4.2. | -
Default server’s port: | -80 | -
Scan results: | -Machine exploited using Shellshock exploiter | -
Notes: | -Vulnerable app is under /cgi-bin/test.cgi | -