mirror of
https://github.com/trailofbits/algo.git
synced 2026-08-17 21:25:50 +02:00
de11b86060
Add pre-flight check in main.yml that catches missing cryptography/SECP384R1
before deployment starts, replacing the cryptic error from community.crypto
internals with an actionable message pointing users to run ./algo or uv sync.
Root cause of the CI ipsec/both test failures: cryptography 46.0.5 wraps
the ec module with _ModuleWithDeprecations (for SECT curve deprecation),
which breaks community.crypto's ec.__dict__.get("SECP384R1") lookup.
The fix in community.crypto 3.1.1 uses getattr() instead.
Changes:
- Add SECP384R1 pre-flight check to main.yml (conditional on ipsec_enabled)
- Add cryptography>=42.0.0 as explicit dependency in pyproject.toml
- Upgrade community.crypto to >=3.1.1 (fixes __dict__ vs getattr bug)
- Add ansible-galaxy collection install step to CI
- Use venv Python interpreter for local deployments in add_host tasks
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
60 lines
2.4 KiB
YAML
60 lines
2.4 KiB
YAML
---
|
|
- name: Set subjectAltName as a fact
|
|
set_fact:
|
|
IP_subject_alt_name: "{{ (IP_subject_alt_name if algo_provider == 'local' else cloud_instance_ip) | lower }}"
|
|
|
|
- name: Add the server to an inventory group
|
|
add_host:
|
|
name: "{% if cloud_instance_ip == 'localhost' %}localhost{% else %}{{ cloud_instance_ip }}{% endif %}"
|
|
groups: vpn-host
|
|
ansible_connection: "{% if cloud_instance_ip == 'localhost' %}local{% else %}ssh{% endif %}"
|
|
ansible_ssh_user: "{{ ansible_ssh_user | default('root') }}"
|
|
ansible_ssh_port: "{{ ansible_ssh_port | default(22) }}"
|
|
ansible_python_interpreter: "{% if cloud_instance_ip == 'localhost' %}{{ ansible_playbook_python }}{% else %}/usr/bin/python3{% endif %}"
|
|
algo_provider: "{{ algo_provider }}"
|
|
algo_server_name: "{{ algo_server_name }}"
|
|
algo_ondemand_cellular: "{{ algo_ondemand_cellular }}"
|
|
algo_ondemand_wifi: "{{ algo_ondemand_wifi }}"
|
|
algo_ondemand_wifi_exclude: "{{ algo_ondemand_wifi_exclude }}"
|
|
algo_dns_adblocking: "{{ algo_dns_adblocking }}"
|
|
algo_ssh_tunneling: "{{ algo_ssh_tunneling }}"
|
|
algo_store_pki: "{{ algo_store_pki }}"
|
|
IP_subject_alt_name: "{{ IP_subject_alt_name }}"
|
|
alternative_ingress_ip: "{{ alternative_ingress_ip | default(omit) }}"
|
|
cloudinit: "{{ cloudinit | default(false) }}"
|
|
|
|
- name: Additional variables for the server
|
|
add_host:
|
|
name: "{% if cloud_instance_ip == 'localhost' %}localhost{% else %}{{ cloud_instance_ip }}{% endif %}"
|
|
ansible_ssh_private_key_file: "{{ SSH_keys.private_tmp }}"
|
|
when: algo_provider != 'local'
|
|
|
|
- name: Wait until SSH becomes ready...
|
|
wait_for:
|
|
port: "{{ ansible_ssh_port | default(22) }}"
|
|
host: "{{ cloud_instance_ip }}"
|
|
search_regex: OpenSSH
|
|
delay: 10
|
|
timeout: 320
|
|
state: present
|
|
when: cloud_instance_ip != "localhost"
|
|
|
|
- name: Mount tmpfs
|
|
import_tasks: tmpfs/main.yml
|
|
when:
|
|
- pki_in_tmpfs
|
|
- not algo_store_pki
|
|
- ansible_system == "Darwin" or ansible_system == "Linux"
|
|
|
|
- debug:
|
|
var: IP_subject_alt_name
|
|
|
|
- name: Wait for target connection to become reachable/usable
|
|
wait_for_connection:
|
|
delay: 10 # Wait 10 seconds before first attempt (conservative)
|
|
timeout: 480 # Reduce from 600 to 480 seconds (8 minutes - safer)
|
|
sleep: 10 # Check every 10 seconds (less aggressive polling)
|
|
delegate_to: "{{ item }}"
|
|
loop: "{{ groups['vpn-host'] }}"
|
|
when: cloud_instance_ip != "localhost"
|