Initial public portfolio release

Sanitized version of red team infrastructure automation platform. Operational content (implant pipelines, lures, credential capture) replaced with documented stubs. Architecture and infrastructure automation code intact.
2026-06-23 16:12:14 -04:00
commit 0799bfbae8
239 changed files with 40012 additions and 0 deletions
@@ -0,0 +1,143 @@
+#!/bin/bash
+
+# Default configurations
+DEFAULT_IMAGE_FILTER="*kali-last-snapshot*"
+DEFAULT_OWNER_ID="679593333241"
+DEFAULT_REGION="us-east-1"
+
+# Debugging flag
+DEBUG=false
+
+# Usage function
+function usage() {
+    echo "Usage: $0 [--image-filter <filter>] [--owner-id <owner-id>] [--debug] [--help]"
+    echo ""
+    echo "Options:"
+    echo "  --image-filter <filter>  Filter for AMI names (default: '${DEFAULT_IMAGE_FILTER}')."
+    echo "  --owner-id <owner-id>    Owner ID for filtering AMIs (default: '${DEFAULT_OWNER_ID}')."
+    echo "  --debug                  Enable verbose debugging."
+    echo "  --help                   Display this help message."
+    exit 1
+}
+
+# Parse arguments
+IMAGE_FILTER="$DEFAULT_IMAGE_FILTER"
+OWNER_ID="$DEFAULT_OWNER_ID"
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --image-filter)
+            IMAGE_FILTER="$2"
+            shift 2
+            ;;
+        --owner-id)
+            OWNER_ID="$2"
+            shift 2
+            ;;
+        --debug)
+            DEBUG=true
+            shift
+            ;;
+        --help)
+            usage
+            ;;
+        *)
+            echo "Unknown option: $1"
+            usage
+            ;;
+    esac
+done
+
+if $DEBUG; then
+    echo "DEBUG: Using image filter: $IMAGE_FILTER"
+    echo "DEBUG: Using owner ID: $OWNER_ID"
+fi
+
+# Step 1: Fetch all AMIs in the default region to identify the latest version
+LATEST_AMI=""
+LATEST_YEAR=0
+LATEST_VERSION=0
+
+AMI_LIST=$(aws ec2 describe-images \
+    --region "$DEFAULT_REGION" \
+    --filters "Name=name,Values=$IMAGE_FILTER" "Name=owner-id,Values=$OWNER_ID" \
+    --query "Images[].[Name]" \
+    --output text)
+
+if $DEBUG; then
+    echo "DEBUG: AMI list in $DEFAULT_REGION: $AMI_LIST"
+fi
+
+for AMI_NAME in $AMI_LIST; do
+    if [[ $AMI_NAME != *"-prod-"* ]]; then
+        # Extract year and version using regex
+        if [[ $AMI_NAME =~ ([0-9]{4})\.([0-9]+)\.([0-9]+) ]]; then
+            YEAR=${BASH_REMATCH[1]}
+            VERSION=${BASH_REMATCH[2]}
+
+            if $DEBUG; then
+                echo "DEBUG: Checking AMI: $AMI_NAME (Year: $YEAR, Version: $VERSION)"
+            fi
+
+            if (( YEAR > LATEST_YEAR )) || (( YEAR == LATEST_YEAR && VERSION > LATEST_VERSION )); then
+                LATEST_AMI="$AMI_NAME"
+                LATEST_YEAR=$YEAR
+                LATEST_VERSION=$VERSION
+            fi
+        fi
+    fi
+done
+
+if $DEBUG; then
+    echo "DEBUG: Latest AMI determined: $LATEST_AMI"
+fi
+
+# Step 2: Use the latest AMI name to filter across all regions
+if [[ -z "$LATEST_AMI" ]]; then
+    echo "No valid AMIs found matching the criteria."
+    exit 1
+fi
+
+IMAGE_FILTER_LATEST="${LATEST_AMI%-*}*" # Strip the region-specific suffix and add a wildcard
+
+if $DEBUG; then
+    echo "DEBUG: Using refined image filter: $IMAGE_FILTER_LATEST"
+fi
+
+# Step 3: Fetch AMIs across all regions
+REGIONS=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
+
+echo "Fetching AMIs with filter '$IMAGE_FILTER_LATEST' and owner ID '$OWNER_ID'..."
+
+AMI_MAP=""
+REGION_LIST=()
+
+for REGION in $REGIONS; do
+    if $DEBUG; then
+        echo "DEBUG: Querying region: $REGION"
+    fi
+
+    AMI_INFO=$(aws ec2 describe-images \
+        --region "$REGION" \
+        --filters "Name=name,Values=$IMAGE_FILTER_LATEST" "Name=owner-id,Values=$OWNER_ID" \
+        --query "Images[].[Name,ImageId]" \
+        --output text)
+
+    if [[ -n "$AMI_INFO" ]]; then
+        while read -r NAME AMI_ID; do
+            echo "$NAME"
+            echo "  $REGION: $AMI_ID"
+            REGION_LIST+=("$REGION")
+            AMI_MAP+="$REGION: $AMI_ID"$'\n'
+        done <<< "$AMI_INFO"
+    fi
+done
+
+# Step 4: Generate YAML
+YAML_OUTPUT="aws_region_choices:\n"
+for REGION in "${REGION_LIST[@]}"; do
+    YAML_OUTPUT+="  - $REGION\n"
+done
+YAML_OUTPUT+="ami_map:\n$AMI_MAP"
+
+echo -e "\nGenerated YAML:\n$YAML_OUTPUT"
@@ -0,0 +1,171 @@
+---
+# AWS Attack Box Deployment Playbook
+# Based on attk-box-setup but optimized for AWS deployment
+
+- name: Deploy Attack Box on AWS
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  vars_files:
+    - vars.yaml
+  vars:
+    ansible_python_interpreter: "{{ ansible_playbook_python }}"
+    deployment_type: "attack_box"
+    attack_box_name: "{{ attack_box_name | default('a-' + deployment_id) }}"
+    attack_box_type: "{{ attack_box_type | default('kali') }}"
+    aws_region: "{{ aws_region | default(aws_region_choices | random) }}"
+    instance_type: "{{ aws_instance_type | default('t2.medium') }}"
+    ssh_key_name: "attack-box-{{ deployment_id }}"
+    
+    # Attack box AMI mapping (use Kali Linux AMIs)
+    attack_box_ami_map:
+      us-east-1: "{{ kali_ami_map['us-east-1'] | default('ami-061b17d332829ab1c') }}"
+      us-east-2: "{{ kali_ami_map['us-east-2'] | default('ami-061b17d332829ab1c') }}"
+      us-west-1: "{{ kali_ami_map['us-west-1'] | default('ami-061b17d332829ab1c') }}"
+      us-west-2: "{{ kali_ami_map['us-west-2'] | default('ami-061b17d332829ab1c') }}"
+    
+  tasks:
+    - name: Validate AWS credentials
+      assert:
+        that:
+          - aws_access_key is defined and aws_access_key != ""
+          - aws_secret_key is defined and aws_secret_key != ""
+        fail_msg: "AWS credentials are required"
+
+    - name: Debug attack box deployment
+      debug:
+        msg: "Deploying {{ attack_box_type }} attack box on AWS in {{ aws_region }}"
+
+    - name: Set attack box AMI
+      set_fact:
+        attack_box_ami: "{{ attack_box_ami_map[aws_region] | default(attack_box_ami_map['us-east-1']) }}"
+
+    - name: Generate SSH key pair for attack box
+      ec2_key:
+        name: "{{ ssh_key_name }}"
+        region: "{{ aws_region }}"
+        aws_access_key: "{{ aws_access_key }}"
+        aws_secret_key: "{{ aws_secret_key }}"
+        state: present
+      register: ec2_key_result
+
+    - name: Save private key locally
+      copy:
+        content: "{{ ec2_key_result.key.private_key }}"
+        dest: "~/.ssh/{{ ssh_key_name }}"
+        mode: '0600'
+      when: ec2_key_result.key.private_key is defined
+
+    - name: Create security group for attack box
+      ec2_group:
+        name: "attack-box-sg-{{ deployment_id }}"
+        description: "Security group for attack box {{ deployment_id }}"
+        region: "{{ aws_region }}"
+        aws_access_key: "{{ aws_access_key }}"
+        aws_secret_key: "{{ aws_secret_key }}"
+        rules:
+          - proto: tcp
+            ports:
+              - 22
+            cidr_ip: "{{ operator_ip | default('0.0.0.0/0') }}/32"
+            rule_desc: "SSH access from operator IP"
+          - proto: tcp
+            ports:
+              - 80
+              - 443
+            cidr_ip: 0.0.0.0/0
+            rule_desc: "HTTP/HTTPS for tools"
+        rules_egress:
+          - proto: all
+            cidr_ip: 0.0.0.0/0
+        tags:
+          Name: "attack-box-sg-{{ deployment_id }}"
+          DeploymentID: "{{ deployment_id }}"
+          Type: "attack-box"
+      register: security_group
+
+    - name: Launch attack box EC2 instance
+      ec2:
+        key_name: "{{ ssh_key_name }}"
+        group: "{{ security_group.group_name }}"
+        instance_type: "{{ instance_type }}"
+        image: "{{ attack_box_ami }}"
+        region: "{{ aws_region }}"
+        aws_access_key: "{{ aws_access_key }}"
+        aws_secret_key: "{{ aws_secret_key }}"
+        wait: true
+        count: 1
+        instance_tags:
+          Name: "{{ attack_box_name }}"
+          DeploymentID: "{{ deployment_id }}"
+          Type: "attack-box"
+          Environment: "{{ attack_box_type }}"
+        user_data: |
+          #!/bin/bash
+          # Update system
+          apt-get update
+          apt-get upgrade -y
+          
+          # Install additional tools if needed
+          {% if attack_box_type == 'kali' %}
+          # Kali already has most tools
+          apt-get install -y nmap curl wget git
+          {% else %}
+          # Install basic pentest tools for other distros
+          apt-get install -y nmap curl wget git python3-pip
+          {% endif %}
+          
+          # Set hostname
+          echo "{{ attack_box_name }}" > /etc/hostname
+          hostname "{{ attack_box_name }}"
+          
+          # Create deployment info
+          mkdir -p /root/deployment-info
+          cat > /root/deployment-info/info.txt << EOF
+          Deployment ID: {{ deployment_id }}
+          Attack Box Name: {{ attack_box_name }}
+          Attack Box Type: {{ attack_box_type }}
+          Region: {{ aws_region }}
+          Instance Type: {{ instance_type }}
+          SSH Key: {{ ssh_key_name }}
+          EOF
+          
+      register: ec2_result
+
+    - name: Wait for SSH to be available
+      wait_for:
+        host: "{{ ec2_result.instances[0].public_ip }}"
+        port: 22
+        delay: 60
+        timeout: 300
+      
+    - name: Display attack box information
+      debug:
+        msg:
+          - "Attack box deployed successfully!"
+          - "Instance ID: {{ ec2_result.instances[0].id }}"
+          - "Public IP: {{ ec2_result.instances[0].public_ip }}"
+          - "Private IP: {{ ec2_result.instances[0].private_ip }}"
+          - "SSH Command: ssh -i ~/.ssh/{{ ssh_key_name }} root@{{ ec2_result.instances[0].public_ip }}"
+
+    - name: Save deployment information
+      copy:
+        content: |
+          # Attack Box Deployment Information
+          Instance ID: {{ ec2_result.instances[0].id }}
+          Public IP: {{ ec2_result.instances[0].public_ip }}
+          Private IP: {{ ec2_result.instances[0].private_ip }}
+          SSH Key: ~/.ssh/{{ ssh_key_name }}
+          SSH Command: ssh -i ~/.ssh/{{ ssh_key_name }} root@{{ ec2_result.instances[0].public_ip }}
+          Region: {{ aws_region }}
+          Instance Type: {{ instance_type }}
+          AMI: {{ attack_box_ami }}
+          Security Group: {{ security_group.group_name }}
+        dest: "logs/attack_box_{{ deployment_id }}_info.txt"
+
+    - name: Set attack box facts for other playbooks
+      set_fact:
+        attack_box_instance_id: "{{ ec2_result.instances[0].id }}"
+        attack_box_public_ip: "{{ ec2_result.instances[0].public_ip }}"
+        attack_box_private_ip: "{{ ec2_result.instances[0].private_ip }}"
+        attack_box_security_group: "{{ security_group.group_name }}"
@@ -0,0 +1,63 @@
+---
+# AWS-specific phishing infrastructure tasks
+
+- name: Set AWS-specific variables
+  set_fact:
+    region: "{{ aws_region | default('us-east-1') }}"
+    instance_type_map:
+      gophish: "{{ gophish_instance_type | default('t3.large') }}"
+      mta_front: "{{ mta_instance_type | default('t3.medium') }}"
+      redirector: "{{ redirector_instance_type | default('t3.small') }}"
+      webserver: "{{ webserver_instance_type | default('t3.medium') }}"
+
+- name: Create security group for phishing infrastructure
+  debug:
+    msg: "Would create security group: phishing-{{ deployment_id }}"
+
+- name: Deploy Gophish server
+  debug:
+    msg: |
+      Would deploy Gophish server:
+      - Instance type: {{ instance_type_map.gophish }}
+      - Region: {{ region }}
+      - Name: gophish-{{ deployment_id }}
+      - Framework: gophish
+  when: "'gophish' in deployment_components"
+
+- name: Deploy MTA Front server
+  debug:
+    msg: |
+      Would deploy MTA Front server:
+      - Instance type: {{ instance_type_map.mta_front }}
+      - Region: {{ region }}
+      - Name: mta-{{ deployment_id }}
+      - Hostname: {{ mta_hostname | default('mail.' + (phishing_domain | default(domain))) }}
+  when: "'mta_front' in deployment_components"
+
+- name: Deploy Phishing Redirector
+  debug:
+    msg: |
+      Would deploy Phishing Redirector:
+      - Instance type: {{ instance_type_map.redirector }}
+      - Region: {{ region }}
+      - Name: redirector-{{ deployment_id }}
+  when: "'redirector' in deployment_components"
+
+- name: Deploy Phishing Webserver
+  debug:
+    msg: |
+      Would deploy Phishing Webserver:
+      - Instance type: {{ instance_type_map.webserver }}
+      - Region: {{ region }}
+      - Name: web-{{ deployment_id }}
+  when: "'webserver' in deployment_components"
+
+- name: Set deployment results
+  set_fact:
+    phishing_deployment_results:
+      gophish_ip: "{{ '10.0.0.10' if 'gophish' in deployment_components else '' }}"
+      mta_ip: "{{ '10.0.0.11' if 'mta_front' in deployment_components else '' }}"
+      redirector_ip: "{{ '10.0.0.12' if 'redirector' in deployment_components else '' }}"
+      webserver_ip: "{{ '10.0.0.13' if 'webserver' in deployment_components else '' }}"
+      deployment_id: "{{ deployment_id }}"
+      domain: "{{ phishing_domain | default(domain) }}"
@@ -0,0 +1,45 @@
+aws_access_key: "YOUR_AWS_ACCESS_KEY"  # Your AWS access key
+aws_secret_key: "YOUR_AWS_SECRET_KEY"  # Your AWS secret key
+aws_region_choices:
+  - ap-south-1
+  - eu-north-1
+  - eu-west-3
+  - eu-west-2
+  - eu-west-1
+  - ap-northeast-3
+  - ap-northeast-2
+  - ap-northeast-1
+  - ca-central-1
+  - sa-east-1
+  - ap-southeast-1
+  - ap-southeast-2
+  - eu-central-1
+  - us-east-1
+  - us-east-2
+  - us-west-1
+  - us-west-2
+ami_map:
+  ap-south-1: ami-0eeeb93aa51c48595
+  eu-north-1: ami-05bb943edc7d12d2f
+  eu-west-3: ami-01c1cbe631d766dcd
+  eu-west-2: ami-0a9aba19a0b8e81da
+  eu-west-1: ami-05b908c468c3a5373
+  ap-northeast-3: ami-03809b00a4487dc46
+  ap-northeast-2: ami-048f3574b7d304c04
+  ap-northeast-1: ami-0b74305a62f8299e1
+  ca-central-1: ami-0415ef7b9c3019285
+  sa-east-1: ami-0ab7401488d50bf51
+  ap-southeast-1: ami-0d2d12d390e9c0a34
+  ap-southeast-2: ami-0bd344ea1f492feab
+  eu-central-1: ami-093d1ceb3279619b0
+  us-east-1: ami-061b17d332829ab1c
+  us-east-2: ami-0327cf1c5e479e093
+  us-west-1: ami-0fbe3a8e1dcd86f23
+  us-west-2: ami-030d7e8d6fbca8332
+aws_instance_type: "t2.medium"  # EC2 instance type
+domain: "example.com"
+mail_hostname: "mail.example.com"
+letsencrypt_email: "admin@example.com"
+smtp_auth_user: "phishuser"
+smtp_auth_pass: "SuperSecretPass123!"
+gophish_admin_port: "2222"
@@ -0,0 +1,518 @@
+---
+# AWS C2 Server Deployment Playbook
+
+- name: Deploy AWS C2 server
+  hosts: localhost
+  gather_facts: false
+  connection: local
+  vars_files:
+    - vars.yaml
+  vars:
+    # Default values
+    ssh_user: "{{ ssh_user | default('kali') }}"
+    aws_region: "{{ aws_region | default(aws_region_choices | random) }}"
+    instance_type: "{{ aws_instance_type | default('t2.medium') }}"
+    deployment_id: "{{ deployment_id | default('') }}"
+    c2_name: "{{ c2_name | default('s-' + deployment_id) }}"
+    # Define split_regions - only true when regions are explicitly different
+    split_regions: "{{ c2_region is defined and redirector_region is defined and c2_region != redirector_region }}"
+    # Only use shared infra when NOT doing split-region deployment
+    use_shared_infra: "{{ not split_regions and not c2_only | default(false) | bool and not redirector_only | default(false) | bool }}"
+    # Set correct region variable
+    aws_c2_region: "{{ c2_region | default(aws_region) }}"
+    # AMI map comes from vars.yaml - add fallback for safety
+    kali_ami_map_fallback:
+      us-east-1: "ami-061b17d332829ab1c"
+      us-east-2: "ami-061b17d332829ab1c"  # Fallback to us-east-1 AMI
+
+  tasks:
+    - name: Validate AWS credentials
+      assert:
+        that:
+          - aws_access_key is defined and aws_access_key != ""
+          - aws_secret_key is defined and aws_secret_key != ""
+        fail_msg: "AWS credentials are required"
+
+    # Load shared infrastructure state if available
+    - name: Check for shared infrastructure state
+      stat:
+        path: "infrastructure_state_{{ deployment_id }}.json"
+      register: infra_state_file
+      when: use_shared_infra | bool
+      
+    - name: Load shared infrastructure state
+      include_vars:
+        file: "infrastructure_state_{{ deployment_id }}.json"
+        name: shared_infra
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+      
+    - name: Set region for C2
+      set_fact:
+        aws_c2_region: "{{ shared_infra.region | default(aws_region) }}"
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+        
+    - name: Set default region for C2
+      set_fact:
+        aws_c2_region: "{{ c2_region | default(aws_region) }}"
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Check if ami_map is provided in vars.yaml
+      debug:
+        msg: "ami_map is {{ 'defined' if ami_map is defined else 'NOT defined' }} in vars.yaml"
+
+    - name: Set AMI ID for selected region (from vars.yaml)
+      set_fact:
+        ami_id: "{{ ami_map[aws_c2_region] | default(ami_map.us-east-1) }}"
+      when: ami_map is defined and ami_map
+
+    - name: Set AMI ID for selected region (fallback)
+      set_fact:
+        ami_id: "{{ kali_ami_map_fallback[aws_c2_region] | default(kali_ami_map_fallback['us-east-1']) }}"
+      when: ami_id is not defined or ami_id == ""
+
+    - name: Ensure we have a valid AMI ID
+      assert:
+        that:
+          - ami_id is defined and ami_id != ""
+        fail_msg: "Could not determine a valid AMI ID for region {{ aws_c2_region }}. Please add it to ami_map in vars.yaml."
+
+    # Add AMI username mapping - improved with better detection
+    - name: Determine correct SSH user for the AMI
+      set_fact:
+        ami_ssh_user: "{{ 'kali' if (ami_id is defined and ami_id is search('-kali-')) or (ami_id is defined and ami_id == 'ami-061b17d332829ab1c') else 'ubuntu' }}"
+
+    - name: Display AMI and user information for debugging
+      debug:
+        msg: 
+          - "Using AMI ID: {{ ami_id | default('AMI not defined') }}"
+          - "Detected SSH user: {{ ami_ssh_user }}"
+
+    # Create new infrastructure only if not using shared
+    - name: Create VPC
+      amazon.aws.ec2_vpc_net:
+        name: "{{ c2_name }}-vpc"
+        cidr_block: "10.0.0.0/16"
+        region: "{{ aws_c2_region }}"
+        tags:
+          Name: "{{ c2_name }}-vpc"
+          deployment_id: "{{ deployment_id }}"
+        state: present
+      register: vpc_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create internet gateway for VPC
+      amazon.aws.ec2_vpc_igw:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        region: "{{ aws_c2_region }}"
+        state: present
+        tags:
+          Name: "{{ c2_name }}-igw"
+          deployment_id: "{{ deployment_id }}"
+      register: igw_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create subnet in VPC
+      amazon.aws.ec2_vpc_subnet:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        cidr: "10.0.1.0/24"
+        region: "{{ aws_c2_region }}"
+        az: "{{ aws_c2_region }}a"
+        map_public: yes
+        tags:
+          Name: "{{ c2_name }}-subnet"
+          deployment_id: "{{ deployment_id }}"
+      register: subnet_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create routing table for internet access
+      amazon.aws.ec2_vpc_route_table:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        region: "{{ aws_c2_region }}"
+        tags:
+          Name: "{{ c2_name }}-rtb"
+          deployment_id: "{{ deployment_id }}"
+        routes:
+          - dest: "0.0.0.0/0"
+            gateway_id: "{{ igw_result.gateway_id }}"
+        subnets:
+          - "{{ subnet_result.subnet.id }}"
+      register: route_table_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    # Set VPC ID based on shared or created
+    - name: Set VPC ID from shared infrastructure
+      set_fact:
+        vpc_id: "{{ shared_infra.vpc_id }}"
+        subnet_id: "{{ shared_infra.subnet_id }}"
+        c2_vpc_id: "{{ shared_infra.vpc_id }}"  # Store for cleanup reference
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+
+    - name: Set VPC ID from created infrastructure
+      set_fact:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        subnet_id: "{{ subnet_result.subnet.id }}"
+        c2_vpc_id: "{{ vpc_result.vpc.id }}"  # Store for cleanup reference
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Set default redirector_ip for C2-only deployments
+      set_fact:
+        redirector_ip: "{{ operator_ip }}"
+      when: c2_only | default(false) | bool and redirector_ip is not defined
+
+    - name: Load redirector_ip from infrastructure state 
+      block:
+        - name: Check if infrastructure state file exists
+          stat:
+            path: "infrastructure_state_{{ deployment_id }}.json"
+          register: infra_state_check
+        
+        - name: Load infrastructure state
+          include_vars:
+            file: "infrastructure_state_{{ deployment_id }}.json"
+            name: infra_state
+          when: infra_state_check.stat.exists
+        
+        - name: Set redirector IP from infrastructure state
+          set_fact:
+            redirector_ip: "{{ infra_state.redirector_ip | default(operator_ip) }}"
+          when: infra_state_check.stat.exists and infra_state.redirector_ip is defined
+        
+        - name: Debug redirector IP
+          debug:
+            msg: "Using redirector IP: {{ redirector_ip | default('undefined') }}"
+      when: redirector_ip is undefined
+
+    - name: Default to operator IP if redirector IP is still undefined
+      set_fact:
+        redirector_ip: "{{ operator_ip }}"
+      when: redirector_ip is undefined
+
+    - name: Create security group for C2 server
+      amazon.aws.ec2_security_group:
+        name: "{{ c2_name }}-sg"
+        description: "Secured C2 server {{ c2_name }}"
+        vpc_id: "{{ vpc_id }}"
+        region: "{{ aws_c2_region }}"
+        rules:
+          # Management access only from operator IP
+          - proto: tcp
+            ports: 22
+            cidr_ip: "{{ operator_ip }}/32"
+          - proto: tcp
+            ports: "{{ havoc_teamserver_port | default(40056) }}"
+            cidr_ip: "{{ operator_ip }}/32"
+          # Allow traffic only from redirector
+          - proto: tcp
+            ports:
+              - 80
+              - 443
+              - "{{ havoc_http_port | default(8080) }}"
+              - "{{ havoc_https_port | default(9443) }}"  # Updated from 443
+              - "{{ havoc_payload_port | default(8443) }}"
+              - "{{ gophish_admin_port | default(2222) }}"
+              - "{{ gophish_phish_port | default(8081) }}"
+              - "{{ tracker_port | default(5000) }}"
+            cidr_ip: "{{ redirector_ip }}/32"
+        rules_egress:
+          - proto: -1
+            cidr_ip: 0.0.0.0/0
+        state: present
+      register: security_group
+
+    # Generate or import SSH key for the deployment - FIXED KEY HANDLING
+    - name: Check if deployment SSH key already exists locally
+      stat:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+      register: ssh_key_file
+
+    - name: Generate key pair if it doesn't exist
+      block:
+        - name: Create SSH key pair
+          command: ssh-keygen -t rsa -b 2048 -f ~/.ssh/c2deploy_{{ deployment_id }} -N ""
+          args:
+            creates: "~/.ssh/c2deploy_{{ deployment_id }}"
+        
+        - name: Rename private key to .pem format
+          command: mv ~/.ssh/c2deploy_{{ deployment_id }} ~/.ssh/c2deploy_{{ deployment_id }}.pem
+          args:
+            creates: "~/.ssh/c2deploy_{{ deployment_id }}.pem" 
+            removes: "~/.ssh/c2deploy_{{ deployment_id }}"
+      when: not ssh_key_file.stat.exists
+
+    - name: Ensure proper permissions on SSH key
+      file:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        mode: '0600'
+        state: file
+
+    - name: Check if key pair exists in AWS
+      amazon.aws.ec2_key_info:
+        region: "{{ aws_c2_region }}"
+        filters:
+          key-name: "c2deploy_{{ deployment_id }}"
+      register: existing_key_pair
+
+    - name: Import SSH key to AWS
+      amazon.aws.ec2_key:
+        name: "c2deploy_{{ deployment_id }}"
+        key_material: "{{ lookup('file', '~/.ssh/c2deploy_{{ deployment_id }}.pub') }}"
+        region: "{{ aws_c2_region }}"
+        state: present
+      when: existing_key_pair.keypairs | length == 0
+
+    # Launch the C2 server - use the consistent key pair name
+    - name: Launch C2 instance
+      amazon.aws.ec2_instance:
+        name: "{{ c2_name }}"
+        key_name: "c2deploy_{{ deployment_id }}"  # Use the imported key
+        instance_type: "{{ instance_type | default('t2.medium') }}"
+        vpc_subnet_id: "{{ subnet_id }}"
+        security_groups:
+          - "{{ security_group.group_id }}"
+        image_id: "{{ ami_id }}"
+        region: "{{ aws_c2_region }}"
+        state: present
+        wait: yes
+        volumes:
+          - device_name: "/dev/xvda"
+            ebs:
+              volume_size: 100
+              delete_on_termination: true
+        tags:
+          Name: "{{ c2_name }}"
+          deployment_id: "{{ deployment_id }}"
+      register: c2_instance
+
+    - name: Set c2_ip for later use
+      set_fact:
+        c2_ip: "{{ c2_instance.instances[0].public_ip_address }}"
+        c2_instance_id: "{{ c2_instance.instances[0].instance_id }}"
+
+    - name: Display C2 instance details for debugging
+      debug:
+        msg:
+          - "C2 IP: {{ c2_ip }}"
+          - "C2 Instance ID: {{ c2_instance_id }}"
+          - "SSH User to use: {{ ami_ssh_user }}"
+          - "SSH Key path: ~/.ssh/c2deploy_{{ deployment_id }}.pem"
+
+    - name: Wait for C2 instance initialization
+      pause:
+        seconds: 180
+      when: c2_instance.changed
+
+    - name: Set correct permissions on SSH key
+      file:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        mode: "0600"
+
+    - name: Wait for C2 SSH to be available
+      wait_for:
+        host: "{{ c2_ip }}"
+        port: 22
+        delay: 30
+        timeout: 300
+        state: started
+
+    - name: Test SSH and prepare remote environment
+      block:
+        - name: Ensure .ansible directory exists with proper permissions
+          shell: |
+            ssh -i ~/.ssh/c2deploy_{{ deployment_id }}.pem -o StrictHostKeyChecking=no {{ ami_ssh_user }}@{{ c2_ip }} "sudo mkdir -p /root/.ansible/tmp && sudo chmod 0700 /root/.ansible/tmp && sudo chown {{ ami_ssh_user }}:{{ ami_ssh_user }} /root/.ansible/tmp"
+          register: ssh_prep
+          until: ssh_prep is success
+          retries: 5
+          delay: 15
+          ignore_errors: yes
+          delegate_to: localhost
+        
+        - name: Display SSH preparation results
+          debug:
+            msg: "SSH preparation completed: {{ ssh_prep.stdout | default('No output') }}"
+
+    # Test SSH connection directly to verify key is working
+    - name: Test SSH connection to verify key
+      shell: "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i ~/.ssh/c2deploy_{{ deployment_id }}.pem {{ ami_ssh_user }}@{{ c2_ip }} 'echo SSH CONNECTION SUCCESSFUL'"
+      register: ssh_test
+      ignore_errors: yes
+
+    - name: Display SSH test results
+      debug:
+        msg: "{{ ssh_test.stdout | default('SSH Connection failed!') }}"
+
+    - name: Add C2 to inventory with updated SSH key path
+      add_host:
+        name: "c2"
+        groups: "c2servers"
+        ansible_host: "{{ c2_ip }}"
+        ansible_user: "{{ ami_ssh_user }}"
+        ansible_ssh_private_key_file: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        ansible_ssh_common_args: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes"
+        ansible_python_interpreter: "/usr/bin/python3"
+        # Add these lines to pass all required variables:
+        smtp_auth_user: "{{ smtp_auth_user }}"
+        smtp_auth_pass: "{{ smtp_auth_pass }}"
+        gophish_admin_port: "{{ gophish_admin_port }}"
+        domain: "{{ domain }}"
+        redirector_subdomain: "{{ redirector_subdomain }}"
+        letsencrypt_email: "{{ letsencrypt_email }}"
+        havoc_teamserver_port: "{{ havoc_teamserver_port | default(40056) }}"
+        havoc_http_port: "{{ havoc_http_port | default(8080) }}"
+        havoc_https_port: "{{ havoc_https_port | default(9443) }}"
+        zero_logs: "{{ zero_logs | default(true) }}"
+        secure_memory: "{{ secure_memory | default(true) }}"
+        disable_history: "{{ disable_history | default(true) }}"
+        setup_integrated_tracker: "{{ setup_integrated_tracker | default(false) }}"
+        tracker_domain: "{{ tracker_domain | default('track.' + domain) | default('') }}"
+
+# Configure C2 server with a proper structure
+- name: Configure C2 server
+  hosts: c2servers
+  become: yes
+  become_user: root
+  gather_facts: true
+  vars_files:
+    - vars.yaml  # Add this line to load the variables
+  vars:
+    redirector_ip: "{{ hostvars['localhost']['redirector_ip'] | default('127.0.0.1') }}"
+    c2_subdomain: "{{ c2_subdomain | default('mail') }}"
+  tasks:
+    - name: Install python3 if it doesn't exist on target
+      raw: test -e /usr/bin/python3 || (apt-get update && apt-get install -y python3)
+      args:
+        executable: /bin/bash
+      register: python_install
+      ignore_errors: yes
+      
+    - name: Debug connection information
+      debug:
+        msg:
+          - "Connected to C2 server successfully"
+          - "Host: {{ ansible_host }}"
+          - "User: {{ ansible_user }}"
+          - "Python version: {{ ansible_python_version | default('unknown') }}"
+      
+    - name: Download Kali archive keyring to temporary location
+      get_url:
+        url: https://archive.kali.org/archive-keyring.gpg
+        dest: /tmp/kali-archive-keyring.gpg
+        mode: "0644"
+        force: yes
+      register: keyring_download
+
+    - name: Install Kali archive keyring
+      command: install -m 0644 /tmp/kali-archive-keyring.gpg /usr/share/keyrings/kali-archive-keyring.gpg
+      when: keyring_download is changed
+
+    - name: Wait for apt to be available
+      apt:
+        update_cache: yes
+      register: apt_result
+      until: apt_result is success
+      retries: 10
+      delay: 10
+
+    - name: Install Rust compiler
+      apt:
+        name:
+          - cargo
+          - rustc
+          - libssl-dev
+          - pkg-config
+        state: present
+      register: rust_install
+      until: rust_install is success
+      retries: 3
+      delay: 5
+
+    - name: Clean up any failed pipx installations
+      file:
+        path: "{{ item }}"
+        state: absent
+      with_items:
+        - "/root/.local/state/pipx/venvs/netexec"
+        - "/root/.local/state/pipx/venvs/trevorspray"
+      ignore_errors: yes
+
+    - name: Include common tool installation tasks
+      include_tasks: "../../common/tasks/install_tools.yml"
+
+    - name: Include common C2 configuration tasks
+      include_tasks: "../../modules/c2/tasks/configure_c2.yml"
+
+    - name: Include common security hardening tasks
+      include_tasks: "../../common/tasks/security_hardening.yml"
+
+    - name: Include common mail server configuration tasks
+      include_tasks: "../../common/tasks/configure_mail.yml"
+
+    - name: Set up SSH access to redirector
+      block:
+        - name: Ensure /root/.ssh directory exists on C2 server
+          file:
+            path: /root/.ssh
+            state: directory
+            mode: '0700'
+            owner: root
+            group: root
+
+        - name: Copy private SSH key to C2 server for redirector access
+          copy:
+            src: "{{ playbook_dir }}/../.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+            dest: "/root/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+            mode: '0600'
+            owner: root
+            group: root
+          register: key_copy
+          ignore_errors: yes
+
+        - name: If direct path fails, try home directory location
+          copy:
+            src: "~/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+            dest: "/root/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+            mode: '0600'
+            owner: root
+            group: root
+          when: key_copy is failed
+
+        - name: Create SSH config file to use key automatically
+          copy:
+            dest: "/root/.ssh/config"
+            content: |
+              Host redirector
+                HostName {{ hostvars['localhost']['redirector_ip'] }}
+                User ubuntu
+                IdentityFile /root/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem
+                StrictHostKeyChecking no
+                UserKnownHostsFile /dev/null
+            mode: '0600'
+            owner: root
+            group: root
+
+        - name: Create alias for easy redirector access
+          lineinfile:
+            path: /root/.bashrc
+            line: 'alias redirector="ssh -i /root/.ssh/c2deploy_{{ hostvars["localhost"]["deployment_id"] }}.pem ubuntu@{{ hostvars["localhost"]["redirector_ip"] }}"'
+            state: present
+
+        - name: Test SSH from C2 to redirector
+          shell: |
+            ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem ubuntu@{{ hostvars['localhost']['redirector_ip'] }} "echo 'SSH CONNECTION SUCCESSFUL FROM C2'"
+          register: ssh_test_result
+          changed_when: false
+          ignore_errors: yes
+
+        - name: Display SSH test result
+          debug:
+            msg: "{{ ssh_test_result.stdout if ssh_test_result.rc == 0 else 'SSH connection failed: ' + ssh_test_result.stderr }}"
+
+    - name: Print deployment summary
+      debug:
+        msg:
+          - "C2 Server Deployment Complete!"
+          - "-----------------------------"
+          - "C2 Server IP: {{ ansible_host }}"
+          - "C2 Server Domain: {{ c2_subdomain }}.{{ domain }} (Update DNS A record)"
+          - "GoPhish Admin Port: {{ gophish_admin_port }}"
+          - "SSH Key: ~/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+      when: not disable_summary | default(false)
@@ -0,0 +1,465 @@
+---
+# AWS Cleanup Playbook - Comprehensive version with robust VPC removal
+- name: Clean up AWS resources
+  hosts: localhost
+  gather_facts: false
+  connection: local
+  vars_files:
+    - vars.yaml
+  vars:
+    aws_region: "{{ aws_region | default(aws_region_choices | random) }}"
+    confirm_cleanup: false  # Skip confirmation in automated teardown
+    deployment_id: "{{ deployment_id | default('') }}"
+    redirector_name: "{{ redirector_name | default('r-' + deployment_id) }}"
+    c2_name: "{{ c2_name | default('s-' + deployment_id) }}"
+    tracker_name: "{{ tracker_name | default('t-' + deployment_id) }}"
+    cleanup_summary: {}
+    
+  tasks:
+    # Confirmation step (if enabled)
+    - name: Confirm cleanup
+      pause:
+        prompt: "Are you sure you want to delete all AWS resources for deployment ID {{ deployment_id }}? This action cannot be undone. Type 'yes' to confirm"
+      register: cleanup_confirmation
+      when: confirm_cleanup | bool
+    
+    - name: Check confirmation
+      assert:
+        that:
+          - cleanup_confirmation.user_input | default('yes') == 'yes'
+        fail_msg: "Cleanup cancelled by user"
+      when: confirm_cleanup | bool
+    
+    # STEP 1: Find all instances by deployment ID
+    - name: Find all EC2 instances for this deployment
+      amazon.aws.ec2_instance_info:
+        region: "{{ aws_region }}"
+        filters:
+          "tag:deployment_id": "{{ deployment_id }}"
+      register: deployment_instances
+      
+    - name: Set fact for instances found
+      set_fact:
+        cleanup_summary: "{{ cleanup_summary | combine({'instances_found': deployment_instances.instances | length}) }}"
+      
+    # STEP 2: Terminate all instances with proper tagging
+    - name: Terminate all instances for this deployment
+      amazon.aws.ec2_instance:
+        instance_ids: "{{ item.instance_id }}"
+        region: "{{ aws_region }}"
+        state: absent
+      loop: "{{ deployment_instances.instances }}"
+      register: terminated_instances
+      when: deployment_instances.instances | length > 0
+      
+    - name: Wait for instances to be terminated
+      pause:
+        seconds: 30
+      when: deployment_instances.instances | length > 0
+    
+    # STEP 3: Find all security groups by deployment ID
+    - name: Find all security groups for this deployment
+      amazon.aws.ec2_security_group_info:
+        region: "{{ aws_region }}"
+        filters:
+          "tag:deployment_id": "{{ deployment_id }}"
+      register: deployment_sgs
+      
+    # Also find SGs by name pattern
+    - name: Find security groups by name pattern
+      amazon.aws.ec2_security_group_info:
+        region: "{{ aws_region }}"
+      register: all_sgs
+        
+    - name: Filter SGs by name pattern
+      set_fact:
+        named_sgs: "{{ all_sgs.security_groups | selectattr('group_name', 'search', redirector_name + '-sg|' + c2_name + '-sg') | list }}"
+      
+    - name: Combine all security groups to delete
+      set_fact:
+        all_sgs_to_delete: "{{ deployment_sgs.security_groups + named_sgs }}"
+        cleanup_summary: "{{ cleanup_summary | combine({'security_groups_found': (deployment_sgs.security_groups + named_sgs) | length}) }}"
+    
+    # STEP 4: Delete all security groups
+    - name: Delete security groups
+      amazon.aws.ec2_security_group:
+        group_id: "{{ item.group_id }}"
+        region: "{{ aws_region }}"
+        state: absent
+      loop: "{{ all_sgs_to_delete }}"
+      when: all_sgs_to_delete | length > 0
+      ignore_errors: yes
+      register: deleted_sgs
+    
+    # STEP 5: Find and delete all ENIs
+    - name: Find network interfaces by tag
+      amazon.aws.ec2_eni_info:
+        region: "{{ aws_region }}"
+        filters:
+          "tag:deployment_id": "{{ deployment_id }}"
+      register: deployment_enis
+      
+    - name: Delete ENIs
+      amazon.aws.ec2_eni:
+        region: "{{ aws_region }}"
+        eni_id: "{{ item.id }}"
+        state: absent
+        force_detach: true
+      loop: "{{ deployment_enis.network_interfaces }}"
+      ignore_errors: yes
+      register: deleted_enis
+      when: deployment_enis.network_interfaces | length > 0
+      
+    - name: Set ENIs count in summary
+      set_fact:
+        cleanup_summary: "{{ cleanup_summary | combine({'enis_found': deployment_enis.network_interfaces | length}) }}"
+      
+    # STEP 6: Find all VPCs by deployment ID
+    - name: Find all VPCs for this deployment
+      amazon.aws.ec2_vpc_net_info:
+        region: "{{ aws_region }}"
+        filters:
+          "tag:deployment_id": "{{ deployment_id }}"
+      register: deployment_vpcs
+    
+    # STEP 7: Find VPCs by name pattern as fallback
+    - name: Find all VPCs by name pattern
+      amazon.aws.ec2_vpc_net_info:
+        region: "{{ aws_region }}"
+      register: all_vpcs
+    
+    - name: Filter VPCs by name pattern
+      set_fact:
+        named_vpcs: "{{ all_vpcs.vpcs | selectattr('tags', 'defined') | selectattr('tags.Name', 'defined') | selectattr('tags.Name', 'search', redirector_name + '-vpc|' + c2_name + '-vpc') | list }}"
+    
+    - name: Combine all VPCs to delete
+      set_fact:
+        all_vpcs_to_delete: "{{ deployment_vpcs.vpcs + named_vpcs | unique(attribute='vpc_id') }}"
+        cleanup_summary: "{{ cleanup_summary | combine({'vpcs_found': (deployment_vpcs.vpcs + named_vpcs | unique(attribute='vpc_id')) | length}) }}"
+
+    # STEP 8: Find and delete NAT Gateways for each VPC separately
+    - name: Find NAT gateways in each VPC
+      amazon.aws.ec2_vpc_nat_gateway_info:
+        region: "{{ aws_region }}"
+        filters:
+          vpc-id: "{{ item.vpc_id }}"
+      register: natgw_results
+      loop: "{{ all_vpcs_to_delete }}"
+      when: all_vpcs_to_delete | length > 0
+      
+    - name: Delete NAT gateways
+      amazon.aws.ec2_vpc_nat_gateway:
+        region: "{{ aws_region }}"
+        nat_gateway_id: "{{ item.1.nat_gateway_id }}"
+        state: absent
+        release_eip: true
+      loop: "{{ natgw_results.results | default([]) | selectattr('skipped', 'undefined') | selectattr('nat_gateways', 'defined') | subelements('nat_gateways') }}"
+      ignore_errors: yes
+      register: deleted_natgws
+      when: natgw_results.results is defined
+
+    - name: Wait after NAT deletion
+      pause:
+        seconds: 15
+      when: deleted_natgws.results is defined and deleted_natgws.results | length > 0
+
+    # STEP 9: Find and delete Internet Gateways
+    - name: Find internet gateways for each VPC
+      amazon.aws.ec2_vpc_igw_info:
+        region: "{{ aws_region }}"
+        filters:
+          attachment.vpc-id: "{{ item.vpc_id }}"
+      register: igw_results
+      loop: "{{ all_vpcs_to_delete }}"
+      when: all_vpcs_to_delete | length > 0
+      
+    - name: Detach and delete internet gateways
+      amazon.aws.ec2_vpc_igw:
+        internet_gateway_id: "{{ item.1.internet_gateway_id }}"
+        state: absent
+        region: "{{ aws_region }}"
+      loop: "{{ igw_results.results | default([]) | subelements('internet_gateways') }}"
+      ignore_errors: yes
+      register: deleted_igws
+      
+    - name: Wait after IGW deletion
+      pause:
+        seconds: 15
+      when: deleted_igws.results is defined and deleted_igws.results | length > 0
+
+    # STEP 10: Find and delete Route Tables
+    - name: Find route tables for each VPC
+      amazon.aws.ec2_vpc_route_table_info:
+        region: "{{ aws_region }}"
+        filters:
+          vpc-id: "{{ item.vpc_id }}"
+      register: rtb_results
+      loop: "{{ all_vpcs_to_delete }}"
+      when: all_vpcs_to_delete | length > 0
+      
+    - name: Delete non-main route tables
+      amazon.aws.ec2_vpc_route_table:
+        region: "{{ aws_region }}"
+        route_table_id: "{{ item.1.id }}"
+        lookup: id
+        state: absent
+      loop: "{{ rtb_results.results | default([]) | selectattr('skipped', 'undefined') | selectattr('route_tables', 'defined') | subelements('route_tables') }}"
+      when: not item.1.associations[0].main | default(false)
+      ignore_errors: yes
+      register: deleted_rtbs
+
+    # Add this after your existing route table deletion
+    - name: Delete main route tables with AWS CLI
+      shell: |
+        for rtb in $(aws ec2 describe-route-tables --region {{ aws_region }} --filters "Name=vpc-id,Values={{ item.vpc_id }}" --query 'RouteTables[?Associations[?Main==`true`]].RouteTableId' --output text); do
+          aws ec2 delete-route --route-table-id $rtb --destination-cidr-block 0.0.0.0/0 --region {{ aws_region }} || true
+        done
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      loop: "{{ all_vpcs_to_delete }}"
+      ignore_errors: yes
+      when: all_vpcs_to_delete | length > 0
+
+    # STEP 11: Find and delete Subnets
+    - name: Find subnets for each VPC
+      amazon.aws.ec2_vpc_subnet_info:
+        region: "{{ aws_region }}"
+        filters:
+          vpc-id: "{{ item.vpc_id }}"
+      loop: "{{ all_vpcs_to_delete }}"
+      register: subnet_results
+      
+    - name: Delete subnets
+      amazon.aws.ec2_vpc_subnet:
+        region: "{{ aws_region }}"
+        vpc_id: "{{ item.1.vpc_id }}"
+        cidr: "{{ item.1.cidr_block }}"
+        state: absent
+      loop: "{{ subnet_results.results | default([]) | subelements('subnets') }}"
+      ignore_errors: yes
+      register: deleted_subnets
+      when: subnet_results.results is defined
+     
+    # STEP 12: Find and delete VPC Endpoints
+    - name: Find VPC endpoints for each VPC
+      amazon.aws.ec2_vpc_endpoint_info:
+        region: "{{ aws_region }}"
+        filters:
+          vpc-id: "{{ item.vpc_id }}"
+      register: endpoint_results
+      loop: "{{ all_vpcs_to_delete }}"
+      when: all_vpcs_to_delete | length > 0
+      
+    - name: Delete VPC endpoints
+      amazon.aws.ec2_vpc_endpoint:
+        region: "{{ aws_region }}"
+        vpc_endpoint_id: "{{ item.1.vpc_endpoint_id }}"
+        state: absent
+      loop: "{{ endpoint_results.results | default([]) | selectattr('skipped', 'undefined') | selectattr('vpc_endpoints', 'defined') | subelements('vpc_endpoints') }}"
+      ignore_errors: yes
+      register: deleted_endpoints
+      when: endpoint_results.results is defined
+
+    # Add before STEP 13
+    - name: Check for remaining VPC dependencies
+      shell: |
+        aws ec2 describe-network-interfaces --region {{ aws_region }} --filters "Name=vpc-id,Values={{ item.vpc_id }}" --output json
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      register: remaining_deps
+      loop: "{{ all_vpcs_to_delete }}"
+      when: all_vpcs_to_delete | length > 0
+      
+    - name: Display any remaining dependencies
+      debug:
+        msg: "VPC {{ item.item.vpc_id }} still has dependencies that need to be removed"
+      loop: "{{ remaining_deps.results }}"
+      when: item.stdout | from_json | json_query('NetworkInterfaces') | length > 0
+
+    # Add this before the force delete of network interfaces
+    - name: Detach remaining network interfaces
+      shell: |
+        aws ec2 detach-network-interface --attachment-id $(aws ec2 describe-network-interfaces --network-interface-ids {{ item.1 }} --query 'NetworkInterfaces[0].Attachment.AttachmentId' --output text) --region {{ aws_region }} --force
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      loop: "{{ remaining_deps.results | selectattr('stdout', 'defined') | 
+                map('attr', 'stdout') | map('from_json') | 
+                map('json_query', 'NetworkInterfaces[?Status==`in-use`].NetworkInterfaceId') | 
+                zip(remaining_deps.results | map('attr', 'item')) | list }}"
+      ignore_errors: yes
+      when: item.0 | length > 0
+      
+    - name: Force delete any remaining network interfaces
+      shell: |
+        aws ec2 delete-network-interface --network-interface-id {{ item.1 }} --region {{ aws_region }}
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      loop: "{{ remaining_deps.results | selectattr('stdout', 'defined') | 
+                map('attr', 'stdout') | map('from_json') | 
+                map('json_query', 'NetworkInterfaces[].NetworkInterfaceId') | 
+                zip(remaining_deps.results | map('attr', 'item')) | list }}"
+      ignore_errors: yes
+      when: item.0 | length > 0
+
+    # STEP 13: Final VPC deletion with multiple retries
+    - name: Wait for all dependencies to clear
+      pause:
+        seconds: 20
+      when: all_vpcs_to_delete | length > 0
+      
+    # First attempt with normal module - with error display
+    - name: Delete all VPCs (first attempt)
+      amazon.aws.ec2_vpc_net:
+        vpc_id: "{{ item.vpc_id }}"
+        region: "{{ aws_region }}"
+        state: absent
+      loop: "{{ all_vpcs_to_delete }}"
+      register: vpc_deletion
+      when: all_vpcs_to_delete | length > 0
+      ignore_errors: yes
+      
+    - name: Display VPC deletion errors
+      debug:
+        msg: "Failed to delete VPC {{ item.item.vpc_id }}: {{ item.msg }}"
+      loop: "{{ vpc_deletion.results | default([]) }}"
+      when: item.failed is defined and item.failed
+
+    # Direct API call for any VPCs that failed
+    - name: Find which VPCs still exist
+      amazon.aws.ec2_vpc_net_info:
+        region: "{{ aws_region }}"
+        vpc_ids: "{{ all_vpcs_to_delete | map(attribute='vpc_id') | list }}"
+      register: remaining_vpcs
+      when: all_vpcs_to_delete | length > 0
+      
+    # Forcibly delete with direct AWS CLI command
+    - name: Force delete remaining VPCs with CLI
+      shell: |
+        aws ec2 delete-vpc --vpc-id {{ item.vpc_id }} --region {{ aws_region }}
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      loop: "{{ remaining_vpcs.vpcs }}" 
+      ignore_errors: yes
+      when: remaining_vpcs is defined and remaining_vpcs.vpcs | length > 0
+      register: force_vpc_delete
+
+    # Add after the VPC deletion attempts - more aggressive approach
+    - name: Force delete remaining VPCs with AWS CLI and debug output
+      shell: |
+        aws ec2 delete-vpc --vpc-id {{ item.vpc_id }} --region {{ aws_region }} 2>&1 || echo "Failed with: $?"
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      loop: "{{ remaining_vpcs.vpcs }}" 
+      register: force_vpc_delete_debug
+      when: remaining_vpcs is defined and remaining_vpcs.vpcs | length > 0
+      
+    - name: Display debug output from force delete
+      debug:
+        msg: "{{ item.stdout }}"
+      loop: "{{ force_vpc_delete_debug.results | default([]) }}"
+      when: item.stdout is defined and item.stdout | trim != ""
+
+    # Track deleted VPCs in summary
+    - name: Set VPC deletion results in summary
+      set_fact:
+        cleanup_summary: "{{ cleanup_summary | combine({
+          'vpcs_deleted': ((vpc_deletion.results | default([]) | selectattr('failed', 'undefined') | list | length) + (force_vpc_delete.results | default([]) | selectattr('failed', 'undefined') | list | length))}) }}"
+      when: all_vpcs_to_delete | length > 0
+    
+    # Add these tasks to confirm VPC deletion
+    - name: Verify VPC deletion
+      amazon.aws.ec2_vpc_net_info:
+        region: "{{ aws_region }}"
+        filters:
+          "tag:deployment_id": "{{ deployment_id }}"
+      register: vpc_check
+
+    - name: Display cleanup summary
+      debug:
+        msg:
+          - "Cleanup Summary:"
+          - "Redirector instance deleted: {{ redirector_deleted | default('N/A') }}"
+          - "C2 instance deleted: {{ c2_deleted | default('N/A') }}"
+          - "VPC resources deleted: {{ vpc_check.vpcs | length == 0 }}"
+      when: not disable_summary | default(false)
+
+    # STEP 14: Delete key pairs - completely revised implementation
+    - name: Check for deployment key in AWS
+      shell: |
+        aws ec2 describe-key-pairs --region {{ aws_region }} --filters "Name=key-name,Values=c2deploy_{{ deployment_id }}" --query "KeyPairs[*].KeyName" --output text
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      register: keypair_check
+      ignore_errors: yes
+      
+    - name: Delete deployment key pair if it exists
+      amazon.aws.ec2_key:
+        name: "c2deploy_{{ deployment_id }}"
+        region: "{{ aws_region }}"
+        state: absent
+      when: keypair_check.stdout | trim != ""
+      register: deleted_keypair
+      
+    - name: Delete SSH key files
+      file:
+        path: "{{ item }}"
+        state: absent
+      with_items:
+        - "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        - "~/.ssh/c2deploy_{{ deployment_id }}.pub"
+        - "~/.ssh/{{ redirector_name }}.pem"
+        - "~/.ssh/{{ c2_name }}.pem"
+        - "~/.ssh/{{ tracker_name }}.pem"
+      ignore_errors: yes
+      register: deleted_ssh_files
+      
+    - name: Count deleted SSH files
+      set_fact:
+        cleanup_summary: "{{ cleanup_summary | combine({
+          'keypairs_deleted': (deleted_keypair.changed | default(false)) | ternary(1, 0),
+          'ssh_files_deleted': (deleted_ssh_files.results | selectattr('changed', 'defined') | selectattr('changed') | list | length)}) }}"
+    
+    # Remove infrastructure state file - fix path to include deployment_id
+    - name: Remove infrastructure state file
+      file:
+        path: "infrastructure_state_{{ deployment_id }}.json"
+        state: absent
+      ignore_errors: yes
+      register: infra_file
+
+    - name: Clean up deployment state file
+      file:
+        path: "{{ playbook_dir }}/../deployment_state_{{ deployment_id }}.json"
+        state: absent
+      ignore_errors: yes
+      register: state_file_deletion
+
+    - name: Report state file cleanup
+      debug:
+        msg: "Deployment state file {{ 'deleted' if state_file_deletion.changed else 'not found' }}"
+      when: state_file_deletion is defined
+      
+    # STEP 16: Enhanced and Accurate Cleanup Summary
+    - name: Enhanced cleanup summary
+      debug:
+        msg:
+          - "=========================================================="
+          - "            AWS CLEANUP SUMMARY: {{ deployment_id }}       "
+          - "=========================================================="
+          - "EC2 Instances:     {{ cleanup_summary.instances_found | default(0) }} found, {{ terminated_instances.results | default([]) | length }} terminated"
+          - "Security Groups:   {{ cleanup_summary.security_groups_found | default(0) }} found, {{ deleted_sgs.results | default([]) | length }} deleted"
+          - "Network Interfaces: {{ cleanup_summary.enis_found | default(0) }} found, {{ deleted_enis.results | default([]) | length }} deleted"
+          - "VPCs:              {{ cleanup_summary.vpcs_found | default(0) }} found, {{ cleanup_summary.vpcs_deleted | default(0) }} deleted"
+          - "Key Pairs:         {{ deleted_key_pairs.results | default([]) | length }} deleted" 
+          - "SSH Key Files:     {{ cleanup_summary.ssh_files_deleted | default(0) }} deleted"
+          - "Infrastructure file: {{ 'Removed' if infra_file.changed else 'Not found' }}"
+          - "=========================================================="
+          - "CLEANUP {{ 'COMPLETED' if (cleanup_summary.vpcs_deleted | default(0) == cleanup_summary.vpcs_found | default(0)) else 'PARTIAL - SOME RESOURCES MAY REMAIN' }}"
+          - "========================================================="
@@ -0,0 +1,115 @@
+---
+# AWS Shared Infrastructure Deployment Playbook
+
+- name: Deploy shared AWS infrastructure
+  hosts: localhost
+  gather_facts: false
+  connection: local
+  vars_files:
+    - vars.yaml
+  vars:
+    # Deployment identifiers
+    deployment_id: "{{ deployment_id | default('') }}"
+    infra_name: "infra-{{ deployment_id }}"
+    # Region settings
+    deployment_region: "{{ aws_region | default(aws_region_choices | random) }}"
+    # Check if using split regions (C2 and redirector in different regions)
+    split_regions: "{{ c2_region is defined and redirector_region is defined and c2_region != redirector_region }}"
+    # Check if only deploying one component (C2 only or redirector only)
+    single_component: "{{ c2_only | default(false) | bool or redirector_only | default(false) | bool }}"
+
+  tasks:
+    - name: Validate AWS credentials
+      assert:
+        that:
+          - aws_access_key is defined and aws_access_key != ""
+          - aws_secret_key is defined and aws_secret_key != ""
+        fail_msg: "AWS credentials are required"
+
+    - name: Skip shared infrastructure if using split regions
+      meta: end_play
+      when: split_regions | bool
+      
+    - name: Print infrastructure deployment info
+      debug:
+        msg: "Deploying shared infrastructure in {{ deployment_region }}"
+      when: not split_regions | bool and not single_component | bool
+      
+    - name: Check if deploying just C2 or just redirector
+      debug:
+        msg: "Skipping shared infrastructure for single component deployment ({{ 'C2 only' if c2_only | default(false) else 'Redirector only' }})"
+      when: single_component | bool
+      
+    - name: Skip shared infrastructure for single component deployment
+      meta: end_play
+      when: single_component | bool
+
+    - name: Create shared VPC
+      amazon.aws.ec2_vpc_net:
+        name: "{{ infra_name }}-vpc"
+        cidr_block: "10.0.0.0/16"
+        region: "{{ deployment_region }}"
+        tags:
+          Name: "{{ infra_name }}-vpc"
+          deployment_id: "{{ deployment_id }}"
+        state: present
+      register: vpc_result
+      when: not split_regions | bool and not single_component | bool
+
+    - name: Store shared VPC ID
+      set_fact:
+        shared_vpc_id: "{{ vpc_result.vpc.id }}"
+      when: not split_regions | bool and not single_component | bool and vpc_result is defined
+        
+    - name: Create internet gateway
+      amazon.aws.ec2_vpc_igw:
+        vpc_id: "{{ shared_vpc_id }}"
+        region: "{{ deployment_region }}"
+        state: present
+        tags:
+          Name: "{{ infra_name }}-igw"
+          deployment_id: "{{ deployment_id }}"
+      register: igw_result
+      when: not split_regions | bool and not single_component | bool and shared_vpc_id is defined
+
+    - name: Create subnet
+      amazon.aws.ec2_vpc_subnet:
+        vpc_id: "{{ shared_vpc_id }}"
+        cidr: "10.0.1.0/24"
+        region: "{{ deployment_region }}"
+        az: "{{ deployment_region }}a"
+        map_public: yes
+        tags:
+          Name: "{{ infra_name }}-subnet"
+          deployment_id: "{{ deployment_id }}"
+      register: subnet_result
+      when: not split_regions | bool and not single_component | bool and shared_vpc_id is defined
+
+    - name: Create routing table
+      amazon.aws.ec2_vpc_route_table:
+        vpc_id: "{{ shared_vpc_id }}"
+        region: "{{ deployment_region }}"
+        tags:
+          Name: "{{ infra_name }}-rtb"
+          deployment_id: "{{ deployment_id }}"
+        routes:
+          - dest: "0.0.0.0/0"
+            gateway_id: "{{ igw_result.gateway_id }}"
+        subnets:
+          - "{{ subnet_result.subnet.id }}"
+      register: route_table_result
+      when: not split_regions | bool and not single_component | bool and shared_vpc_id is defined and igw_result is defined and subnet_result is defined
+
+    - name: Write infrastructure info to state file
+      copy:
+        content: |
+          {
+            "vpc_id": "{{ shared_vpc_id }}",
+            "subnet_id": "{{ subnet_result.subnet.id }}",
+            "igw_id": "{{ igw_result.gateway_id }}",
+            "region": "{{ deployment_region }}",
+            "deployment_id": "{{ deployment_id }}"
+          }
+        dest: "infrastructure_state.json"
+        mode: "0600"
+      when: not split_regions | bool and not single_component | bool and shared_vpc_id is defined and subnet_result is defined and igw_result is defined
@@ -0,0 +1,65 @@
+---
+# Phishing infrastructure deployment playbook
+# This is a comprehensive playbook that handles all phishing components
+
+- name: Deploy Phishing Infrastructure
+  hosts: localhost
+  gather_facts: true
+  connection: local
+  vars_files:
+    - vars.yaml
+  
+  tasks:
+    - name: Display deployment information
+      debug:
+        msg: |
+          Deploying phishing infrastructure
+          Deployment ID: {{ deployment_id }}
+          Provider: {{ provider }}
+          Domain: {{ domain | default(phishing_domain) }}
+          Components: {{ deployment_type }}
+    
+    - name: Set deployment facts
+      set_fact:
+        deployment_timestamp: "{{ ansible_date_time.epoch }}"
+        phishing_deployment_results: {}
+        deployment_components: >-
+          {% set components = [] %}
+          {% if deployment_type in ['gophish_only', 'basic_phishing', 'advanced_phishing', 'full_phishing', 'fedramp_phishing'] %}
+            {% set _ = components.append('gophish') %}
+          {% endif %}
+          {% if deployment_type in ['mta_front_only', 'basic_phishing', 'advanced_phishing', 'full_phishing', 'ephemeral_mta'] %}
+            {% set _ = components.append('mta_front') %}
+          {% endif %}
+          {% if deployment_type in ['phishing_redirector_only', 'advanced_phishing', 'full_phishing'] %}
+            {% set _ = components.append('redirector') %}
+          {% endif %}
+          {% if deployment_type in ['phishing_webserver_only', 'full_phishing', 'fedramp_phishing'] %}
+            {% set _ = components.append('webserver') %}
+          {% endif %}
+          {{ components }}
+    
+    - name: Include provider-specific tasks
+      include_tasks: "{{ provider }}_phishing.yml"
+      when: deployment_components | length > 0
+    
+    - name: Ensure logs directory exists
+      file:
+        path: "../../logs"
+        state: directory
+        mode: '0755'
+      delegate_to: localhost
+    
+    - name: Save deployment information
+      template:
+        src: phishing_deployment_info.j2
+        dest: "{{ playbook_dir }}/logs/phishing_deployment_{{ deployment_id }}.json"
+      delegate_to: localhost
+      
+    - name: Display success message
+      debug:
+        msg: |
+          ✅ Phishing infrastructure deployment completed
+          Deployment ID: {{ deployment_id }}
+          Components deployed: {{ deployment_components | join(', ') }}
+          Check logs/phishing_deployment_{{ deployment_id }}.json for details
@@ -0,0 +1,14 @@
+---
+# VPC Cleanup Process with enhanced dependency handling
+# Removed detailed cleanup tasks for ENIs, RTs, IGWs, NATs, subnets, SGs to simplify deletion
+
+# Step X: Delete VPC directly
+- name: Delete VPC {{ vpc_id }}
+  amazon.aws.ec2_vpc_net:
+    region: "{{ aws_region }}"
+    vpc_id: "{{ vpc_id }}"
+    state: absent
+  retries: 5
+  delay: 15
+  register: vpc_delete_result
+  until: vpc_delete_result is success
@@ -0,0 +1,379 @@
+---
+# AWS Redirector Deployment Playbook
+
+- name: Deploy AWS redirector
+  hosts: localhost
+  gather_facts: false
+  connection: local
+  vars_files:
+    - vars.yaml
+  vars:
+    # Default values
+    ssh_user: "{{ ssh_user | default('ubuntu') }}"
+    aws_region: "{{ aws_region | default(aws_region_choices | random) }}"
+    instance_type: "{{ aws_instance_type | default('t2.micro') }}"
+    deployment_id: "{{ deployment_id | default('') }}"
+    redirector_name: "{{ redirector_name | default('r-' + deployment_id) }}"
+    effective_listen_port: "{{ shell_handler_port | default(4488) }}"
+    # Check for shared infrastructure
+    # Only use shared when C2 and redirector are in the same region
+    use_shared_infra: "{{ not (c2_region is defined and redirector_region is defined and c2_region != redirector_region) and not c2_only | default(false) | bool and not redirector_only | default(false) | bool }}"
+    # Ubuntu AMI IDs for different regions (Ubuntu 22.04 LTS)
+    ubuntu_ami_map:
+      us-east-1: "ami-0aa2b7722dc1b5612"
+      us-east-2: "ami-06c4532923d4ba1ec"
+      us-west-1: "ami-0573b70afecda915d"
+      us-west-2: "ami-0c79c59ac2c572b87"
+      eu-west-1: "ami-0694d931cee176e7d"
+      eu-west-2: "ami-0505148b3591e4c07"
+      eu-central-1: "ami-06dd92ecc74fdfb36"
+      ap-southeast-1: "ami-0df7a207adb9748c7"
+      ap-southeast-2: "ami-0df4b2961410d4cff"
+      ap-northeast-1: "ami-0014b5f031a76c1b1"
+      sa-east-1: "ami-0af6e9042ea5a4e3e"
+
+  tasks:
+    - name: Validate AWS credentials
+      assert:
+        that:
+          - aws_access_key is defined and aws_access_key != ""
+          - aws_secret_key is defined and aws_secret_key != ""
+        fail_msg: "AWS credentials are required"
+
+    # Set region for redirector - fix for noop task error
+    - name: Set region for redirector
+      set_fact:
+        aws_redirector_region: "{{ redirector_region | default(aws_region) }}"
+
+    # Load shared infrastructure state if available - fixed implementation
+    - name: Check for shared infrastructure state
+      block:
+        - name: Check if state file exists
+          stat:
+            path: "infrastructure_state_{{ deployment_id }}.json"
+          register: infra_state_file
+        
+        - name: Include vars if file exists
+          include_vars:
+            file: "infrastructure_state_{{ deployment_id }}.json"
+            name: shared_infra
+          when: infra_state_file.stat.exists | default(false)
+      when: use_shared_infra | bool
+
+    # After loading shared infrastructure state
+    - name: Validate shared VPC exists
+      amazon.aws.ec2_vpc_net_info:
+        region: "{{ shared_infra.region }}"
+        vpc_ids:
+          - "{{ shared_infra.vpc_id }}"
+      register: vpc_check
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+      ignore_errors: yes
+
+    - name: Delete stale infrastructure state file
+      file:
+        path: "infrastructure_state.json"
+        state: absent
+      when: use_shared_infra | bool and vpc_check.vpcs is defined and vpc_check.vpcs | length == 0
+
+    - name: Disable shared infrastructure when VPC doesn't exist
+      set_fact:
+        use_shared_infra: false
+      when: use_shared_infra | bool and vpc_check.vpcs is defined and vpc_check.vpcs | length == 0
+
+    - name: Set region variables from shared infra
+      set_fact:
+        aws_redirector_region: "{{ shared_infra.region | default(aws_region) }}"
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+        
+    - name: Set AMI ID for selected region
+      set_fact:
+        ami_id: "{{ ubuntu_ami_map[aws_redirector_region] | default(ubuntu_ami_map['us-east-1']) }}"
+      
+    # Create new infrastructure only if not using shared
+    - name: Create VPC
+      amazon.aws.ec2_vpc_net:
+        name: "{{ redirector_name }}-vpc"
+        cidr_block: "10.0.0.0/16"
+        region: "{{ aws_redirector_region }}"
+        tags:
+          Name: "{{ redirector_name }}-vpc"
+          deployment_id: "{{ deployment_id }}"
+        state: present
+      register: vpc_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create internet gateway for VPC
+      amazon.aws.ec2_vpc_igw:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        region: "{{ aws_redirector_region }}"
+        state: present
+        tags:
+          Name: "{{ redirector_name }}-igw"
+          deployment_id: "{{ deployment_id }}"
+      register: igw_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create subnet in VPC
+      amazon.aws.ec2_vpc_subnet:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        cidr: "10.0.1.0/24"
+        region: "{{ aws_redirector_region }}"
+        az: "{{ aws_redirector_region }}a"
+        map_public: yes
+        tags:
+          Name: "{{ redirector_name }}-subnet"
+          deployment_id: "{{ deployment_id }}"
+      register: subnet_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Create routing table for internet access
+      amazon.aws.ec2_vpc_route_table:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        region: "{{ aws_redirector_region }}"
+        tags:
+          Name: "{{ redirector_name }}-rtb"
+          deployment_id: "{{ deployment_id }}"
+        routes:
+          - dest: "0.0.0.0/0"
+            gateway_id: "{{ igw_result.gateway_id }}"
+        subnets:
+          - "{{ subnet_result.subnet.id }}"
+      register: route_table_result
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    # Set VPC ID based on shared or created
+    - name: Set VPC ID from shared infrastructure
+      set_fact:
+        vpc_id: "{{ shared_infra.vpc_id }}"
+        subnet_id: "{{ shared_infra.subnet_id }}"
+        redirector_vpc_id: "{{ shared_infra.vpc_id }}"  # Store for cleanup reference
+      when: use_shared_infra | bool and infra_state_file.stat.exists | default(false)
+
+    - name: Set VPC ID from created infrastructure
+      set_fact:
+        vpc_id: "{{ vpc_result.vpc.id }}"
+        subnet_id: "{{ subnet_result.subnet.id }}"
+        redirector_vpc_id: "{{ vpc_result.vpc.id }}"  # Store for cleanup reference
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    - name: Set default c2_ip for redirector-only deployments
+      set_fact:
+        c2_ip: "{{ operator_ip }}"
+      when: redirector_only | default(false) | bool and c2_ip is not defined
+
+    - name: Load c2_ip from infrastructure state 
+      block:
+        - name: Check if infrastructure state file exists
+          stat:
+            path: "infrastructure_state_{{ deployment_id }}.json"
+          register: infra_state_check
+        
+        - name: Load infrastructure state
+          include_vars:
+            file: "infrastructure_state_{{ deployment_id }}.json"
+            name: infra_state
+          when: infra_state_check.stat.exists
+        
+        - name: Set c2 IP from infrastructure state
+          set_fact:
+            c2_ip: "{{ infra_state.c2_ip | default(operator_ip) }}"
+          when: infra_state_check.stat.exists and infra_state.c2_ip is defined
+        
+        - name: Debug c2 IP
+          debug:
+            msg: "Using c2 IP: {{ c2_ip | default('undefined') }}"
+      when: c2_ip is undefined
+
+    - name: Default to operator IP if c2 IP is still undefined
+      set_fact:
+        c2_ip: "{{ operator_ip }}"
+      when: c2_ip is undefined
+
+    - name: Create security group for redirector
+      amazon.aws.ec2_security_group:
+        name: "{{ redirector_name }}-sg"
+        description: "Security group for redirector {{ redirector_name }}"
+        vpc_id: "{{ vpc_id }}"
+        region: "{{ aws_redirector_region }}"
+        rules:
+          # Management access only from operator IP
+          - proto: tcp
+            ports: 22
+            cidr_ip: "{{ operator_ip }}/32"
+          # Public-facing services are open to internet
+          - proto: tcp
+            ports:
+              - 80
+              - 443
+              - "{{ effective_listen_port }}"
+            cidr_ip: 0.0.0.0/0
+        rules_egress:
+          - proto: -1
+            cidr_ip: 0.0.0.0/0
+        state: present
+      register: security_group
+
+    # Save infrastructure state for reuse
+    - name: Save infrastructure state for reuse
+      copy:
+        content: |
+          {
+            "vpc_id": "{{ vpc_id }}",
+            "subnet_id": "{{ subnet_id }}",
+            "security_group_id": "{{ security_group.group_id }}",
+            "region": "{{ aws_redirector_region }}",
+            "deployment_id": "{{ deployment_id }}"
+          }
+        dest: "infrastructure_state_{{ deployment_id }}.json"
+      when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
+
+    # Generate or import SSH key for the deployment - FIXED KEY HANDLING
+    - name: Check if deployment SSH key already exists locally
+      stat:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+      register: ssh_key_file
+      
+    - name: Generate SSH key pair if it doesn't exist
+      block:
+        - name: Create SSH key pair
+          command: ssh-keygen -t rsa -b 2048 -f ~/.ssh/c2deploy_{{ deployment_id }} -N ""
+          args:
+            creates: "~/.ssh/c2deploy_{{ deployment_id }}"
+        
+        - name: Rename private key to .pem format
+          command: mv ~/.ssh/c2deploy_{{ deployment_id }} ~/.ssh/c2deploy_{{ deployment_id }}.pem
+          args:
+            creates: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+            removes: "~/.ssh/c2deploy_{{ deployment_id }}"
+      when: not ssh_key_file.stat.exists
+
+    - name: Ensure proper permissions on SSH key
+      file:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        mode: '0600'
+        state: file
+      
+    # Check if key pair exists in AWS
+    - name: Check if key pair exists in AWS
+      amazon.aws.ec2_key_info:
+        region: "{{ aws_redirector_region }}"
+        filters:
+          key-name: "c2deploy_{{ deployment_id }}"
+      register: existing_key_pair
+
+    # Import SSH key to AWS - FIXED CONDITION
+    - name: Import SSH key to AWS
+      amazon.aws.ec2_key:
+        name: "c2deploy_{{ deployment_id }}"
+        key_material: "{{ lookup('file', '~/.ssh/c2deploy_{{ deployment_id }}.pub') }}"
+        region: "{{ aws_redirector_region }}"
+        state: present
+      when: existing_key_pair.keypairs | length == 0
+
+    # Launch the redirector instance
+    - name: Launch redirector instance
+      amazon.aws.ec2_instance:
+        name: "{{ redirector_name }}"
+        key_name: "c2deploy_{{ deployment_id }}"
+        instance_type: "{{ instance_type | default('t2.micro') }}"
+        vpc_subnet_id: "{{ subnet_id }}"
+        security_groups:
+          - "{{ security_group.group_id }}"
+        image_id: "{{ ami_id }}"
+        region: "{{ aws_redirector_region }}"
+        state: present
+        wait: yes
+        volumes:
+          - device_name: "/dev/xvda"
+            ebs:
+              volume_size: 20
+              delete_on_termination: true
+        tags:
+          Name: "{{ redirector_name }}"
+          deployment_id: "{{ deployment_id }}"
+      register: redirector_instance
+
+    - name: Set redirector_ip for later use
+      set_fact:
+        redirector_ip: "{{ redirector_instance.instances[0].public_ip_address }}"
+        redirector_instance_id: "{{ redirector_instance.instances[0].instance_id }}"
+
+    - name: Display redirector instance details for debugging
+      debug:
+        msg:
+          - "Redirector IP: {{ redirector_ip }}"
+          - "Redirector Instance ID: {{ redirector_instance_id }}"
+          - "SSH User to use: {{ ssh_user }}"
+          - "SSH Key path: ~/.ssh/c2deploy_{{ deployment_id }}.pem"
+
+    - name: Wait for instance initialization
+      pause:
+        seconds: 120
+      when: redirector_instance.changed
+
+    - name: Set correct permissions on SSH key
+      file:
+        path: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        mode: "0600"
+
+    - name: Wait for redirector SSH to be available
+      wait_for:
+        host: "{{ redirector_ip }}"
+        port: 22
+        delay: 30
+        timeout: 300
+        state: started
+
+    - name: Add redirector to inventory
+      add_host:
+        name: "redirector"
+        groups: "redirectors"
+        ansible_host: "{{ redirector_ip }}"
+        ansible_user: "ubuntu"
+        ansible_ssh_private_key_file: "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        ansible_ssh_common_args: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes"
+        ansible_python_interpreter: "/usr/bin/python3"
+        shell_handler_port: "{{ effective_listen_port }}"
+        # Add necessary variables for redirector configuration
+        c2_ip: "{{ c2_ip }}"
+        domain: "{{ domain }}"
+        redirector_subdomain: "{{ redirector_subdomain }}"
+        havoc_teamserver_port: "{{ havoc_teamserver_port | default(40056) }}"
+        havoc_http_port: "{{ havoc_http_port | default(8080) }}"
+        havoc_https_port: "{{ havoc_https_port | default(443) }}"
+        zero_logs: "{{ zero_logs | default(true) }}"
+
+# Rest of the playbook for configuring the redirector
+- name: Configure redirector
+  hosts: redirectors
+  become: true
+  gather_facts: true
+  vars_files:
+    - vars.yaml
+  vars:
+    c2_ip: "{{ hostvars['localhost']['c2_ip'] | default('127.0.0.1') }}"
+    shell_handler_port: "{{ hostvars['localhost']['effective_listen_port'] }}"
+    
+  # Include the rest of your redirector configuration tasks here
+  tasks:    
+    - name: Include common redirector configuration tasks
+      include_tasks: "../../modules/redirectors/tasks/configure_redirector.yml"
+      
+    - name: Configure shell handler script with listening port
+      template:
+        src: "../../modules/c2/files/havoc_shell_handler.sh"
+        dest: "/root/Tools/shell_handler.sh"
+        mode: 0755
+      vars:
+        listen_port: "{{ effective_listen_port }}"
+      
+    - name: Print deployment summary
+      debug:
+        msg:
+          - "Redirector Deployment Complete!"
+          - "-----------------------------"
+          - "Redirector IP: {{ ansible_host }}"
+          - "Redirector Domain: {{ redirector_subdomain | default('cdn') }}.{{ domain }} (Update DNS A record)"
+          - "SSH Key: ~/.ssh/c2deploy_{{ hostvars['localhost']['deployment_id'] }}.pem"
+      when: not disable_summary | default(false)
@@ -0,0 +1,10 @@
+{
+  "deployment_id": "{{ deployment_id }}",
+  "deployment_type": "{{ deployment_type }}",
+  "provider": "{{ provider }}",
+  "domain": "{{ phishing_domain | default(domain) }}",
+  "timestamp": "{{ ansible_date_time.iso8601 }}",
+  "components": {{ deployment_components | to_json }},
+  "results": {{ phishing_deployment_results | default({}) | to_json }},
+  "status": "completed"
+}
@@ -0,0 +1,98 @@
+---
+# AWS provision tasks for one WEBRUNNER node
+# Called in a loop — loop_var: node_chunk
+# Requires: aws_access_key, aws_secret_key, aws_region, aws_instance_type,
+#           ssh_key_name, webrunner_name, deployment_id, operator_ip,
+#           scanner_ip_log, results_dir
+
+- name: Read public key for {{ node_chunk.node_name }}
+  slurp:
+    src: "~/.ssh/{{ ssh_key_name }}.pub"
+  register: wr_pubkey_aws
+
+- name: Import SSH key to AWS ({{ node_chunk.node_name }})
+  amazon.aws.ec2_key:
+    name: "{{ webrunner_name }}"
+    key_material: "{{ wr_pubkey_aws.content | b64decode | trim }}"
+    region: "{{ aws_region | default('us-east-1') }}"
+    aws_access_key: "{{ aws_access_key }}"
+    aws_secret_key: "{{ aws_secret_key }}"
+    state: present
+  ignore_errors: true
+
+- name: Create security group for {{ node_chunk.node_name }}
+  amazon.aws.ec2_security_group:
+    name: "wr-{{ deployment_id }}-sg"
+    description: "WEBRUNNER {{ deployment_id }} scanner nodes"
+    region: "{{ aws_region | default('us-east-1') }}"
+    aws_access_key: "{{ aws_access_key }}"
+    aws_secret_key: "{{ aws_secret_key }}"
+    rules:
+      - proto: tcp
+        ports: [22]
+        cidr_ip: "{{ operator_ip | default('0.0.0.0/0') }}/32"
+    rules_egress:
+      - proto: all
+        cidr_ip: "0.0.0.0/0"
+    tags:
+      Name: "wr-{{ deployment_id }}-sg"
+      DeploymentID: "{{ deployment_id }}"
+    state: present
+  register: wr_sg
+  ignore_errors: true
+
+- name: Launch EC2 instance {{ node_chunk.node_name }}
+  amazon.aws.ec2_instance:
+    name: "{{ node_chunk.node_name }}"
+    key_name: "{{ webrunner_name }}"
+    instance_type: "{{ aws_instance_type | default('t3.small') }}"
+    image_id: "{{ aws_ami | default('ami-0c55b159cbfafe1f0') }}"
+    region: "{{ aws_region | default('us-east-1') }}"
+    aws_access_key: "{{ aws_access_key }}"
+    aws_secret_key: "{{ aws_secret_key }}"
+    security_group: "wr-{{ deployment_id }}-sg"
+    network:
+      assign_public_ip: true
+    tags:
+      Name: "{{ node_chunk.node_name }}"
+      DeploymentID: "{{ deployment_id }}"
+      webrunner: "{{ webrunner_name }}"
+    wait: true
+    state: running
+  register: wr_ec2
+
+- name: Extract EC2 public IP
+  set_fact:
+    wr_node_ip: "{{ wr_ec2.instances[0].public_ip_address }}"
+
+- name: Log scanner IP
+  lineinfile:
+    path: "{{ scanner_ip_log }}"
+    line: "{{ node_chunk.node_name }}: {{ wr_node_ip }}"
+    create: true
+
+- name: Wait for SSH on {{ node_chunk.node_name }} ({{ wr_node_ip }})
+  wait_for:
+    host: "{{ wr_node_ip }}"
+    port: 22
+    delay: 30
+    timeout: 300
+
+- name: Add {{ node_chunk.node_name }} to inventory
+  add_host:
+    name: "{{ wr_node_ip }}"
+    groups: webrunner_nodes
+    ansible_host: "{{ wr_node_ip }}"
+    ansible_user: admin
+    ansible_ssh_private_key_file: "~/.ssh/{{ ssh_key_name }}"
+    ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
+    node_name: "{{ node_chunk.node_name }}"
+    node_cidrs: "{{ node_chunk.cidrs }}"
+    node_ip_count: "{{ node_chunk.ip_count }}"
+    node_idx: "{{ node_chunk.idx }}"
+    ec2_instance_id: "{{ wr_ec2.instances[0].instance_id }}"
+    provider: aws
+
+- name: Show {{ node_chunk.node_name }} ready
+  debug:
+    msg: "AWS node ready: {{ node_chunk.node_name }} @ {{ wr_node_ip }} ({{ node_chunk.ip_count | int | string }} IPs)"