Remove redundant naming prompt and fix Ansible empty-prefix command failure in webrunner

- Replace get_deployment_name_with_options() call with auto-derived wr-{deployment_id}; user already entered engagement name, second naming menu was noise
- Split run_scan.yml single command with conditional Jinja prefix into two when-gated tasks; empty-string prefix from use_tor=false caused Ansible to fail with return code 4
This commit is contained in:
n0mad1k
2026-04-30 16:55:43 -04:00
parent 98c3fc8d9d
commit 81098d9111
2 changed files with 20 additions and 8 deletions
+3 -7
View File
@@ -21,7 +21,7 @@ from utils.common import (
)
from utils.provider_utils import select_provider, gather_provider_config
from utils.ssh_utils import generate_ssh_key
from utils.naming_utils import get_deployment_name_with_options, show_naming_relationship
from utils.naming_utils import show_naming_relationship
from utils.deployment_engine import execute_playbook, set_provider_environment
from utils.chunk_utils import get_country_cidrs, chunk_cidrs, ip_count
from utils.provider_rates import (
@@ -223,12 +223,8 @@ def gather_webrunner_parameters() -> dict | None:
config['deployment_type'] = 'webrunner'
config['webrunner_deployment'] = True
# Naming
config['webrunner_name'] = get_deployment_name_with_options(
deployment_type='webrunner',
deployment_id=config['deployment_id'],
prefix='wr-',
)
# Naming — auto-derive from deployment_id, no second prompt
config['webrunner_name'] = f"wr-{config['deployment_id']}"
# SSH key
ssh_key_path = generate_ssh_key(config['webrunner_name'])
+17 -1
View File
@@ -11,7 +11,6 @@
- name: Run scan on {{ node_name }} ({{ node_ip_count }} IPs, mode={{ scan_mode }})
command: >
{{ 'proxychains4 -f /etc/proxychains4.conf' if (use_tor | default(false) | bool) else '' }}
python3 /root/webrunner/node_scanner.py
--mode {{ scan_mode }}
--ports {{ ports_str }}
@@ -23,6 +22,23 @@
async: 43200
poll: 60
ignore_errors: true
when: not (use_tor | default(false) | bool)
- name: Run scan via Tor on {{ node_name }} ({{ node_ip_count }} IPs, mode={{ scan_mode }})
command: >
proxychains4 -f /etc/proxychains4.conf
python3 /root/webrunner/node_scanner.py
--mode {{ scan_mode }}
--ports {{ ports_str }}
--rate {{ masscan_rate }}
--node-name {{ node_name }}
args:
chdir: /root/webrunner
register: scan_output
async: 43200
poll: 60
ignore_errors: true
when: use_tor | default(false) | bool
- name: Show scan output for {{ node_name }}
debug: