working on bugs

templates/generate_evasive_beacons.sh.j2

@@ -3,7 +3,7 @@
 # Every deployment produces completely unique payloads
 
 # Configuration (automatically populated by Ansible)
-HAVOC_DIR="/root/Tools/havoc"
+HAVOC_DIR="/root/Tools/Havoc"
 BEACONS_DIR="/root/Tools/beacons"
 C2_HOST="{{ ansible_host }}"
 REDIRECTOR_HOST="{{ redirector_subdomain }}.{{ domain }}"

templates/generate_havoc_payloads.sh.j2

@@ -2,13 +2,13 @@
 # EDR-evasive payload generator for Havoc C2
 
 # Configuration (automatically populated by Ansible)
-PAYLOADS_DIR="/root/Tools/havoc/payloads"
+PAYLOADS_DIR="/root/Tools/Havoc/payloads"
 C2_HOST="{{ ansible_host }}"
 REDIRECTOR_HOST="{{ redirector_subdomain }}.{{ domain }}"
 REDIRECTOR_PORT="{{ redirector_port | default('443') }}"
 TEAMSERVER_HOST="127.0.0.1"
 TEAMSERVER_PORT="40056"
-HAVOC_DIR="/root/Tools/havoc"
+HAVOC_DIR="/root/Tools/Havoc"
 HAVOC_CLIENT="$HAVOC_DIR/Client/havoc"
 
 # Ensure required directories exist

templates/havoc-config.yaotl.j2

