hiddifypanel 10.70.0.dev0__py3-none-any.whl → 10.70.0.dev1__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.70.0.dev0
+10.70.0.dev1

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.70.0.dev0'
+__version__='10.70.0.dev1'
 from datetime import datetime
 __release_date__= datetime.strptime('2024-07-26','%Y-%m-%d')

hiddifypanel/hutils/proxy/clash.py

@@ -29,17 +29,18 @@ def get_all_clash_configs(meta_or_normal, domains: list[Domain]):
 def to_clash(proxy, meta_or_normal):
 
     name = proxy['name']
-    if proxy['l3'] == "kcp":
-        return {'name': name, 'msg': "clash does not support kcp", 'type': 'debug'}
-    if proxy['proto'] == "ssh":
-        return {'name': name, 'msg': "clash does not support ssh", 'type': 'debug'}
+
+    if proxy['l3'] in ["kcp", ProxyL3.h3_quic]:
+        return {'name': name, 'msg': f"clash does not support {proxy['l3']}", 'type': 'debug'}
+    if proxy['proto'] in ["ssh", "wireguard", "tuic", "hysteria"]:
+        return {'name': name, 'msg': f"clash does not support {proxy['proto']}", 'type': 'debug'}
+    if proxy.get('flow'):
+        return {'name': name, 'msg': "xtls not supported in clash", 'type': 'debug'}
     if meta_or_normal == "normal":
         if proxy['proto'] in ["vless", 'tuic', 'hysteria2']:
             return {'name': name, 'msg': f"{proxy['proto']} not supported in clash", 'type': 'debug'}
-        if proxy.get('flow'):
-            return {'name': name, 'msg': "xtls not supported in clash", 'type': 'debug'}
-        if proxy['transport'] == "shadowtls":
-            return {'name': name, 'msg': "shadowtls not supported in clash", 'type': 'debug'}
+        if proxy['transport'] in ["shadowtls", "splithttp"]:
+            return {'name': name, 'msg': f"{proxy['transport']} not supported in clash", 'type': 'debug'}
     if proxy['l3'] == ProxyL3.tls_h2 and proxy['proto'] in [ProxyProto.vmess, ProxyProto.vless] and proxy['dbe'].cdn == ProxyCDN.direct:
         return {'name': name, 'msg': "bug tls_h2 vmess and vless in clash meta", 'type': 'warning'}
     base = {}

hiddifypanel/hutils/proxy/singbox.py

@@ -64,7 +64,9 @@ def to_singbox(proxy: dict) -> list[dict] | dict:
     if is_xray_proxy(proxy):
         if hutils.flask.is_client_version(hutils.flask.ClientVersion.hiddify_next, 1, 9, 0):
             base['type'] = "xray"
-            base['xray_outbound_raw'] = to_xray(proxy)
+            xp = to_xray(proxy)
+            xp['streamSettings']['sockopt'] = {}
+            base['xray_outbound_raw'] = xp
             return all_base
         return {'name': name, 'msg': "xray proxy does not support in this client version", 'type': 'debug'}
     base["type"] = str(proxy["proto"])

hiddifypanel/hutils/proxy/xrayjson.py

@@ -94,10 +94,10 @@ def to_xray(proxy: dict) -> dict:
         'protocol': str(proxy['proto']),
         'settings': {},
         'streamSettings': {},
-        'mux': {  # default value
-            'enabled': False,
-            'concurrency': -1
-        }
+        # 'mux': {  # default value
+        #     # 'enabled': False,
+        #     # 'concurrency': -1
+        # }
     }
     outbound['protocol'] = 'shadowsocks' if outbound['protocol'] == 'ss' else outbound['protocol']
     # add multiplex to outbound
@@ -216,7 +216,7 @@ def add_stream_settings(base: dict, proxy: dict):
     # security
     if proxy['l3'] == ProxyL3.reality:
         ss['security'] = 'reality'
-    elif proxy['l3'] in [ProxyL3.tls, ProxyL3.tls_h2, ProxyL3.tls_h2_h1]:
+    elif proxy['l3'] in [ProxyL3.tls, ProxyL3.tls_h2, ProxyL3.tls_h2_h1, ProxyL3.h3_quic]:
         ss['security'] = 'tls'
 
     # network and transport settings
@@ -226,7 +226,8 @@ def add_stream_settings(base: dict, proxy: dict):
     if ss['security'] == 'reality':
         ss['network'] = proxy['transport']
         add_reality_stream(ss, proxy)
-    elif ss['security'] == 'tls' or 'xtls' and proxy['proto'] != ProxyProto.ss:
+    elif ss['security'] in ['tls', "xtls"] and proxy['proto'] != ProxyProto.ss:
+
         ss['tlsSettings'] = {
             'serverName': proxy['sni'],
             'allowInsecure': proxy['allow_insecure'],
@@ -341,7 +342,9 @@ def add_splithttp_stream(ss: dict, proxy: dict):
     ss['splithttpSettings'] = {
         'path': proxy['path'],
         'host': proxy['host'],
-        # 'acceptProxyProtocol': '', for inbounds only
+        "headers": {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"
+        }
     }
 
 
@@ -366,8 +369,8 @@ def add_kcp_stream(ss: dict, proxy: dict):
 
 def add_quic_stream(ss: dict, proxy: dict):
     # TODO: fix server side configs first
-    ss['quicSettings'] = {}
     return
+
     ss['quicSettings'] = {
         'security': 'chacha20-poly1305',
         'key': proxy['path'],
@@ -411,10 +414,11 @@ def add_multiplex(base: dict, proxy: dict):
 
     concurrency = proxy['mux_max_connections']
     if concurrency and concurrency > 0:
-        base['mux']['enabled'] = True
-        base['mux']['concurrency'] = concurrency
-        base['mux']['xudpConcurrency'] = concurrency
-        base['mux']['xudpProxyUDP443'] = 'reject'
+        base['mux'] = {'enabled': True,
+                       'concurrency': concurrency,
+                       'xudpConcurrency': concurrency,
+                       'xudpProxyUDP443': 'reject',
+                       }
 
 
 def null_config(tag: str) -> dict:

hiddifypanel/models/config_enum.py

@@ -245,7 +245,7 @@ class ConfigEnum(metaclass=FastEnum):
     trojan_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     reality_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     tcp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
-    quic_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
+    quic_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     xtls_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config)
     h2_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
 

hiddifypanel/panel/admin/SettingAdmin.py

@@ -16,7 +16,8 @@ from flask_bootstrap import SwitchField
 # from gettext import gettext as _
 from flask_classful import FlaskView
 from flask_wtf import FlaskForm
-from bleach import clean as bleach_clean
+from bleach import clean as bleach_clean, ALLOWED_TAGS as BLEACH_ALLOWED_TAGS
+ALLOWED_TAGS = set([*BLEACH_ALLOWED_TAGS, "h1", "h2", "h3", "h4", "p"])
 
 
 from hiddifypanel.models import BoolConfig, StrConfig, ConfigEnum, hconfig, ConfigCategory
@@ -94,9 +95,8 @@ class SettingAdmin(FlaskView):
 
             for k, v in changed_configs.items():
                 # html inputs santitizing
-                san_items = {ConfigEnum.branding_title, ConfigEnum.branding_site, ConfigEnum.branding_freetext}
-                if k in san_items:
-                    v = bleach_clean(v)
+                if k in {ConfigEnum.branding_title, ConfigEnum.branding_site, ConfigEnum.branding_freetext}:
+                    v = bleach_clean(v, tags=ALLOWED_TAGS)
                 set_hconfig(k, v, commit=False)
 
             db.session.commit()

hiddifypanel/panel/init_db.py

@@ -17,6 +17,11 @@ from loguru import logger
 MAX_DB_VERSION = 100
 
 
+def _v93(child_id):
+    set_hconfig(ConfigEnum.quic_enable, True)
+    set_hconfig(ConfigEnum.splithttp_enable, True)
+
+
 def _v92(child_id):
     db.session.bulk_save_objects(get_proxy_rows_v1())
 

{hiddifypanel-10.70.0.dev0.dist-info → hiddifypanel-10.70.0.dev1.dist-info}/METADATA

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

{hiddifypanel-10.70.0.dev0.dist-info → hiddifypanel-10.70.0.dev1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=JhumrB_eWx7aMlskhPQ7VV523GVkDZxJILZL5dmC-oU,13
-hiddifypanel/VERSION.py,sha256=eYBn1zvx3WN9ffQ6H-iUmmdJRXzrdhVlCBk-PCU1me4,118
+hiddifypanel/VERSION,sha256=WfWR2g-x5Zvej74D05DLVTZaopDYSQDE-OnCOOgQy7c,13
+hiddifypanel/VERSION.py,sha256=5jv0Meu-wjXsUZryCHSf4ecM_h2kvWvOFc5o_5MTgqo,118
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=Xq0UwiFTRFmQpxnOehQGwPDlJqoelwGhPQbYZ0Xn5c0,7850
@@ -36,17 +36,17 @@ hiddifypanel/hutils/node/child.py,sha256=oAyKlEHHn9FHcpZ9jBi3nYH-GHs8H7Gi2hzkmtO
 hiddifypanel/hutils/node/parent.py,sha256=UbyfvfP4fTSn6HN9oZDjYsKYIejiqW6eApKIfP0Mz5U,3749
 hiddifypanel/hutils/node/shared.py,sha256=FDSj3e-i3pb3mEv5vcUeX0Km1nxYg1CeAruIq7RwFmU,2540
 hiddifypanel/hutils/proxy/__init__.py,sha256=xXBa83kjYT_b-BNseEykfQYyJBQHTq1ZosfR8ZrQHkI,106
-hiddifypanel/hutils/proxy/clash.py,sha256=t57ywMo2TPpnAIuOn9v5gMD2os7zqS9b4NQtFX-Do5s,5813
+hiddifypanel/hutils/proxy/clash.py,sha256=n5trDzBXg26aeqLTGGCDVIGGpAM1VC7YX1cTwLNG18k,5912
 hiddifypanel/hutils/proxy/shared.py,sha256=AwkpjkjpeCFiYBj9BIsqRFUWfKTAQ2L8HwGXsRY-_Dc,22419
-hiddifypanel/hutils/proxy/singbox.py,sha256=vBVSJ0r4TRri1ErtVo7qm-yS3xXTSYoTdUGF2rczkm8,11314
+hiddifypanel/hutils/proxy/singbox.py,sha256=dpJlEkn4x_WO0gaJ4U5C07xb-_uBt2qZc69N2SPBtDY,11383
 hiddifypanel/hutils/proxy/xray.py,sha256=sw_g1xhIBAyCQ4cymorrHJSw2u4LOAJ41slmvxwsz5c,10788
-hiddifypanel/hutils/proxy/xrayjson.py,sha256=TsnOHM5IUAn5AVEsboVVTLzDLS93EU67SqasHm1y6BA,14796
+hiddifypanel/hutils/proxy/xrayjson.py,sha256=TSD05g8dwwL2pLj8by_jSy4eIP0fDDxy1l4fI-2M1Zw,14948
 hiddifypanel/models/__init__.py,sha256=PngFjQL9WvQP4EioNHRz1tTeyIgLoNvZ7WpmAhwKHnU,677
 hiddifypanel/models/admin.py,sha256=qZ-BRJ_Gn6hJNWz35SQQSds1CoeDslU9B0MDBRhjPSM,7596
 hiddifypanel/models/base_account.py,sha256=TUGDGHt3q3GWqWBdWwqaZl75KXTt7bw6pxnzOWAbkjI,3454
 hiddifypanel/models/child.py,sha256=ZFJaH-GWTKAGD0BGMH0iKEMipi37_cAk59OeJKt2IKA,3039
 hiddifypanel/models/config.py,sha256=-KKYqMkSEn2DabRxqBogSyA6xOU4ons6sa5CxxHAlAk,6373
-hiddifypanel/models/config_enum.py,sha256=_lVn3Gv5JiZsguwcCU07dlngs5C5ADhKCV6gaXFEOz0,16185
+hiddifypanel/models/config_enum.py,sha256=ouGCvSDvVy9qSJvm1-VjEpe4l5rgN9NSJD2IBruDhvI,16186
 hiddifypanel/models/domain.py,sha256=0tAPHR6XukN35CoyOxR3zXDNjXR-w_Ezd89jxk2H-xc,8308
 hiddifypanel/models/parent_domain.py,sha256=bs5F1neOAQu9XHEk3QQTBM4p2iuebM4cnAQqwfNjCtg,2291
 hiddifypanel/models/proxy.py,sha256=czKeDz_MVUSHuX2Lf9H2Ys_kgkggtzEiUx3HZPjJCXQ,3327
@@ -63,7 +63,7 @@ hiddifypanel/panel/cli.py,sha256=GNK-lqoedepG6hfpLHTPLxBaMsdjbQHZAw-qKjdRxnQ,859
 hiddifypanel/panel/common.py,sha256=pYI_z8dfeeaeSZWN2hUOnj10LtgvGRQBzhPaoGdYR0M,7654
 hiddifypanel/panel/custom_widgets.py,sha256=_zA0WZRZOCyh6Z1gW62aRQLMAOM_m85B2oZoIOU59Ys,2637
 hiddifypanel/panel/hiddify.py,sha256=-GBmkEXnGsIhZtjRomYJsqmnEToZwSXzd8ltS6Slgrc,15615
-hiddifypanel/panel/init_db.py,sha256=C6AZWzy14thindMeNPrRTPT5TjMbOFVbFvlI9g2bGmw,35150
+hiddifypanel/panel/init_db.py,sha256=NMwbMdQfTttQIrX74R932kOhIVEQBYIk6UDFRVS7Ts0,35269
 hiddifypanel/panel/run_commander.py,sha256=D9y-My0xSe2adHWXKV5UPYGl-9WwKURzniq55MRu6tE,3259
 hiddifypanel/panel/usage.py,sha256=sG4qhH8p7PS04W7CjbfbNS4GE88IPtRAeOdqQiHPntw,6860
 hiddifypanel/panel/admin/Actions.py,sha256=o_ENbphriVrbRJkx9nvrkpaliuMIfp34sscMkZJ3P5s,8578
@@ -75,7 +75,7 @@ hiddifypanel/panel/admin/DomainAdmin.py,sha256=0g9AEk_YVCEZZMscgVDLsqQAAk0QBMW1h
 hiddifypanel/panel/admin/NodeAdmin.py,sha256=QAHQjF7e7F4KqsWNWpMt7SoLANlFEborVtWQV9OXJ2E,3102
 hiddifypanel/panel/admin/ProxyAdmin.py,sha256=6t6QDJpdRJJ-TNQbK90pf5TI6y9fSlZQEDuPzaOFjrc,5250
 hiddifypanel/panel/admin/QuickSetup.py,sha256=EDa_ombxF3vWDsj7JEmDnw8Kf0bKwdXU-IdISDi2hj0,11448
-hiddifypanel/panel/admin/SettingAdmin.py,sha256=0lzKol5pwuM1axYFyANNPJiIWme2xjZ64QX3PlTv16U,19574
+hiddifypanel/panel/admin/SettingAdmin.py,sha256=fpl4zeKAhqll5JDJ7wzA2E2MBGzYac83RXHHLtnWYec,19664
 hiddifypanel/panel/admin/Terminal.py,sha256=rzZWRjMhjVnAvC65rfE3HJT3boUDznI6fl-htzKp7sI,1712
 hiddifypanel/panel/admin/UserAdmin.py,sha256=UPPg92NGxclBKE-inYas58Lz2bc06oFibSMdygQaC2M,18020
 hiddifypanel/panel/admin/__init__.py,sha256=hb0A2HuK_nBZRCNPumwahXX-25FMxODKYlNbk2ItF08,3015
@@ -822,24 +822,24 @@ hiddifypanel/templates/redirect.html,sha256=K9x_O4P96vEkqBhOXIhoGrWw1KIqd2bL0BjI
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/actions.html,sha256=2NeITe2e-lPKCk_o511tCIqVtrPu8LYHE1wTCtrFUrI,1331
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=MBGrTqZpzNLe4sZy0RozvXNr8seFUQc2C6v88BJtNWc,11095
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=va1Z6P0wTWBDdOzhEQSmdFjX79mAZariEQ_DZGVGbLM,76118
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=CnTrlgNIvjLcIzNVIMMgdKwj7ztFLMqeaK0B3JxyFzw,76118
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=MfbE6e8Z_cy2mWEwtUo2ccz6WiBInIepBuf3ElPvkFI,79306
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=5j4CnXVWRKa1fN-Ml27tMIkY0JybT4MCD6Ki5-SipEw,96412
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=7_Dc7J4fQvc6oRbTaqAaTTABaJgleOu5IY2zc7Ikwo4,96412
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=207Mz9wePgMiHtvZKRVFHjtarPynYt-rcycwaUx5wZ0,101876
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=qxkdachJ3VuoVU_gjIzLJHZf5M2lqW00tVTm04zN9yc,58902
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=tKpu0fNwjsOt1Q3SwIg-FXoBy0xDDSWnnhK6FabkmVE,58902
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=7Fx88L6WDURWI7U3P0B7wu-fPODuWudu8NnFp1jY3fM,69741
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=d1nWa_tIMzZz61qUdswF8RfsoStlvwp69O41K0XXqg4,97921
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=C6mlWR0u_cZz7hyP8x0vSb8cVdYS8ehku6_0B66NXzY,97921
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=OzosPmC1u41UDt3TDcXMa5KH6pbdNECPTnPU0ix2zYQ,105012
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=DMHVEgyvlskPQtoV2VF29gP2twHYsQOfex2eJR-gowc,59215
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=DJ_h4PNHqtGii8zpClK_zZ_s37N0JZigdvDm4NdeVHk,59215
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=Mai5YHjA-UiLusxkN5Q_e2VaiXCqiPKDVZ0G39Emlgo,68965
 hiddifypanel/translations.i18n/en.json,sha256=Wyyd-JGQEt1QpoXJIFXncOtWQNHfiQBqE2PCc_7NLXY,68873
 hiddifypanel/translations.i18n/fa.json,sha256=hWUhH7iM3xy6JPLI47iAt8zBORQyvgx5V6yTWPolYeE,91440
 hiddifypanel/translations.i18n/pt.json,sha256=nX-ylFwJatERGIioxFzjNvN12ICFQdvdEU8SK7H1ClU,59677
 hiddifypanel/translations.i18n/ru.json,sha256=skOpF3rbA2VUgj1LUn9zx8kauEM8FWAjKjCDDscGW04,94549
 hiddifypanel/translations.i18n/zh.json,sha256=ab8kx7EkAmAGQTj1K5PGrS7v659lHhAENkfFlyUSB8o,59141
-hiddifypanel-10.70.0.dev0.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.70.0.dev0.dist-info/METADATA,sha256=pKbiN3LILpEnbTZ9uRPascKKqNFE87Md3LvubLpk3Gw,4044
-hiddifypanel-10.70.0.dev0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-hiddifypanel-10.70.0.dev0.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.70.0.dev0.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.70.0.dev0.dist-info/RECORD,,
+hiddifypanel-10.70.0.dev1.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.70.0.dev1.dist-info/METADATA,sha256=VaRBbBhk-j9WdnpYWoqyCAcZWXRWOY6uXTUPjb1r2JM,4044
+hiddifypanel-10.70.0.dev1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+hiddifypanel-10.70.0.dev1.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.70.0.dev1.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.70.0.dev1.dist-info/RECORD,,