diff --git a/src/controller/PlayerController.py b/src/controller/PlayerController.py index bfb0362..f173010 100644 --- a/src/controller/PlayerController.py +++ b/src/controller/PlayerController.py @@ -6,7 +6,7 @@ from flask import Flask, render_template, redirect, request, url_for, send_from_ from src.service.ModelStore import ModelStore from src.interface.ObController import ObController from src.util.utils import get_safe_cron_descriptor -from src.util.UtilNetwork import get_ip_address, host_to_safe_ipaddr +from src.util.UtilNetwork import get_ip_address, get_safe_remote_addr from src.model.enum.AnimationSpeed import animation_speed_duration @@ -90,7 +90,7 @@ class PlayerController(ObController): def _get_dynamic_playlist_id(self, playlist_slug_or_id: Optional[str]) -> str: if not playlist_slug_or_id and self._model_store.variable().get_one_by_name('fleet_player_enabled'): node_player = self._model_store.node_player().get_one_by("host = '{}' and enabled = {}".format( - host_to_safe_ipaddr(request.headers.getlist("Host")[0]), + get_safe_remote_addr(request.remote_addr), True )) diff --git a/src/util/UtilNetwork.py b/src/util/UtilNetwork.py index f4004bb..019640c 100644 --- a/src/util/UtilNetwork.py +++ b/src/util/UtilNetwork.py @@ -35,9 +35,7 @@ def get_ip_address() -> Optional[str]: return get_network_ipaddr() -def host_to_safe_ipaddr(host: str) -> str: - host = host.split(':')[0] - - if host == '127.0.0.1' or host == 'localhost': +def get_safe_remote_addr(remote_addr: str) -> str: + if remote_addr == '127.0.0.1' or remote_addr == 'localhost': return get_ip_address() - return host + return remote_addr