From d205c9f17118e10aa93850e48a5d55b20fe2ccdb Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 28 Apr 2022 11:27:34 +0200 Subject: [PATCH 1/2] [UI] use safe defaults for fetching cluster logs --- ui/operator_ui/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py index 579f0e7d8..91f5d49d9 100644 --- a/ui/operator_ui/main.py +++ b/ui/operator_ui/main.py @@ -961,6 +961,8 @@ def get_operator_get_logs(worker: int): @app.route('/operator/clusters///logs') @authorize def get_operator_get_logs_per_cluster(namespace: str, cluster: str): + team, cluster_name = cluster.split('-', 1) + # team id might contain hivens, try to find correct team name user_teams = get_teams_for_user(session.get('user_name', '')) for user_team in user_teams: if cluster.find(user_team) == 0: From 8624343bedc6f7ea13dc2a97284bc6a9ce9b21be Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 28 Apr 2022 12:02:01 +0200 Subject: [PATCH 2/2] minor changes --- ui/operator_ui/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py index 91f5d49d9..c34ffd4f2 100644 --- a/ui/operator_ui/main.py +++ b/ui/operator_ui/main.py @@ -962,12 +962,12 @@ def get_operator_get_logs(worker: int): @authorize def get_operator_get_logs_per_cluster(namespace: str, cluster: str): team, cluster_name = cluster.split('-', 1) - # team id might contain hivens, try to find correct team name + # team id might contain hyphens, try to find correct team name user_teams = get_teams_for_user(session.get('user_name', '')) for user_team in user_teams: - if cluster.find(user_team) == 0: + if cluster.find(user_team + '-') == 0: team = cluster[:len(user_team)] - cluster_name = cluster[len(user_team)+1:] + cluster_name = cluster[len(user_team + '-'):] break return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')