hiddifypanel 9.0.0.dev35__tar.gz → 9.0.0.dev37__tar.gz

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/HISTORY.md

@@ -195,6 +195,12 @@
 
 #### Fix
 
+* Bug. 
+
+* Admin link bug. 
+
+* Bug. 
+
 * Bug in singbox config. 
 
 * Limited length of username and password. 
@@ -1003,6 +1009,14 @@ It is a visual improvement to have all users aligned in the table._
 
 
 
+## 8.8.7 (2024-01-09)
+
+#### Fix
+
+* Singbox 1.8 issue. 
+
+
+
 ## 8.8.6 (2024-01-09)
 
 #### Fix

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 9.0.0.dev35
+Version: 9.0.0.dev37
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-9.0.0.dev37/hiddifypanel/VERSION

@@ -0,0 +1 @@
+9.0.0.dev37

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/VERSION.py

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

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -7,7 +7,7 @@ from .adminlte import AdminLTEModelView
 from flask_babelex import gettext as __
 from flask_babelex import lazy_gettext as _
 from hiddifypanel.panel import hiddify
-from flask import Markup, current_app
+from flask import Markup, current_app, request
 from flask import g
 import datetime
 from wtforms import SelectField
@@ -93,7 +93,7 @@ class AdminstratorAdmin(AdminLTEModelView):
         d = request.host
         if d:
 
-            href = hiddify.get_account_panel_link(model, d) + f'/#{model.name}'
+            href = hiddify.get_account_panel_link(model, d) + f'#{model.name}'
             link = f"<a target='_blank' class='share-link' data-copy='{href}' href='{href}'>{model.name} <i class='fa-solid fa-arrow-up-right-from-square'></i></a>"
             if model.parent_admin:
                 return Markup(model.parent_admin.name + "&rlm;&lrm; / &rlm;&lrm;"+link)

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/panel/common.py

@@ -107,8 +107,10 @@ def init_app(app: APIFlask):
                 #     values['proxy_path'] = hconfig(ConfigEnum.proxy_path)
             elif hiddify.is_user_panel_call():
                 values['proxy_path'] = hconfig(ConfigEnum.proxy_path_client)
-            elif g.is_admin:
+            elif hiddify.is_admin_role(g.account.role):
                 values['proxy_path'] = hconfig(ConfigEnum.proxy_path_admin)
+            else:
+                values['proxy_path'] = g.proxy_path
 
         if hiddify.is_api_v1_call(endpoint=endpoint) and 'admin_uuid' not in values:
             values['admin_uuid'] = AdminUser.get_super_admin_uuid()

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/panel/common_bp/login.py

@@ -52,7 +52,7 @@ class LoginView(FlaskView):
         form = LoginForm()
         if form.validate_on_submit():
             uuid = form.secret_textbox.data.strip()
-            if login_by_uuid(uuid,hiddify.is_admin_proxy_path()):
+            if login_by_uuid(uuid, hiddify.is_admin_proxy_path()):
                 return redirect(f'/{g.proxy_path}/')
         flash(_('config.validation-error'), 'danger')
         return render_template('login.html', form=LoginForm())
@@ -121,8 +121,8 @@ class LoginView(FlaskView):
     @route('/manifest.webmanifest')
     @login_required()
     def create_pwa_manifest(self):
