3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: improve private ip detection 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-08-19 20:01:02 -04:00
parent 4efb6575b7
commit 12161d12f5
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
moonraker/components/machine.py
View File

@ -73,6 +73,7 @@ class Machine:
sudo_template = config.gettemplate("sudo_password", None) sudo_template = config.gettemplate("sudo_password", None)
if sudo_template is not None: if sudo_template is not None:
self._sudo_password = sudo_template.render() self._sudo_password = sudo_template.render()
self._public_ip = ""
self.system_info: Dict[str, Any] = { self.system_info: Dict[str, Any] = {
'python': { 'python': {
"version": sys.version_info, "version": sys.version_info,
@ -145,6 +146,10 @@ class Machine:
sys_info_msg += f"\n {key}: {val}" sys_info_msg += f"\n {key}: {val}"
self.server.add_log_rollover_item('system_info', sys_info_msg, log=log) self.server.add_log_rollover_item('system_info', sys_info_msg, log=log)
@property
def public_ip(self) -> str:
return self._public_ip
def get_system_provider(self): def get_system_provider(self):
return self.sys_provider return self.sys_provider
@ -443,8 +448,10 @@ class Machine:
logging.exception("Error processing network update") logging.exception("Error processing network update")
return return
prev_network = self.system_info.get('network', {}) prev_network = self.system_info.get('network', {})
if notify and network != prev_network: if network != prev_network:
self.server.send_event("machine:net_state_changed", network) self._find_public_ip()
if notify:
self.server.send_event("machine:net_state_changed", network)
self.system_info['network'] = network self.system_info['network'] = network
async def get_public_network(self) -> Dict[str, Any]: async def get_public_network(self) -> Dict[str, Any]:
@ -469,7 +476,7 @@ class Machine:
continue continue
fam = addrinfo["family"] fam = addrinfo["family"]
addr = addrinfo["address"] addr = addrinfo["address"]
if fam == "ipv6" and src_ip is None: if fam == "ipv6" and not src_ip:
ip = ipaddress.ip_address(addr) ip = ipaddress.ip_address(addr)
if ip.is_global: if ip.is_global:
return { return {
@ -489,7 +496,7 @@ class Machine:
"family": "" "family": ""
} }
def _find_public_ip(self) -> Optional[str]: def _find_public_ip(self) -> str:
# Check for an IPv4 Source IP # Check for an IPv4 Source IP
# NOTE: It should also be possible to extract this from # NOTE: It should also be possible to extract this from
# the routing table, ie: ip -json route # the routing table, ie: ip -json route
@ -497,23 +504,28 @@ class Machine:
# metric. Might also be able to get IPv6 info from this. # metric. Might also be able to get IPv6 info from this.
# However, it would be better to use NETLINK for this rather # However, it would be better to use NETLINK for this rather
# than run another shell command # than run another shell command
src_ip: Optional[str] = None src_ip: str = ""
# First attempt: use "broadcast" to find the local IP # First attempt: use "broadcast" to find the local IP
addr_info = [("<broadcast>", 0, True), ("10.255.255.255", 1, False)] addr_info = [
for (addr, port, bcast) in addr_info: ("<broadcast>", 0, socket.AF_INET),
s = socket.socket( ("10.255.255.255", 1, socket.AF_INET),
socket.AF_INET, socket.SOCK_DGRAM | socket.SOCK_NONBLOCK ("2001:db8::1234", 1, socket.AF_INET6),
) ]
for (addr, port, fam) in addr_info:
s = socket.socket(fam, socket.SOCK_DGRAM | socket.SOCK_NONBLOCK)
try: try:
if bcast: if addr == "<broadcast>":
s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
s.connect((addr, port)) s.connect((addr, port))
src_ip = s.getsockname()[0] src_ip = s.getsockname()[0]
except Exception: except Exception:
continue continue
logging.info(f"Detected Local IP: {src_ip}") logging.info(f"Detected Local IP: {src_ip}")
return src_ip break
if src_ip is None: if src_ip != self._public_ip:
self._public_ip = src_ip
self.server.send_event("machine:public_ip_changed", src_ip)
if not src_ip:
logging.info("Failed to detect local IP address") logging.info("Failed to detect local IP address")
return src_ip return src_ip