@@ -19,7 +19,8 @@ Operators {
     {% for operator in havoc_operators %}
     user "{{ operator.name }}" {
         Password = "{{ operator.password }}"
-        Secret = "{{ operator.secret | default(lookup('password', '/dev/null chars=hex_lower length=32')) }}"
+        # Secret is not in documentation, removed or comment it out
+        # Secret = "{{ operator.secret | default(lookup('password', '/dev/null chars=hex_lower length=32')) }}"
     }
     {% endfor %}
     {% endif %}
@@ -42,6 +43,9 @@ Listeners {
         HostBind = "0.0.0.0"
         HostRotation = "{{ havoc_host_rotation | default('round-robin') }}"
         PortBind = {{ havoc_http_port | default(8080) }}
+        {% if havoc_portconn is defined %}
+        PortConn = {{ havoc_portconn }}
+        {% endif %}
         {% if havoc_user_agent is defined %}
         UserAgent = "{{ havoc_user_agent }}"
         {% else %}
@@ -128,8 +132,8 @@ Listeners {
         Secure = true
         
         Cert {
-            Cert = "{{ havoc_cert_path | default('/root/Tools/havoc/data/certs/havoc.crt') }}"
-            Key = "{{ havoc_key_path | default('/root/Tools/havoc/data/certs/havoc.key') }}"
+            Cert = "{{ havoc_cert_path | default('/root/Tools/Havoc/data/certs/havoc.crt') }}"
+            Key = "{{ havoc_key_path | default('/root/Tools/Havoc/data/certs/havoc.key') }}"
         }
         
         {% if havoc_proxy_enabled | default(false) %}
@@ -153,6 +157,9 @@ Listeners {
 Demon {
     Sleep = {{ havoc_sleep | default(random_hex[0:2] | int % 5 + 2) }}
     Jitter = {{ havoc_jitter | default(random_hex[2:4] | int % 30 + 20) }}
+    {% if havoc_trust_x_forwarded_for is defined %}
+    TrustXForwardedFor = {{ havoc_trust_x_forwarded_for | lower }}
+    {% endif %}
     
     Injection {
         {% if havoc_spawn64 is defined %}
@@ -167,4 +174,25 @@ Demon {
         Spawn32 = "C:\\Windows\\SysWOW64\\dllhost.exe"
         {% endif %}
     }
-}
+}
+
+{% if havoc_service_enabled | default(false) %}
+Service {
+    Endpoint = "{{ havoc_service_endpoint | default('/api/service') }}"
+    Password = "{{ havoc_service_password | default(lookup('password', '/dev/null chars=ascii_letters,digits length=32')) }}"
+}
+{% endif %}
+
+{% if havoc_webhook_discord_enabled | default(false) %}
+Webhook {
+    Discord {
+        Url = "{{ havoc_webhook_discord_url }}"
+        {% if havoc_webhook_discord_avatar_url is defined %}
+        AvatarUrl = "{{ havoc_webhook_discord_avatar_url }}"
+        {% endif %}
+        {% if havoc_webhook_discord_user is defined %}
+        User = "{{ havoc_webhook_discord_user }}"
+        {% endif %}
+    }
+}
+{% endif %}

templates/havoc-guide.j2

@@ -12,7 +12,7 @@ Teamserver Port: {{ havoc_teamserver_port | default(40056) }}
 HTTP Listener Port: {{ havoc_http_port | default(8080) }}
 HTTPS Listener Port: {{ havoc_https_port | default(443) }}
 Admin User: {{ havoc_admin_user | default('admin') }}
-Admin Password: Stored in /root/Tools/havoc/data/profiles/default.yaotl
+Admin Password: Stored in /root/Tools/Havoc/data/profiles/default.yaotl
 
 CONNECTING TO THE TEAMSERVER
 ---------------------------
@@ -29,7 +29,7 @@ From your local machine:
    - Host: {{ c2_ip }}
    - Port: {{ havoc_teamserver_port | default(40056) }}
    - User: {{ havoc_admin_user | default('admin') }}
-   - Password: See /root/Tools/havoc/data/profiles/default.yaotl
+   - Password: See /root/Tools/Havoc/data/profiles/default.yaotl
 
 3. CLI Connection:
    $ ./havoc client --address {{ c2_ip }}:{{ havoc_teamserver_port | default(40056) }} --username {{ havoc_admin_user | default('admin') }} --password [password]
@@ -44,7 +44,7 @@ To view and manage listeners: Attack → Listeners in the Havoc client.
 
 GENERATING PAYLOADS
 -----------------
-Pre-generated payloads are available in /root/Tools/havoc/payloads/
+Pre-generated payloads are available in /root/Tools/Havoc/payloads/
 
 To generate new payloads:
 1. Connect to the Teamserver
@@ -94,7 +94,7 @@ SERVER MANAGEMENT
 ---------------
 - Havoc Teamserver service: systemctl status havoc
 - Service configuration: /etc/systemd/system/havoc.service
-- Configuration profiles: /root/Tools/havoc/data/profiles/
+- Configuration profiles: /root/Tools/Havoc/data/profiles/
 
 TROUBLESHOOTING
 --------------

templates/motd-aws.j2

@@ -37,7 +37,7 @@ Custom Tools Installed in ~/Tools:
 Other Installed C2 Frameworks:
 ------------------------------
 - Metasploit Framework: system installed (run 'msfconsole')
-- Havoc C2: installed in /root/Tools/havoc
+- Havoc C2: installed in /root/Tools/Havoc
 
 Security Scripts in /root/Tools/:
 -----------------------------

templates/motd-linode.j2

@@ -29,7 +29,7 @@ Custom Tools Installed in ~/Tools:
 Other Installed C2 Frameworks:
 ------------------------------
 - Metasploit Framework: system installed (run 'msfconsole')
-- Havoc C2: installed in /root/Tools/havoc
+- Havoc C2: installed in /root/Tools/Havoc
 
 Also, remember that many reconnaissance and attack tools are now available system-wide due to the apt and pipx installations.
 

templates/motd.j2

@@ -29,7 +29,7 @@ Custom Tools Installed in ~/Tools:
 Other Installed C2 Frameworks:
 ------------------------------
 - Metasploit Framework: system installed (run 'msfconsole')
-- Havoc C2: installed in /root/Tools/havoc
+- Havoc C2: installed in /root/Tools/Havoc
 
 Also, remember that many reconnaissance and attack tools are now available system-wide due to the apt and pipx installations.
 

templates/serve-havoc-payloads.sh.j2

@@ -2,7 +2,7 @@
 # Script to serve Havoc C2 payloads generated by generate_havoc_payloads.sh
 
 # Configuration
-PAYLOADS_DIR="/root/Tools/havoc/payloads"
+PAYLOADS_DIR="/root/Tools/Havoc/payloads"
 C2_HOST="{{ ansible_host }}"
 LISTEN_PORT=8443