-        domain = urlparse(request.base_url).hostname
-        name = (domain if g.is_admin else g.user.name)
+        domain = request.host
+        name = (domain if hiddify.is_admin_panel_call() else g.account.name)
         return jsonify({
             "name": f"Hiddify {name}",
             "short_name": f"{name}"[:12],
@@ -130,8 +130,7 @@ class LoginView(FlaskView):
             "background_color": "#1a1b21",
             "display": "standalone",
             "scope": f"/",
-            # "start_url": hiddify.hutils.utils.add_basic_auth_to_url(f"https://{domain}/{g.proxy_path}/?pwa=true", g.account.username, g.account.password),
-            "start_url": f"https://{domain}/{g.proxy_path}/{g.account.uuid}/?pwa=true",
+            "start_url": hiddify.get_account_panel_link(g.account, domain) +"?pwa=true",
             "description": "Hiddify, for a free Internet",
             "orientation": "any",
             "icons": [

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/panel/hiddify.py

@@ -72,39 +72,6 @@ def exec_command(cmd, cwd=None):
         print(e)
 
 
-def user_auth(function):
-    def wrapper(*args, **kwargs):
-        if g.account.uuid == None:
-            return jsonify({"error": "auth failed"})
-        if not g.account:
-            return jsonify({"error": "user not found"})
-        if g.account and g.is_admin:
-            return jsonify({"error": "admin can not access user page. add /admin/ to your url"})
-        return function()
-
-    return wrapper
-
-
-def super_admin(function):
-    def wrapper(*args, **kwargs):
-        if g.account.mode not in [AdminMode.super_admin]:
-            abort(403, __("Access Denied"))
-            # return jsonify({"error": "auth failed"})
-        return function(*args, **kwargs)
-
-    return wrapper
-
-
-def admin(function):
-    def wrapper(*args, **kwargs):
-        if g.account.mode not in [AdminMode.admin, AdminMode.super_admin]:
-            abort(403, __("Access Denied"))
-            # return jsonify({"error": "auth failed"})
-
-        return function(*args, **kwargs)
-    return wrapper
-
-
 def api_v1_auth(function):
     def wrapper(*args, **kwargs):
         a_uuid = kwargs.get('admin_uuid')
@@ -839,8 +806,8 @@ def get_user_agent():
 
 @cache.cache()
 def __parse_user_agent(ua):
-    #Example: SFA/1.8.0 (239; sing-box 1.8.0)
-    #Example: SFA/1.7.0 (239; sing-box 1.7.0)
+    # Example: SFA/1.8.0 (239; sing-box 1.8.0)
+    # Example: SFA/1.7.0 (239; sing-box 1.7.0)
     uaa = user_agents.parse(request.user_agent.string)
     res = {}
     res["is_bot"] = uaa.is_bot

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-09 12:39+0100\n"
-"PO-Revision-Date: 2024-01-09 05:37-0600\n"
+"POT-Creation-Date: 2024-01-09 13:09+0100\n"
+"PO-Revision-Date: 2024-01-09 05:55-0600\n"
 "Last-Translator: hidden u\n"
 "Language-Team: English (USA)\n"
 "Language: en_US\n"
@@ -25,21 +25,21 @@ msgid "This domain does not exist in the panel!"
 msgstr "This Domain does not exist in the Panel !"
 
 # | msgid "Apply Configs"
-#: hiddifypanel/panel/hiddify.py:311
+#: hiddifypanel/panel/hiddify.py:278
 msgid "admin.config.apply_configs"
 msgstr "Apply Configs"
 
 # | msgid ""
 # | "Configs have been changed successfully. Click %(link)s to apply the "
 # | "configs. It may take 2 minutes to apply"
-#: hiddifypanel/panel/hiddify.py:312
+#: hiddifypanel/panel/hiddify.py:279
 msgid "config.validation-success"
 msgstr ""
 "Configs have been changed successfully. Click %(link)s to apply the configs."
 " It may take 2 minutes to apply"
 
 # | msgid " ✅ Configs have been changed successfully"
-#: hiddifypanel/panel/hiddify.py:314
+#: hiddifypanel/panel/hiddify.py:281
 msgid "config.validation-success-no-reset"
 msgstr " ✅ Configs have been changed successfully"
 
@@ -52,14 +52,14 @@ msgstr " ✅ Configs have been changed successfully"
 #: hiddifypanel/panel/admin/DomainAdmin.py:182
 #: hiddifypanel/panel/admin/QuickSetup.py:141
 #: hiddifypanel/panel/commercial/ParentDomainAdmin.py:111
-#: hiddifypanel/panel/hiddify.py:392
+#: hiddifypanel/panel/hiddify.py:359
 msgid "Domain can not be resolved! there is a problem in your domain"
 msgstr ""
 "Domain can not be resolved! There is a problem in your domain. Please check "
 "your Domain configurations."
 
 # | msgid "Last Day"
-#: hiddifypanel/panel/hiddify.py:424
+#: hiddifypanel/panel/hiddify.py:391
 msgid "0 - Last day"
 msgstr "Last Day"
 
@@ -67,7 +67,7 @@ msgstr "Last Day"
 # | "Selected Domain for REALITY is not in the same ASN. To better use of the
 # "
 # | "Protocol, it is better to find a Domain in the same ASN"
-#: hiddifypanel/panel/hiddify.py:729
+#: hiddifypanel/panel/hiddify.py:696
 msgid ""
 "selected domain for REALITY is not in the same ASN. To better use of the "
 "protocol, it is better to find a domain in the same ASN."

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-09 12:39+0100\n"
-"PO-Revision-Date: 2024-01-09 05:37-0600\n"
+"POT-Creation-Date: 2024-01-09 13:09+0100\n"
+"PO-Revision-Date: 2024-01-09 05:55-0600\n"
 "Last-Translator: hidden u\n"
 "Language: fa\n"
 "Language-Team: Persian\n"
@@ -26,7 +26,7 @@ msgid "This domain does not exist in the panel!"
 msgstr "این دامنه در پنل وجود ندارد!"
 
 # | msgid "Apply Configs"
-#: hiddifypanel/panel/hiddify.py:311
+#: hiddifypanel/panel/hiddify.py:278
 msgid "admin.config.apply_configs"
 msgstr "اعمال تنظیمات"
 
@@ -34,14 +34,14 @@ msgstr "اعمال تنظیمات"
 # | "Configs have been changed successfully. Click %(link)s to apply the
 # configs."
 # | " It may take 2 minutes to apply"
-#: hiddifypanel/panel/hiddify.py:312
+#: hiddifypanel/panel/hiddify.py:279
 msgid "config.validation-success"
 msgstr ""
 "تنظیمات با موفقیت ذخیره شدند. لطفا بر روی این لینک: %(link)s کلیک کنید تا"
 " بر روی سیستم اعمال شوند. این کار ممکن است 2 دقیقه طول بکشد"
 
 # | msgid " ✅ Configs have been changed successfully"
-#: hiddifypanel/panel/hiddify.py:314
+#: hiddifypanel/panel/hiddify.py:281
 msgid "config.validation-success-no-reset"
 msgstr " ✅ تنظیمات با موفقیت تغییر کرد"
 
@@ -55,12 +55,12 @@ msgstr " ✅ تنظیمات با موفقیت تغییر کرد"
 #: hiddifypanel/panel/admin/DomainAdmin.py:182
 #: hiddifypanel/panel/admin/QuickSetup.py:141
 #: hiddifypanel/panel/commercial/ParentDomainAdmin.py:111
-#: hiddifypanel/panel/hiddify.py:392
+#: hiddifypanel/panel/hiddify.py:359
 msgid "Domain can not be resolved! there is a problem in your domain"
 msgstr "دامنه قابل دسترسی نیست! در دامنه شما مشکلی وجود دارد."
 
 # | msgid "Last Day"
-#: hiddifypanel/panel/hiddify.py:424
+#: hiddifypanel/panel/hiddify.py:391
 msgid "0 - Last day"
 msgstr "آخرین روز"
 
@@ -68,7 +68,7 @@ msgstr "آخرین روز"
 # | "Selected Domain for REALITY is not in the same ASN. To better use of the
 # "
 # | "Protocol, it is better to find a Domain in the same ASN"
-#: hiddifypanel/panel/hiddify.py:729
+#: hiddifypanel/panel/hiddify.py:696
 msgid ""
 "selected domain for REALITY is not in the same ASN. To better use of the "
 "protocol, it is better to find a domain in the same ASN."

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/translations/pt/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-09 12:39+0100\n"
-"PO-Revision-Date: 2024-01-09 05:37-0600\n"
+"POT-Creation-Date: 2024-01-09 13:09+0100\n"
+"PO-Revision-Date: 2024-01-09 05:55-0600\n"
 "Last-Translator: lymanrudni\n"
 "Language: pt\n"
 "Language-Team: Portuguese\n"
@@ -29,7 +29,7 @@ msgid "This domain does not exist in the panel!"
 msgstr "Este Domínio não existe no Painel!"
 
 # | msgid "Apply Configs"
-#: hiddifypanel/panel/hiddify.py:311
+#: hiddifypanel/panel/hiddify.py:278
 #, fuzzy
 msgid "admin.config.apply_configs"
 msgstr "Aplicar configurações"
@@ -38,7 +38,7 @@ msgstr "Aplicar configurações"
 # | "Configs have been changed successfully. Click %(link)s to apply the
 # configs."
 # | " It may take 2 minutes to apply"
-#: hiddifypanel/panel/hiddify.py:312
+#: hiddifypanel/panel/hiddify.py:279
 #, fuzzy
 msgid "config.validation-success"
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 "aplicar as configurações. Pode levar 2 minutos para aplicar"
 
 # | msgid " ✅ Configs have been changed successfully"
-#: hiddifypanel/panel/hiddify.py:314
+#: hiddifypanel/panel/hiddify.py:281
 #, fuzzy
 msgid "config.validation-success-no-reset"
 msgstr "✅ As configurações foram alteradas com sucesso"
@@ -61,7 +61,7 @@ msgstr "✅ As configurações foram alteradas com sucesso"
 #: hiddifypanel/panel/admin/DomainAdmin.py:182
 #: hiddifypanel/panel/admin/QuickSetup.py:141
 #: hiddifypanel/panel/commercial/ParentDomainAdmin.py:111
-#: hiddifypanel/panel/hiddify.py:392
+#: hiddifypanel/panel/hiddify.py:359
 #, fuzzy
 msgid "Domain can not be resolved! there is a problem in your domain"
 msgstr ""
@@ -69,7 +69,7 @@ msgstr ""
 "Verifique as configurações do seu Domínio."
 
 # | msgid "Last Day"
-#: hiddifypanel/panel/hiddify.py:424
+#: hiddifypanel/panel/hiddify.py:391
 #, fuzzy
 msgid "0 - Last day"
 msgstr "Último dia"
@@ -78,7 +78,7 @@ msgstr "Último dia"
 # | "Selected Domain for REALITY is not in the same ASN. To better use of the
 # "
 # | "Protocol, it is better to find a Domain in the same ASN"
-#: hiddifypanel/panel/hiddify.py:729
+#: hiddifypanel/panel/hiddify.py:696
 msgid ""
 "selected domain for REALITY is not in the same ASN. To better use of the "
 "protocol, it is better to find a domain in the same ASN."

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/translations/ru/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-09 12:39+0100\n"
-"PO-Revision-Date: 2024-01-09 05:37-0600\n"
+"POT-Creation-Date: 2024-01-09 13:09+0100\n"
+"PO-Revision-Date: 2024-01-09 05:55-0600\n"
 "Last-Translator: lymanrudni\n"
 "Language: ru\n"
 "Language-Team: Russian\n"
@@ -27,7 +27,7 @@ msgid "This domain does not exist in the panel!"
 msgstr "Этого домена не существует в панели управления!"
 
 # | msgid "Apply Configs"
-#: hiddifypanel/panel/hiddify.py:311
+#: hiddifypanel/panel/hiddify.py:278
 msgid "admin.config.apply_configs"
 msgstr "Применить конфигурацию"
 
@@ -35,14 +35,14 @@ msgstr "Применить конфигурацию"
 # | "Configs have been changed successfully. Click %(link)s to apply the
 # configs."
 # | " It may take 2 minutes to apply"
-#: hiddifypanel/panel/hiddify.py:312
+#: hiddifypanel/panel/hiddify.py:279
 msgid "config.validation-success"
 msgstr ""
 "Конфигурации успешно изменены. Нажмите %(link)s, чтобы применить их. Это "
 "может занять 2 минуты"
 
 # | msgid " ✅ Configs have been changed successfully"
-#: hiddifypanel/panel/hiddify.py:314
+#: hiddifypanel/panel/hiddify.py:281
 msgid "config.validation-success-no-reset"
 msgstr "✅ Конфигурации успешно изменены"
 
@@ -56,14 +56,14 @@ msgstr "✅ Конфигурации успешно изменены"
 #: hiddifypanel/panel/admin/DomainAdmin.py:182
 #: hiddifypanel/panel/admin/QuickSetup.py:141
 #: hiddifypanel/panel/commercial/ParentDomainAdmin.py:111
-#: hiddifypanel/panel/hiddify.py:392
+#: hiddifypanel/panel/hiddify.py:359
 msgid "Domain can not be resolved! there is a problem in your domain"
 msgstr ""
 "Не возможно определить IP адрес для домена! В вашем домене возникла "
 "проблема. Пожалуйста, проверьте настройки."
 
 # | msgid "Last Day"
-#: hiddifypanel/panel/hiddify.py:424
+#: hiddifypanel/panel/hiddify.py:391
 msgid "0 - Last day"
 msgstr "Последний день"
 
@@ -71,7 +71,7 @@ msgstr "Последний день"
 # | "Selected Domain for REALITY is not in the same ASN. To better use of the
 # "
 # | "Protocol, it is better to find a Domain in the same ASN"
-#: hiddifypanel/panel/hiddify.py:729
+#: hiddifypanel/panel/hiddify.py:696
 msgid ""
 "selected domain for REALITY is not in the same ASN. To better use of the "
 "protocol, it is better to find a domain in the same ASN."

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel/translations/zh/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-09 12:39+0100\n"
-"PO-Revision-Date: 2024-01-09 05:37-0600\n"
+"POT-Creation-Date: 2024-01-09 13:09+0100\n"
+"PO-Revision-Date: 2024-01-09 05:55-0600\n"
 "Last-Translator: hidden u\n"
 "Language: zh\n"
 "Language-Team: Chinese\n"
@@ -26,7 +26,7 @@ msgid "This domain does not exist in the panel!"
 msgstr "该域名在面板中不存在！"
 
 # | msgid "Apply Configs"
-#: hiddifypanel/panel/hiddify.py:311
+#: hiddifypanel/panel/hiddify.py:278
 msgid "admin.config.apply_configs"
 msgstr "应用配置"
 
@@ -34,12 +34,12 @@ msgstr "应用配置"
 # | "Configs have been changed successfully. Click %(link)s to apply the
 # configs."
 # | " It may take 2 minutes to apply"
-#: hiddifypanel/panel/hiddify.py:312
+#: hiddifypanel/panel/hiddify.py:279
 msgid "config.validation-success"
 msgstr "配置已成功更改。单击 %(link)s 以应用配置。应用可能需要 2 分钟。"
 
 # | msgid " ✅ Configs have been changed successfully"
-#: hiddifypanel/panel/hiddify.py:314
+#: hiddifypanel/panel/hiddify.py:281
 msgid "config.validation-success-no-reset"
 msgstr " ✅ 配置已成功更改"
 
@@ -53,12 +53,12 @@ msgstr " ✅ 配置已成功更改"
 #: hiddifypanel/panel/admin/DomainAdmin.py:182
 #: hiddifypanel/panel/admin/QuickSetup.py:141
 #: hiddifypanel/panel/commercial/ParentDomainAdmin.py:111
-#: hiddifypanel/panel/hiddify.py:392
+#: hiddifypanel/panel/hiddify.py:359
 msgid "Domain can not be resolved! there is a problem in your domain"
 msgstr "域名无法解析！你的域名有问题。请检查你的域名配置。"
 
 # | msgid "Last Day"
-#: hiddifypanel/panel/hiddify.py:424
+#: hiddifypanel/panel/hiddify.py:391
 msgid "0 - Last day"
 msgstr "最后一天"
 
@@ -66,7 +66,7 @@ msgstr "最后一天"
 # | "Selected Domain for REALITY is not in the same ASN. To better use of the
 # "
 # | "Protocol, it is better to find a Domain in the same ASN"
-#: hiddifypanel/panel/hiddify.py:729
+#: hiddifypanel/panel/hiddify.py:696
 msgid ""
 "selected domain for REALITY is not in the same ASN. To better use of the "
 "protocol, it is better to find a domain in the same ASN."

{hiddifypanel-9.0.0.dev35 → hiddifypanel-9.0.0.dev37}/hiddifypanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 9.0.0.dev35
+Version: 9.0.0.dev37
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-9.0.0.dev35/hiddifypanel/VERSION

@@ -1 +0,0 @@
-9.0.0.dev35