YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added some caching on get_public_ips

Browse source
This commit is contained in:
theo@manjaro 2022-07-04 10:48:20 +02:00
parent eb7ce39432
commit 53941d7657
1 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/utils/network.py
View file

@ -40,28 +40,6 @@ def is_ip_local(ip):
def get_public_ip(protocol=4): def get_public_ip(protocol=4):
assert protocol in [4, 6], (
f"Invalid protocol version for get_public_ip: {protocol}, expected 4 or 6"
)
cache_file = f"/var/cache/yunohost/ipv{protocol}"
cache_duration = 120 # 2 min
if (
os.path.exists(cache_file)
and abs(os.path.getctime(cache_file) - time.time()) < cache_duration
):
ip = read_file(cache_file).strip()
ip = ip if ip else None # Empty file (empty string) means there's no IP
logger.debug(f"Reusing IPv{protocol} from cache: {ip}")
else:
ip = get_public_ip_from_remote_server(protocol)
logger.debug(f"IP fetched: {protocol}")
write_to_file(cache_file, ip or "")
return ip
def get_public_ip_from_remote_server(protocol=4):
"""Retrieve the public IP address from ip.yunohost.org or another Server""" """Retrieve the public IP address from ip.yunohost.org or another Server"""
# We can know that ipv6 is not available directly if this file does not exists # We can know that ipv6 is not available directly if this file does not exists
@ -104,27 +82,48 @@ def get_public_ips(protocol=4):
Note: this function doesn't guarantee to return all public IPs in use by the server. Note: this function doesn't guarantee to return all public IPs in use by the server.
""" """
assert protocol in [4, 6], (
f"Invalid protocol version for get_public_ip: {protocol}, expected 4 or 6"
)
ip_url_yunohost_tab = settings_get("security.ipmirrors.v"+str(protocol)).split(",") cache_file = f"/var/cache/yunohost/ipv{protocol}"
ip_count = {} # Count the number of times an IP has appeared cache_duration = 120 # 2 min
if (
os.path.exists(cache_file)
and abs(os.path.getctime(cache_file) - time.time()) < cache_duration
):
ips = read_file(cache_file).strip()
ips = ips if ips else None # Empty file (empty string) means there's no IP
logger.debug(f"Reusing IPv{protocol} from cache: {ips}")
if ips:
ips = ips.split(",") # If there's multiple
else:
ip_url_yunohost_tab = settings_get("security.ipmirrors.v"+str(protocol)).split(",")
ip_count = {} # Count the number of times an IP has appeared
# Check URLS # Check URLS
for url in ip_url_yunohost_tab[:3]: for url in ip_url_yunohost_tab[:3]:
logger.debug(f"Fetching IP from {url}") logger.debug(f"Fetching IP from {url}")
try: try:
ip = download_text(url, timeout=15).strip() ip = download_text(url, timeout=15).strip()
if ip in ip_count.keys(): if ip in ip_count.keys():
ip_count[ip]+=1 ip_count[ip]+=1
else: else:
ip_count[ip]=1 ip_count[ip]=1
except Exception as e: except Exception as e:
logger.debug( logger.debug(
f"Could not get public IPv{protocol} from {url} : {e}" f"Could not get public IPv{protocol} from {url} : {e}"
) )
ip_list_with_count = [ (ip,ip_count[ip]) for ip in ip_count ] ip_list_with_count = [ (ip,ip_count[ip]) for ip in ip_count ]
ip_list_with_count.sort(key=lambda x: x[1]) # Sort by frequency ip_list_with_count.sort(key=lambda x: x[1]) # Sort by frequency
return [ x[0] for x in ip_list_with_count ] ips = [ x[0] for x in ip_list_with_count ]
logger.debug(f"IP fetched: {protocol}")
write_to_file(cache_file, ",".join(ips) or "")
return ips
def get_network_interfaces(): def get_network_interfaces():