From bc30805c7d089b033c734a358241b43dc1b6e91e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 17 Apr 2023 13:18:10 +0200 Subject: [PATCH 1/2] [enh] exclude .well-known subpaths from conflict checks --- src/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index 91b55b39d..0f1e74f37 100644 --- a/src/app.py +++ b/src/app.py @@ -2869,7 +2869,7 @@ def _get_conflicting_apps(domain, path, ignore_app=None): for p, a in apps_map[domain].items(): if a["id"] == ignore_app: continue - if path == p or path == "/" or p == "/": + if path == p or ( not path.startswith("/.well-known/") and path == "/" ) or ( not path.startswith("/.well-known/") and p == "/" ): conflicts.append((p, a["id"], a["label"])) return conflicts From 36b9188aec41b1dbf0ad32e7b046d033168dd250 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Thu, 15 Aug 2024 20:41:09 +0200 Subject: [PATCH 2/2] Update src/app.py Co-authored-by: tituspijean --- src/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index 0f1e74f37..a9b8796f5 100644 --- a/src/app.py +++ b/src/app.py @@ -2869,7 +2869,7 @@ def _get_conflicting_apps(domain, path, ignore_app=None): for p, a in apps_map[domain].items(): if a["id"] == ignore_app: continue - if path == p or ( not path.startswith("/.well-known/") and path == "/" ) or ( not path.startswith("/.well-known/") and p == "/" ): + if path == p or ( not path.startswith("/.well-known/") and ( path == "/" or p == "/" ) ): conflicts.append((p, a["id"], a["label"])) return conflicts