github/prometheus-pve-sd
0
0
Fork 0
mirror of https://github.com/thegeeklab/prometheus-pve-sd.git synced 2024-06-02 16:09:41 +02:00
Code Issues Projects Releases Wiki Activity

Use ip_address.is_loopback and ip_address.is_link_local for validation

Browse Source
This commit is contained in:
Mathias Petermann 2022-02-26 18:40:07 +01:00
parent 43e45fae38
commit 9bc3d96bdd
No known key found for this signature in database
GPG Key ID: DADC3DF6E81B66C1
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
prometheuspvesd/discovery.py
View File

@ -87,18 +87,10 @@ class Discovery():
def _get_ip_addresses(self, pve_type, pve_node, vmid):
def validate_ipv4(address: object) -> object:
def validate_ip(address: object) -> object:
try:
if ipaddress.ip_address(address) not in ipaddress.ip_network("127.0.0.0/8"):
return address
except ValueError:
return False
def validate_ipv6(address: object) -> object:
try:
# Make sure to skip loopback addresses and local-link addresses
if ipaddress.ip_address(address) not in ipaddress.ip_network("::1/128") \
and ipaddress.ip_address(address) not in ipaddress.ip_network("fe80::/10"):
if not ipaddress.ip_address(address).is_loopback \
and not ipaddress.ip_address(address).is_link_local:
return address
except ValueError:
return False
@ -122,9 +114,9 @@ class Discovery():
for network in networks:
for ip_address in network["ip-addresses"]:
if ip_address["ip-address-type"] == "ipv4":
ipv4_address = validate_ipv4(ip_address["ip-address"])
ipv4_address = validate_ip(ip_address["ip-address"])
elif ip_address["ip-address-type"] == "ipv6":
ipv6_address = validate_ipv6(ip_address["ip-address"])
ipv6_address = validate_ip(ip_address["ip-address"])
if not ipv4_address:
try: