ansible-collections/phpipam_scan_agent
2
0
Fork 0
Code Issues 10 Pull Requests Actions Projects Releases 7 Wiki Activity

fix: Use updated scan structure

Browse Source 
!1
This commit is contained in:
Jon Lockwood
2024-02-20 15:28:36 +09:30
parent 30947877e6
commit 68f43bf70f
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/server.yaml
View File

@ -38,7 +38,9 @@
SELECT id, subnet FROM subnets WHERE SELECT id, subnet FROM subnets WHERE
scanAgent='{{ mysql_query_agent_details.query_result[0][0].id }}' scanAgent='{{ mysql_query_agent_details.query_result[0][0].id }}'
and and
subnet='{{ inbound_data.scan[0].subnet | ip2ipam }}' subnet='{{ (inbound_data.scan.subnet | split('/'))[0] | ip2ipam }}'
and
mask = '{{ (inbound_data.scan.subnet | split('/'))[1] | int }}'
single_transaction: true single_transaction: true
register: mysql_query_agent_subnets register: mysql_query_agent_subnets

16
playbooks/tasks/scan_subnet.yaml
View File

@ -26,17 +26,23 @@
subnet_scan_results: |- subnet_scan_results: |-
[ [
{% for scanned_host in ((nmap_scan.stdout | ansible.utils.from_xml) | from_yaml).nmaprun.host %} {% for scanned_host in ((nmap_scan.stdout | ansible.utils.from_xml) | from_yaml).nmaprun.host %}
{% if scanned_host.address[0]['@addrtype'] | default('') == 'ipv4' %} {% if
scanned_host.address[0]['@addrtype'] | default('') == 'ipv4'
or
scanned_host.address['@addrtype'] | default('') == 'ipv4'
%}
{ {
{% for cached_host in cached_subnet -%} {% for cached_host in cached_subnet | default([]) -%}
{%- if cached_host.ip == scanned_host.address[0]['@addr'] -%} {%- if cached_host.ip == scanned_host.address['@addr'] | default(scanned_host.address[0]['@addr']) -%}
"id": {{ cached_host.id }}, "id": {{ cached_host.id }},
{%- endif -%} {%- endif -%}
{%- endfor %} {%- endfor %}
"subnetId": "{{ subnet.id }}", "subnetId": "{{ subnet.id }}",
"ip": "{{ scanned_host.address[0]['@addr'] }}", "ip": "{{ scanned_host.address['@addr'] | default(scanned_host.address[0]['@addr']) }}",
"lastSeen": "{{ nmap_scan.start }}", "lastSeen": "{{ nmap_scan.start }}",
"mac": "{{ scanned_host.address[1]['@addr'] | upper }}" {% if scanned_host.address['@addrtype'] | default(scanned_host.address[1]['@addrtype']) == 'mac' %}
"mac": "{{ scanned_host.address['@addr'] | default(scanned_host.address[1]['@addr']) | upper }}"
{% endif %}
}, },
{% endif %} {% endif %}
{% endfor %} {% endfor %}