hiddifypanel 10.70.9__tar.gz → 10.80.0.dev1__tar.gz

hiddifypanel-10.80.0.dev1/PKG-INFO

@@ -0,0 +1,130 @@
+Metadata-Version: 2.1
+Name: hiddifypanel
+Version: 10.80.0.dev1
+Summary: hiddifypanel multi proxy panel
+Home-page: https://hiddify.com
+License: LICENSE.md
+Keywords: proxy,panel,multi
+Author: hiddify
+Requires-Python: >=3.10,<4.0
+Classifier: License :: Other/Proprietary License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: ansi2html (==1.9.2)
+Requires-Dist: apiflask (==2.2.1)
+Requires-Dist: babel (==2.16.0)
+Requires-Dist: bjoern (==3.2.2)
+Requires-Dist: bleach (==6.2.0)
+Requires-Dist: bootstrap-flask (==2.4.1)
+Requires-Dist: cachecontrol[filecache] (<0.15.0)
+Requires-Dist: click (==8.1.7)
+Requires-Dist: cloudflare (==3.1.0)
+Requires-Dist: cryptography (<42)
+Requires-Dist: fastenumplus (==1.4.0)
+Requires-Dist: flask (==3.0.3)
+Requires-Dist: flask-admin (==1.6.1)
+Requires-Dist: flask-adminlte3 (==1.0.9)
+Requires-Dist: flask-apispec (==0.11.4)
+Requires-Dist: flask-babel (==4.0.0)
+Requires-Dist: flask-classful (==0.16.0)
+Requires-Dist: flask-login (==0.6.3)
+Requires-Dist: flask-restful (==0.3.10)
+Requires-Dist: flask-session (==0.8.0)
+Requires-Dist: flask-sqlalchemy (==3.1.1)
+Requires-Dist: flask-wtf (==1.2.2)
+Requires-Dist: loguru (==0.7.2)
+Requires-Dist: markupsafe (==3.0.2)
+Requires-Dist: maxminddb (==2.6.2)
+Requires-Dist: mysqlclient (==2.2.5)
+Requires-Dist: netifaces (==0.11.0)
+Requires-Dist: ping3 (==4.0.8)
+Requires-Dist: psutil (==6.1.0)
+Requires-Dist: pymysql (==1.1.1)
+Requires-Dist: pytelegrambotapi (==4.23.0)
+Requires-Dist: python-dateutil (==2.9.0.post0)
+Requires-Dist: python-dotenv (==1.0.1)
+Requires-Dist: python-redis-cache (==4.0.1)
+Requires-Dist: python-slugify (==8.0.4)
+Requires-Dist: pyyaml (==6.0.2)
+Requires-Dist: redis (==5.2.0)
+Requires-Dist: requests (==2.32.3)
+Requires-Dist: sqlalchemy (==2.0.29)
+Requires-Dist: sqlalchemy-serializer (==1.4.22)
+Requires-Dist: sqlalchemy-utils (==0.41.2)
+Requires-Dist: strenum (==0.4.15)
+Requires-Dist: user-agents (==2.2.0)
+Requires-Dist: werkzeug (==3.1.2)
+Requires-Dist: wtforms (==3.1.2)
+Requires-Dist: xtlsapi (==3.1.2)
+Project-URL: Documentation, https://hiddify.com/manager
+Project-URL: Repository, https://github.com/hiddify/hiddify-manager/
+Description-Content-Type: text/markdown
+
+# hiddifypanel 
+
+ hiddifypanel to create multi proxy using xray mtproxy and others
+
+## 🌎 Translations
+
+<div align=center>
+    
+[![inlang status badge](https://inlang.com/badge?url=github.com/hiddify/hiddifypanel)](https://inlang.com/editor/github.com/hiddify/hiddifypanel?ref=badge)
+</div>
+
+Improve existing languages or add new ones by manually editing the JSON files located in `/assets/translations` or by using the [Inlang online editor](https://inlang.com/editor/github.com/hiddify/hiddifypanel).
+
+# How to use it
+Please visit https://github.com/hiddify/hiddify-manager/wiki for the installation.
+
+# Source Code: https://github.com/hiddify/HiddifyPanel/
+<!--
+## Installation
+
+From source:
+
+```bash
+git clone https://github.com/hiddify/HiddifyPanel hiddifypanel
+cd hiddifypanel
+make install
+```
+
+From pypi:
+
+```bash
+pip install hiddifypanel
+```
+
+## Executing
+
+This application has a CLI interface that extends the Flask CLI.
+
+Just run:
+
+```bash
+$ hiddifypanel
+```
+
+or
+
+```bash
+$ python -m hiddifypanel
+```
+
+To see the help message and usage instructions.
+
+## First run
+
+```bash
+hiddifypanel init-db   # run once
+echo localhost:9000/$(hiddifypanel admin-path)
+hiddifypanel run
+```
+
+
+> **Note**: You can also use `flask run` to run the application.
+
+-->
+

hiddifypanel-10.80.0.dev1/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.80.0.dev7

hiddifypanel-10.80.0.dev1/hiddifypanel/VERSION.py

@@ -0,0 +1,6 @@
+import importlib.metadata
+from datetime import datetime
+
+__version__ = importlib.metadata.version(__package__ or __name__)
+__release_time__= datetime.strptime('2024-11-10T19:45:21','%Y-%m-%dT%H:%M:%S')
+is_released_version=True

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/__init__.py

@@ -1,4 +1,8 @@
-from .VERSION import __version__, __release_date__
+from .VERSION import __version__, __release_time__,is_released_version
+
+from dotenv import load_dotenv
+load_dotenv("/opt/hiddify-manager/hiddify-panel/app.cfg")
+
 # from . import cache
 from . import Events
 from .base import create_app, create_app_wsgi

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/auth.py

@@ -142,14 +142,19 @@ def get_account_by_uuid(uuid, is_admin):
     return AdminUser.by_uuid(f'{uuid}') if is_admin else User.by_uuid(f'{uuid}')
 
 
-def login_by_uuid(uuid, is_admin: bool):
+def login_by_uuid(uuid,password:str, is_admin: bool)->bool:
     account = get_account_by_uuid(uuid, is_admin)
     if not account:
         return False
+    if account.password!=password:
+        return False
     return login_user(account, force=True)
 
 
 def auth_before_request():
+    if ".webmanifest" in request.path:
+        return
+
     # print("before_request")
     account = None
 
@@ -160,7 +165,7 @@ def auth_before_request():
         # print("uuid", g.uuid, is_admin_path)
         account = get_account_by_uuid(g.uuid, is_admin_path)
         # print(account)
-        if not account:
+        if not account or account.password!="":
             return logout_redirect()
         if is_admin_path:
             next_url = request.url
@@ -230,7 +235,7 @@ def redirect_to_login():
         json_abort(403, 'Unathorized')
     # if g.user_agent['is_browser']:
     # return redirect(hurl_for('common_bp.LoginView:basic_0', force=1, next=request.path))
-    return redirect(hurl_for('common_bp.LoginView:index', force=1, next=request.path))
+    return redirect(hurl_for('common_bp.LoginView:index', force=1, next=request.path.replace(f'{g.uuid}/',''),user=g.uuid))
 
     # else:
     #     abort(401, "Unauthorized")

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/base.py

@@ -42,12 +42,13 @@ def create_app(*args, cli=False, **config):
     # app = Flask(__name__, static_url_path="/<proxy_path>/static/", instance_relative_config=True)
 
     if not cli:
-        from hiddifypanel.cache import redis_client
+        
         from hiddifypanel import auth
         app.config["PREFERRED_URL_SCHEME"] = "https"
         app.wsgi_app = ProxyFix(
             app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1,
         )
+        app.secret_key="asdsad"
         app.servers = {
             'name': 'current',
             'url': '',
@@ -68,18 +69,7 @@ def create_app(*args, cli=False, **config):
         # setup flask server-side session
         # app.config['APPLICATION_ROOT'] = './'
         # app.config['SESSION_COOKIE_DOMAIN'] = '/'
-        app.config['SESSION_TYPE'] = 'redis'
-        app.config['SESSION_REDIS'] = redis_client
-        app.config['SESSION_PERMANENT'] = True
-        app.config['PERMANENT_SESSION_LIFETIME'] = datetime.timedelta(days=10)
-        app.security_schemes = {  # equals to use config SECURITY_SCHEMES
-            'Hiddify-API-Key': {
-                'type': 'apiKey',
-                'in': 'header',
-                'name': 'Hiddify-API-Key',
-            }
-        }
-        Session(app)
+        
 
         app.jinja_env.line_statement_prefix = '%'
         from hiddifypanel import hutils
@@ -112,6 +102,19 @@ def create_app(*args, cli=False, **config):
     app.jinja_env.globals['get_locale'] = get_locale
     babel = Babel(app, locale_selector=get_locale)
     if not cli:
+        app.config['SESSION_TYPE'] = 'redis'
+        from hiddifypanel.cache import redis_client
+        app.config['SESSION_REDIS'] = redis_client
+        app.config['SESSION_PERMANENT'] = True
+        app.config['PERMANENT_SESSION_LIFETIME'] = datetime.timedelta(days=10)
+        app.security_schemes = {  # equals to use config SECURITY_SCHEMES
+            'Hiddify-API-Key': {
+                'type': 'apiKey',
+                'in': 'header',
+                'name': 'Hiddify-API-Key',
+            }
+        }
+        Session(app)
         hiddifypanel.panel.common.init_app(app)
         hiddifypanel.panel.common_bp.init_app(app)
 
@@ -122,7 +125,7 @@ def create_app(*args, cli=False, **config):
 
     app.config.update(config)  # Override with passed config
     # app.config['WTF_CSRF_CHECK_DEFAULT'] = False
-    app.config['WTF_CSRF_ENABLED'] = False
+    # app.config['WTF_CSRF_ENABLED'] = False
     # app.config['BABEL_TRANSLATION_DIRECTORIES'] = '/workspace/Hiddify-Server/hiddify-panel/src/translations.i18n'
 
     # from flask_wtf.csrf import CSRFProtect
@@ -131,15 +134,15 @@ def create_app(*args, cli=False, **config):
 
     # @app.before_request
     # def check_csrf():
-    # if "/admin/user/" in request.base_url:
-    #     return
-    # if "/admin/domain/" in request.base_url:
-    #     return
-    # if "/admin/actions/" in request.base_url:
-    #     return
-    # if "/api/" in request.base_url:
-    #     return
-    # csrf.protect()
+    # # if "/admin/user/" in request.base_url:
+    # #     return
+    # # if "/admin/domain/" in request.base_url:
+    # #     return
+    # # if "/admin/actions/" in request.base_url:
+    # #     return
+    # # if "/api/" in request.base_url:
+    # #     return
+    #     csrf.protect()
 
     hiddifypanel.panel.cli.init_app(app)
     return app

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/cache.py

@@ -1,9 +1,10 @@
+import os
 from redis_cache import RedisCache, chunks, compact_dump
 import redis
 from pickle import dumps, loads
 from loguru import logger
 
-redis_client = redis.from_url('unix:///opt/hiddify-manager/other/redis/run.sock?db=0')
+redis_client = redis.from_url(os.environ["REDIS_URI_MAIN"])
 
 
 class CustomRedisCache(RedisCache):

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/drivers/ssh_liberty_bridge_api.py

@@ -1,3 +1,4 @@
+import os
 from .abstract_driver import DriverABS
 from hiddifypanel.models import *
 import redis
@@ -13,7 +14,7 @@ class SSHLibertyBridgeApi(DriverABS):
 
     def get_ssh_redis_client(self):
         if not hasattr(self, 'redis_client'):
-            self.redis_client = redis.from_url('unix:///opt/hiddify-manager/other/redis/run.sock?db=1', decode_responses=True)
+            self.redis_client = redis.from_url(os.environ.get("REDIS_URI_SSH",""), decode_responses=True)
 
         return self.redis_client
 

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/drivers/wireguard_api.py

@@ -13,7 +13,7 @@ USERS_USAGE = "wg:users-usage"
 class WireguardApi(DriverABS):
     def get_redis_client(self):
         if not hasattr(self, 'redis_client'):
-            self.redis_client = redis.from_url('unix:///opt/hiddify-manager/other/redis/run.sock?db=1')
+            self.redis_client = redis.from_url(os.environ.get("REDIS_URI_SSH",""))
 
         return self.redis_client
 

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/crypto.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import x25519, ed25519
@@ -46,3 +47,29 @@ def generate_x25519_keys():
     priv_str = base64.urlsafe_b64encode(priv_bytes).decode()[:-1]
 
     return {'private_key': priv_str, 'public_key': pub_str}
+
+
+
+def generate_ssh_host_keys():
+    key_types = ["dsa", "ecdsa", "ed25519", "rsa"]
+    keys_dict = {}
+
+    # Generate and read keys
+    for key_type in key_types:
+        key_file = f"ssh_host_{key_type}_key"
+
+        subprocess.run([
+            "ssh-keygen", "-t", key_type,
+            "-f", key_file,
+            "-N", "" 
+        ], check=True)
+
+        keys_dict[key_type]={}
+        with open(key_file, "r") as f:
+            keys_dict[key_type]['pk'] = f.read()
+        with open(f"{key_file}.pub", "r") as f:
+            keys_dict[key_type]['pub'] = f.read()
+
+        os.remove(key_file)
+        os.remove(f"{key_file}.pub")  # Remove the public key if not needed
+    return keys_dict

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/flask.py

@@ -51,7 +51,7 @@ def hurl_for(endpoint, **values):
 def get_user_agent() -> dict:
     ua = __parse_user_agent(request.user_agent.string)
 
-    if ua.get('v', 1) < 7:
+    if ua.get('v', 1) < 8:
         __parse_user_agent.invalidate_all()  # type:ignore
         ua = __parse_user_agent(request.user_agent.string)
     return ua
@@ -65,13 +65,14 @@ def __parse_user_agent(ua: str) -> dict:
     # Example: SFA/1.8.0 (239; sing-box 1.8.0)
     # Example: SFA/1.7.0 (239; sing-box 1.7.0)
     # Example: HiddifyNext/0.13.6 (android) like ClashMeta v2ray sing-box
-
+    if ua=="v2rayNG/1.8.23": #temporary fix for xray sub in hiddifynext
+        ua="HiddifyNextX/0.13.6 (android) like ClashMeta v2ray sing-box"
     uaa = user_agents.parse(ua)
 
     match = re.search(ua_version_pattern, ua)
     generic_version = list(map(int, match.group(1).split('.'))) if match else [0, 0, 0]
     res = {}
-    res['v'] = 7
+    res['v'] = 8
     res["is_bot"] = uaa.is_bot
     res["is_browser"] = re.match('^Mozilla', ua, re.IGNORECASE) and True
     res['os'] = uaa.os.family
@@ -80,6 +81,7 @@ def __parse_user_agent(ua: str) -> dict:
     res['is_clash_meta'] = re.match('^(Clash-verge|Clash-?Meta|Stash|NekoBox|NekoRay|Pharos|hiddify-desktop)', ua, re.IGNORECASE) and True
     res['is_singbox'] = re.match('^(HiddifyNext|Dart|SFI|SFA)', ua, re.IGNORECASE) and True
     res['is_hiddify'] = re.match('^(HiddifyNext)', ua, re.IGNORECASE) and True
+    res['is_hiddify_prefere_xray'] = re.match('^(HiddifyNextX)', ua, re.IGNORECASE) and True
     res['is_streisand'] = re.match('^(Streisand)', ua, re.IGNORECASE) and True
     res['is_shadowrocket'] = re.match('^(Shadowrocket)', ua, re.IGNORECASE) and True
     res['is_v2rayng'] = re.match('^(v2rayNG)', ua, re.IGNORECASE) and True

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/network/cf_api.py

@@ -1,18 +1,18 @@
-import CloudFlare
+import cloudflare
 from hiddifypanel.models import hconfig, ConfigEnum
 
-__cf: CloudFlare.CloudFlare = ''  # type: ignore
+__cf: cloudflare.Cloudflare   # type: ignore
 
 
 def __prepare_cf_api_client() -> bool:
     '''Prepares cloudflare client if it's not already'''
     global __cf
-    if __cf and isinstance(__cf, CloudFlare.CloudFlare):
+    if __cf and isinstance(__cf, cloudflare.Cloudflare):
         return True
 
     if hconfig(ConfigEnum.cloudflare):
-        __cf = CloudFlare.CloudFlare(token=hconfig(ConfigEnum.cloudflare))
-        if __cf and isinstance(__cf, CloudFlare.CloudFlare):
+        __cf = cloudflare.Cloudflare(token=hconfig(ConfigEnum.cloudflare))
+        if __cf and isinstance(__cf, cloudflare.Cloudflare):
             return True
     return False
 

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/clash.py

@@ -57,7 +57,7 @@ def to_clash(proxy, meta_or_normal):
     if proxy["proto"] == "ssh":
         base["username"] = proxy["uuid"]
         base["private-key"] = proxy['private_key']
-        base["host-key"] = proxy.get('host_key', [])
+        base["host-key"] = proxy.get('host_keys', [])
         return base
     base["udp"] = True
     if proxy["proto"] == ProxyProto.wireguard:

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/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
@@ -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-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/hutils/proxy/singbox.py

@@ -45,6 +45,8 @@ def configs_as_json(domains: list[Domain], **kwargs) -> str:
 
 
 def is_xray_proxy(proxy: dict):
+    if g.user_agent.get('is_hiddify_prefere_xray'):
+        return True
     if proxy['transport'] == ProxyTransport.splithttp:
         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-10.70.9 → hiddifypanel-10.80.0.dev1}/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}'
 

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/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-10.70.9 → hiddifypanel-10.80.0.dev1}/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-10.70.9 → hiddifypanel-10.80.0.dev1}/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 {

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/models/config_enum.py

@@ -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-10.70.9 → hiddifypanel-10.80.0.dev1}/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-10.70.9 → hiddifypanel-10.80.0.dev1}/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")
 
@@ -204,6 +205,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 +214,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

{hiddifypanel-10.70.9 → hiddifypanel-10.80.0.dev1}/hiddifypanel/panel/admin/ProxyAdmin.py

@@ -96,6 +96,8 @@ def get_all_proxy_form(empty=False):
 
     for cdn in categories1:
         class CDNForm(FlaskForm):
+            class Meta:
+                csrf = False
             pass
         cdn_proxies = [c for c in proxies if c.cdn == cdn]
         pgroup = {
@@ -107,6 +109,8 @@ def get_all_proxy_form(empty=False):
         protos = sorted([c for c in {pgroup.get(c.proto, c.proto): 1 for c in cdn_proxies}])
         for proto in protos:
             class ProtoForm(FlaskForm):
+                class Meta:
+                    csrf = False
                 pass
             proto_proxies = [c for c in cdn_proxies if pgroup.get(c.proto, c.proto) == proto]
             for proxy in proto_proxies: