hiddifypanel 10.70.8__py3-none-any.whl → 10.80.0__py3-none-any.whl

hiddifypanel/hutils/proxy/shared.py

@@ -11,17 +11,13 @@ from hiddifypanel.models import Proxy, ProxyProto, ProxyL3, ProxyTransport, Prox
 from hiddifypanel import hutils
 
 
-def get_ssh_hostkeys(dojson=False) -> list[str] | str:
-    key_files = glob.glob(current_app.config['HIDDIFY_CONFIG_PATH'] + "/other/ssh/host_key/*_key.pub")
-    host_keys = []
-    for file_name in key_files:
-        with open(file_name, "r") as f:
-            host_key = f.read().strip()
-            host_key = host_key.split()
-            if len(host_key) > 2:
-                host_key = host_key[:2]  # strip the hostname part
-            host_key = " ".join(host_key)
-            host_keys.append(host_key)
+def get_ssh_hostkeys(hconfigs,dojson=False) -> list[str] | str:
+    host_keys = [
+        # hconfigs[ConfigEnum.ssh_host_dsa_pub],
+        hconfigs[ConfigEnum.ssh_host_ed25519_pub],
+        hconfigs[ConfigEnum.ssh_host_ecdsa_pub], 
+        hconfigs[ConfigEnum.ssh_host_rsa_pub],
+    ]
     if dojson:
         return json.dumps(host_keys)
     return host_keys
@@ -138,8 +134,8 @@ def get_proxies(child_id: int = 0, only_enabled=False) -> list['Proxy']:
         proxies = [c for c in proxies if 'trojan' not in c.proto]
     if not hconfig(ConfigEnum.httpupgrade_enable, child_id):
         proxies = [c for c in proxies if ProxyTransport.httpupgrade not in c.transport]
-    if not hconfig(ConfigEnum.splithttp_enable, child_id):
-        proxies = [c for c in proxies if ProxyTransport.splithttp not in c.transport]
+    if not hconfig(ConfigEnum.xhttp_enable, child_id):
+        proxies = [c for c in proxies if ProxyTransport.xhttp not in c.transport]
     if not hconfig(ConfigEnum.ws_enable, child_id):
         proxies = [c for c in proxies if ProxyTransport.WS not in c.transport]
     # if not hconfig(ConfigEnum.xtls_enable, child_id):
@@ -193,7 +189,7 @@ def get_valid_proxies(domains: list[Domain]) -> list[dict]:
             noDomainProxies = False
             if proxy.proto in [ProxyProto.ssh, ProxyProto.wireguard]:
                 noDomainProxies = True
-            if proxy.proto in [ProxyProto.ss] and proxy.transport not in [ProxyTransport.grpc, ProxyTransport.h2, ProxyTransport.WS, ProxyTransport.httpupgrade, ProxyTransport.splithttp]:
+            if proxy.proto in [ProxyProto.ss] and proxy.transport not in [ProxyTransport.grpc, ProxyTransport.h2, ProxyTransport.WS, ProxyTransport.httpupgrade, ProxyTransport.xhttp]:
                 noDomainProxies = True
             options = []
             key = f'{proxy.proto}{proxy.transport}{proxy.cdn}{proxy.l3}'
@@ -417,9 +413,9 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_httpupgrade]}'
         base["host"] = domain
         return base
-    if proxy.transport in [ProxyTransport.splithttp]:
-        base['transport'] = 'splithttp'
-        base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_splithttp]}'
+    if proxy.transport in [ProxyTransport.xhttp]:
+        base['transport'] = 'xhttp'
+        base['path'] = f'/{path[base["proto"]]}{hconfigs[ConfigEnum.path_xhttp]}'
         # if 0 and 'h2' in base['alpn'] or 'h3' in base['alpn']:
         #     base['path'] += "2"
         # else:
@@ -441,7 +437,7 @@ def make_proxy(hconfigs: dict, proxy: Proxy, domain_db: Domain, phttp=80, ptls=4
         return base
     if ProxyProto.ssh == proxy.proto:
         base['private_key'] = g.account.ed25519_private_key
-        base['host_key'] = hutils.proxy.get_ssh_hostkeys(False)
+        base['host_keys'] = hutils.proxy.get_ssh_hostkeys(hconfigs,False)
         # base['ssh_port'] = hconfig(ConfigEnum.ssh_server_port)
         return base
     return {'name': name, 'msg': 'not valid', 'type': 'error', 'proto': proxy.proto}

hiddifypanel/hutils/proxy/singbox.py

@@ -45,7 +45,9 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
 
 
 def is_xray_proxy(proxy: dict):
-    if proxy['transport'] == ProxyTransport.splithttp:
+    if g.user_agent.get('is_hiddify_prefere_xray'):
+        return True
+    if proxy['transport'] == ProxyTransport.xhttp:
         return True
     return False
 
@@ -323,7 +325,7 @@ def add_ssh(all_base: list[dict], proxy: dict):
     base["user"] = proxy['uuid']
     base["private_key"] = proxy['private_key']  # .replace('\n', '\\n')
 
-    base["host_key"] = proxy.get('host_key', [])
+    base["host_key"] = proxy.get('host_keys', [])
 
     socks_front = {
         "type": "socks",

hiddifypanel/hutils/proxy/wireguard.py

@@ -0,0 +1,34 @@
+
+def generate_wireguard_config(proxy: dict) -> str:
+    """
+    Generates a WireGuard configuration from a given proxy dictionary.
+
+    Args:
+        proxy (dict): Dictionary containing WireGuard and proxy details.
+
+    Returns:
+        str: A WireGuard configuration string.
+    """
+    name=f'{proxy["extra_info"]} {proxy["name"]}'
+    addrs = f"{proxy['wg_ipv4']}/32"
+    if proxy['wg_ipv6']:
+        addrs += f", {proxy['wg_ipv6']}/128"
+    config = f"""[Interface]
+# Name = {name}
+Address= {addrs}
+PrivateKey = {proxy["wg_pk"]}
+MTU = {proxy.get("mtu", 1380)}
+DNS = {proxy.get("dns", "1.1.1.1")}
+
+[Peer]
+# Name = Public Peer for {name}
+Endpoint = {proxy["server"]}:{proxy["port"]}
+PublicKey = {proxy["wg_server_pub"]}
+PresharedKey = {proxy['wg_psk']}
+#PersistentKeepalive = {proxy.get("keep_alive", 25)}
+"""
+
+#Address = {proxy.get("wg_ipv4", "0.0.0.0/32")}
+#AllowedIPs = {proxy.get("allowed_ips", "0.0.0.0/0")}
+
+    return config

hiddifypanel/hutils/proxy/xray.py

@@ -63,7 +63,7 @@ def to_link(proxy: dict) -> str | dict:
             streisand_ssh = hutils.encode.do_base_64(f'{proxy["uuid"]}:0:{proxy["private_key"]}::@{proxy["server"]}:{proxy["port"]}')
             baseurl += f'{streisand_ssh}#{name_link}'
         else:
-            hk = ",".join(proxy["host_key"])
+            hk = ",".join(proxy["host_keys"])
             pk = proxy["private_key"].replace('\n', '')
             baseurl += f'{proxy["uuid"]}@{proxy["server"]}:{proxy["port"]}/?file=ssh&pk={pk}&hk={hk}#{name_link}'
 
@@ -126,10 +126,10 @@ def to_link(proxy: dict) -> str | dict:
         baseurl += "&encryption=none"
     if proxy.get('fingerprint', 'none') != 'none':
         baseurl += "&fp=" + proxy['fingerprint']
-    if proxy.get('transport') in {ProxyTransport.splithttp}:
+    if proxy.get('transport') in {ProxyTransport.xhttp}:
         baseurl += "&core=xray"
     if proxy['l3'] != 'quic':
-        if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.splithttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
+        if proxy.get('l3') != ProxyL3.reality and (proxy.get('transport') in {ProxyTransport.tcp, ProxyTransport.httpupgrade, ProxyTransport.xhttp}) and proxy['proto'] in [ProxyProto.vless, ProxyProto.trojan]:
             baseurl += '&headerType=http'
         else:
             baseurl += '&headerType=None'

hiddifypanel/hutils/proxy/xrayjson.py

@@ -50,10 +50,11 @@ def configs_as_json(domains: list[Domain], user: User, expire_days: int, remarks
         unsupported_transport = {}
         if g.user_agent.get('is_v2rayng'):
             # TODO: ensure which protocols are not supported in v2rayng
-            unsupported_protos = {ProxyProto.wireguard, ProxyProto.hysteria, ProxyProto.hysteria2,
-                                  ProxyProto.tuic, ProxyProto.ss, ProxyProto.ssr, ProxyProto.ssh}
+            unsupported_protos = { ProxyProto.hysteria, ProxyProto.hysteria2,
+                                  ProxyProto.tuic, ProxyProto.ssr, ProxyProto.ssh}
             if not hutils.flask.is_client_version(hutils.flask.ClientVersion.v2ryang, 1, 8, 18):
                 unsupported_transport = {ProxyTransport.httpupgrade}
+                unsupported_protos.update({ProxyProto.wireguard})
 
         # multiple outbounds needs multiple whole base config not just one with multiple outbounds (at least for v2rayng)
         # https://github.com/2dust/v2rayNG/pull/2827#issue-2127534078
@@ -135,7 +136,9 @@ def add_wireguard_settings(base: dict, proxy: dict):
     base['settings']['mtu'] = 1380  # optional
     base['settings']['peers'] = [{
         'endpoint': f'{proxy["server"]}:{int(proxy["port"])}',
-        'publicKey': proxy["wg_server_pub"]
+        'publicKey': proxy["wg_server_pub"],
+        "preSharedKey": proxy['wg_psk']
+
         # 'allowedIPs':'', 'preSharedKey':'', 'keepAlive':'' # optionals
     }]
 
@@ -262,9 +265,9 @@ def add_stream_settings(base: dict, proxy: dict):
     if proxy['transport'] == ProxyTransport.httpupgrade:
         ss['network'] = proxy['transport']
         add_httpupgrade_stream(ss, proxy)
-    if proxy['transport'] == ProxyTransport.splithttp:
+    if proxy['transport'] == ProxyTransport.xhttp:
         ss['network'] = proxy['transport']
-        add_splithttp_stream(ss, proxy)
+        add_xhttp_stream(ss, proxy)
     if proxy['transport'] == 'ws':
         ss['network'] = proxy['transport']
         add_ws_stream(ss, proxy)
@@ -338,8 +341,8 @@ def add_httpupgrade_stream(ss: dict, proxy: dict):
     }
 
 
-def add_splithttp_stream(ss: dict, proxy: dict):
-    ss['splithttpSettings'] = {
+def add_xhttp_stream(ss: dict, proxy: dict):
+    ss['xhttpSettings'] = {
         'path': proxy['path'],
         'host': proxy['host'],
         "headers": {

hiddifypanel/models/admin.py

@@ -190,4 +190,4 @@ class AdminUser(BaseAccount, SerializerMixin):
 def before_insert(mapper, connection, target):
     from hiddifypanel import hutils
     hutils.model.gen_username(target)
-    hutils.model.gen_password(target)
+    # hutils.model.gen_password(target)

hiddifypanel/models/base_account.py

@@ -41,6 +41,9 @@ class BaseAccount(db.Model, SerializerMixin, FlaskLoginUserMixin):  # type: igno
             'telegram_id': self.telegram_id,
             'lang': self.lang
         }
+    def update_password(self,new_password):
+        self.password=new_password
+        db.session.commit()
 
     @classmethod
     def by_id(cls, id: int):

hiddifypanel/models/config.py

@@ -39,7 +39,7 @@ class StrConfig(db.Model, SerializerMixin):
     child_id = Column(Integer, ForeignKey('child.id'), primary_key=True, default=0)
     # category = db.Column(db.String(128), primary_key=True)
     key = Column(Enum(ConfigEnum), primary_key=True, default=ConfigEnum.admin_secret)
-    value = Column(String(2048))
+    value = Column(String(3072))
 
     def to_dict(self: "StrConfig"):
         return {
@@ -153,7 +153,10 @@ def add_or_update_config(commit: bool = True, child_id: int | None = None, overr
     if child_id is None:
         child_id = Child.current().id
     c = config['key']
-    ckey = ConfigEnum(c)
+    try:
+        ckey = ConfigEnum(c)
+    except:
+        return
     if c == ConfigEnum.unique_id and not override_unique_id:
         return
 

hiddifypanel/models/config_enum.py

@@ -239,7 +239,7 @@ class ConfigEnum(metaclass=FastEnum):
     ws_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     grpc_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     httpupgrade_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
-    splithttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
+    xhttp_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
 
     vless_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
     trojan_enable = _BoolConfigDscr(ConfigCategory.proxies, ApplyMode.apply_config)
@@ -262,7 +262,7 @@ class ConfigEnum(metaclass=FastEnum):
     path_v2ray = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)  # deprecated
     path_ss = _StrConfigDscr(ConfigCategory.hidden, ApplyMode.apply_config, hide_in_virtual_child=True)
 
-    path_splithttp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
+    path_xhttp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_httpupgrade = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_ws = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
     path_tcp = _StrConfigDscr(ConfigCategory.too_advanced, ApplyMode.apply_config, hide_in_virtual_child=True)
@@ -277,6 +277,19 @@ class ConfigEnum(metaclass=FastEnum):
     sub_full_clash_enable = _BoolConfigDscr(ConfigCategory.hidden)
     sub_full_clash_meta_enable = _BoolConfigDscr(ConfigCategory.hidden)
 
+
+    #ssh host keys
+    ssh_host_rsa_pk = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_rsa_pub = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_ed25519_pk = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_ed25519_pub = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_ecdsa_pk = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_ecdsa_pub = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_dsa_pk = _StrConfigDscr(ConfigCategory.hidden)
+    ssh_host_dsa_pub = _StrConfigDscr(ConfigCategory.hidden)
+    
+    
+
     hiddifycli_enable = _BoolConfigDscr(ConfigCategory.hidden, ApplyMode.reinstall)
 
     @classmethod

hiddifypanel/models/proxy.py

@@ -20,7 +20,7 @@ class ProxyTransport(StrEnum):
     tcp = auto()
     ssh = auto()
     httpupgrade = auto()
-    splithttp = auto()
+    xhttp = auto()
     custom = auto()
     shadowsocks = auto()
 

hiddifypanel/models/user.py

@@ -76,7 +76,7 @@ class User(BaseAccount, SerializerMixin):
     current_usage = db.Column(db.BigInteger, default=0, nullable=False)
     last_reset_time = db.Column(db.Date, default=datetime.date.today())
     added_by = db.Column(db.Integer, db.ForeignKey('admin_user.id'), default=1)
-    max_ips = db.Column(db.Integer, default=1000, nullable=False)
+    max_ips = db.Column(db.Integer, default=100, nullable=False)
     details = db.relationship('UserDetail', cascade="all,delete", backref='user', lazy='dynamic',)
     enable = db.Column(db.Boolean, default=True, nullable=False)
     ed25519_private_key = db.Column(db.String(500), default="")
@@ -347,6 +347,6 @@ class User(BaseAccount, SerializerMixin):
 def on_user_insert(mapper, connection, target):
     from hiddifypanel import hutils
     hutils.model.gen_username(target)
-    hutils.model.gen_password(target)
+    # hutils.model.gen_password(target)
     hutils.model.gen_ed25519_keys(target)
     hutils.model.gen_wg_keys(target)

hiddifypanel/panel/__init__.py

@@ -1,9 +1,9 @@
 
-from . import user
-# from . import admin
-from . import cli
-# from .. import database
-from . import common
-# from . import commercial
-# from .. import auth
-from . import common_bp
+# from . import user
+# # from . import admin
+# from . import cli
+# # from .. import database
+# from . import common
+# # from . import commercial
+# # from .. import auth
+# from . import common_bp

hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -40,7 +40,7 @@ class SubAdminsField(SelectField):
 class AdminstratorAdmin(AdminLTEModelView):
     column_hide_backrefs = False
     column_list = ["name", 'UserLinks', 'mode', 'can_add_admin', 'max_active_users', 'max_users', 'online_users', 'comment',]
-    form_columns = ["name", 'mode', 'can_add_admin', 'max_active_users', 'max_users', 'comment', "uuid"]
+    form_columns = ["name", 'mode', 'can_add_admin', 'max_active_users', 'max_users', 'comment', "uuid", "password"]
     list_template = 'model/admin_list.html'
     # column_editable_list = ['name']
     # edit_modal = True
@@ -59,6 +59,7 @@ class AdminstratorAdmin(AdminLTEModelView):
         "comment": _("Note"),
         'max_active_users': _("Max Active Users"),
         'max_users': _('Max Users'),
+        "password":_("user.password.title"),
         "online_users": _("Online Users"),
         'can_add_admin': _("Can add sub admin")
 
@@ -142,19 +143,18 @@ class AdminstratorAdmin(AdminLTEModelView):
         """)
 
     def _max_active_users_formatter(view, context, model, name):
-
-        actives = [u for u in model.recursive_users_query().all() if u.is_active]
-        u = len(actives)
+        """Optimized user count formatter using database queries"""
+        active_count = model.recursive_users_query().filter(User.is_active == True).count()
         if model.mode == AdminMode.super_admin:
-            return f"{u} / ∞"
+            return f"{active_count} / ∞"
         t = model.max_active_users
-        rate = round(u * 100 / (t + 0.000001))
-        state = "danger" if u >= t else ('warning' if rate > 80 else 'success')
-        color = "#ff7e7e" if u >= t else ('#ffc107' if rate > 80 else '#9ee150')
+        rate = round(active_count * 100 / (t + 0.000001))
+        color = "#ff7e7e" if active_count >= t else ('#ffc107' if rate > 80 else '#9ee150')
+        
         return Markup(f"""
         <div class="progress progress-lg position-relative" style="min-width: 100px;">
           <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {rate}%;background-color: {color};" aria-valuenow="{rate}" aria-valuemin="0" aria-valuemax="100"></div>
-              <span class='badge position-absolute' style="left:auto;right:auto;width: 100%;font-size:1em">{u} {_('user.home.usage.from')} {t}</span>
+              <span class='badge position-absolute' style="left:auto;right:auto;width: 100%;font-size:1em">{active_count} {_('user.home.usage.from')} {t}</span>
 
         </div>
         """)
@@ -204,6 +204,7 @@ class AdminstratorAdmin(AdminLTEModelView):
         # else:
         #     model.parent_admin_id=1
         #     model.parent_admin=AdminUser.query.filter(AdminUser.id==1).first()
+        
         if model.id != 1 and model.parent_admin is None:
             model.parent_admin_id = g.account.id
             model.parent_admin = g.account
@@ -212,12 +213,17 @@ class AdminstratorAdmin(AdminLTEModelView):
             raise ValidationError("Sub-Admin can not have more power!!!!")
         if g.account.mode == AdminMode.agent and model.mode != AdminMode.agent:
             raise ValidationError("Sub-Admin can not have more power!!!!")
+        
+        if not model.password and not is_created:
+            model.password=AdminUser.by_id(model.id).password
+
 
     def on_model_delete(self, model):
         model.remove()
 
     def on_form_prefill(self, form, id=None):
-
+        
+        form.password.data=""
         if g.account.mode != AdminMode.super_admin:
             del form.mode
             del form.can_add_admin