hiddifypanel 9.0.0.dev40__py3-none-any.whl → 9.0.0.dev42__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev40
+9.0.0.dev42

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='9.0.0.dev40'
+__version__='9.0.0.dev42'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-01-09','%Y-%m-%d')

hiddifypanel/panel/admin/SettingAdmin.py

@@ -77,7 +77,7 @@ class SettingAdmin(FlaskView):
                 # print(cat,vs)
 
             merged_configs = {**old_configs, **changed_configs}
-            if len(set([merged_configs[ConfigEnum.proxy_path], merged_configs[ConfigEnum.proxy_path_client], merged_configs[ConfigEnum.proxy_path_admin])) != 3:
+            if len(set([merged_configs[ConfigEnum.proxy_path], merged_configs[ConfigEnum.proxy_path_client], merged_configs[ConfigEnum.proxy_path_admin]])) != 3:
                 flash(_("ProxyPath is already used! use different proxy path"), 'error')
                 return render_template('config.html', form=form)
             # for k in [ConfigEnum.reality_server_names,ConfigEnum.reality_fallback_domain]:

hiddifypanel/panel/hiddify.py

@@ -178,12 +178,12 @@ def is_admin_role(role: Role):
 
 def is_admin_proxy_path() -> bool:
     proxy_path = g.get('proxy_path') or get_proxy_path_from_url(request.url)
-    return proxy_path in [hconfig(ConfigEnum.proxy_path_admin), hconfig(ConfigEnum.proxy_path)]
+    return proxy_path in [hconfig(ConfigEnum.proxy_path_admin)] or (proxy_path in [hconfig(ConfigEnum.proxy_path)] and "/admin/" in request.path)
 
 
 def is_client_proxy_path() -> bool:
     proxy_path = g.get('proxy_path') or get_proxy_path_from_url(request.url)
-    return proxy_path in [hconfig(ConfigEnum.proxy_path_client), hconfig(ConfigEnum.proxy_path)]
+    return proxy_path in [hconfig(ConfigEnum.proxy_path_client)] or (proxy_path in [hconfig(ConfigEnum.proxy_path)] and "/admin/" not in request.path)
 
 
 def proxy_path_validator(proxy_path):
@@ -896,7 +896,6 @@ def get_account_panel_link(account: BaseAccount, host: str, is_https: bool = Tru
     return link
 
 
-
 def is_valid_uuid(val: str, version: int | None = None):
     try:
         uuid.UUID(val, version=version)