hiddifypanel 10.20.3__tar.gz → 10.30.0.dev0__tar.gz

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/HISTORY.md

@@ -1,6 +1,252 @@
 # Changelog
 
 
+## (unreleased)
+
+#### New
+
+* Optimize priodic reset usage. 
+
+#### Changes
+
+* Fix red lines for hconfig. 
+
+* Fix & refactor cloudflare api codes. 
+
+* Reduce complexity for reality domain validation. 
+
+* Fix possible bug. 
+
+* Improve sync child with parent operation. 
+
+* Refactor logger. 
+
+* Sync node in background. 
+
+* Refactor version checking. 
+
+* Vmess "security" field to auto instead of chacha20-poly1305. 
+
+* Enable hysteria2 on old_xtls_direct domain. 
+
+* Refactor Domain model. 
+
+* Hide sub enable/disable toggle(except xray json) 
+
+* Send configs even if the sub is disabled. 
+
+* Refactor. 
+
+#### Fix
+
+* Custom type. 
+
+* Resetting user's usage value in update usage operation. 
+
+* Typo. 
+
+* The shadowsocks2022 config in V2rayng, Streisand, Shadowrocket (the link sub) the other shadowsocks related configs like shadowtls, ssfaketls should be fixed. 
+
+* The shadowsocks2022 config in V2rayng (xray sub) 
+
+* Last_version not defined. 
+
+* Enabling/disabling ssfaketls. 
+
+* Cloudflare api bug related to root/sub domains. 
+
+* ASN checking. 
+
+* Default warp mode. 
+
+* Not installing warp. 
+
+* Child's user/admin links bug. 
+
+* Parent panel links bug. 
+
+* Bug. 
+
+* Outside app context bug. 
+
+* Wireguard usage api bug. 
+
+* Bugs related to venv. 
+
+* Venv bug. 
+
+* Bug & refactor. 
+
+* Telegram bot registering bug. 
+
+* Incorrect condition when current_usage_GB is 0 bug. 
+
+* User api endpoints. 
+
+* Admin api endpoints. 
+
+* Hiddifycli_enable key not found bug. 
+
+* Send xray sub if client supports. 
+
+* Mux in xray sub. 
+
+* Sub bug. 
+
+#### Other
+
+* Explicitly remove expiry date. 
+
+* Fix. 
+
+* Merge pull request #214 from Iam54r1n4/devp10-patch-21. 
+  _Fix resetting user's usage value in update usage_
+
+* Update usage.py. 
+
+* Update user.py. 
+
+* Merge pull request #216 from Iam54r1n4/devp10-patch-23. 
+  _Fix the shadowsocks2022 bug in V2rayng, Streisand, Shadowrocket clients_
+
+* Update xray.py. 
+
+* Merge pull request #213 from Iam54r1n4/devp10-patch-20. 
+  _Fix cloudflare API section_
+
+* Merge pull request #212 from Iam54r1n4/devp10-patch-19. 
+  _Fix adding reality domain_
+
+* Merge pull request #217 from glory7sa/main. 
+  _Update translations RU_
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Merge pull request #215 from Iam54r1n4/devp10-patch-22. 
+  _Fix warp installation & Disable telegram mtproto by default_
+
+* Merge pull request #211 from Iam54r1n4/devp10-patch-18. 
+  _Improve api security_
+
+* Improve: api security fixed admin privilege esclation. 
+
+* Merge pull request #210 from Iam54r1n4/devp10-patch-17. 
+  _Improve security_
+
+* Improve: security Thanks to N1k4, an XSS vulnerability was detected, this commit fixes it Note: the bleach library is deprecated but i think it's still the best choice. 
+
+* Merge pull request #209 from Iam54r1n4/devp10-patch-15. 
+  _Run sync child with parent operation in seperate thread & Improve sync api_
+
+* Del: initiate logger log. 
+
+* Merge pull request #208 from Iam54r1n4/devp10-patch-16. 
+  _Fix version checking_
+
+* Add: todo. 
+
+* Merge pull request #206 from Iam54r1n4/backward-hysteria-tuic_old_direct_domain. 
+  _Update domain.py_
+
+* Update domain.py. 
+
+* Merge pull request #207 from Iam54r1n4/devp10-patch-14. 
+  _Fix wireguard usage api bug_
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Chore: update translations with Fink 🐦 
+
+* Update translations. 
+
+* Merge branch 'main' of github.com:hiddify/Hiddify-Panel. 
+
+* Merge pull request #201 from Iam54r1n4/devp10-patch-10. 
+  _Fix venv bug panel side_
+
+* Merge pull request #202 from Iam54r1n4/devp10-patch-11. 
+  _Change vmess "security" field to auto instead of chacha20-poly1305_
+
+* Merge pull request #203 from Iam54r1n4/devp10-patch-12. 
+  _Change enable hysteria2 on old_xtls_direct domain_
+
+* Merge pull request #204 from Iam54r1n4/patch-1. 
+  _Update user.py (API bug)_
+
+* Update user.py. 
+
+* Merge pull request #205 from Iam54r1n4/devp10-patch-13. 
+  _Refactor Domain model_
+
+* Merge pull request #199 from Iam54r1n4/devp10-patch-8. 
+  _Change sending sub_
+
+* Merge pull request #198 from Iam54r1n4/fix-usages-color. 
+  _Fix usages color_
+
+* Better darkmode view. 
+
+* Fix usages color. 
+
+* Merge pull request #200 from Iam54r1n4/devp10-patch-9. 
+  _Fix api bug_
+
+* Add: fetching telegram bot info command to hiddifypanel cli. 
+
+* Merge pull request #197 from Iam54r1n4/devp10-patch-7. 
+  _Fix & Refactor APIs_
+
+* Merge pull request #196 from Iam54r1n4/devp10-patch-6. 
+  _Add enable/disable(ing) specific subscriptions feature_
+
+* Add: enable/disable(ing) specific subscriptions. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+
+
 ## v10.20.3 (2024-04-12)
 
 #### Fix

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.20.3
+Version: 10.30.0.dev0
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify
@@ -60,6 +60,7 @@ Requires-Dist: six==1.16.0
 Requires-Dist: telebot==0.0.5
 Requires-Dist: user-agents==2.2.0
 Requires-Dist: xtlsapi==3.1.2
+Requires-Dist: bleach==6.1.0
 Provides-Extra: test
 Requires-Dist: flask-debugtoolbar; extra == "test"
 Requires-Dist: flask-shell-ipython; extra == "test"

hiddifypanel-10.30.0.dev0/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.30.0.dev0

hiddifypanel-10.30.0.dev0/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.30.0.dev0'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-06-24','%Y-%m-%d')

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/base.py

@@ -18,6 +18,22 @@ from loguru import logger
 from hiddifypanel.panel.init_db import init_db
 
 
+def init_logger():
+    def dynamic_formatter(record) -> str:
+        fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
+        if record['extra']:
+            fmt += ' | <level>{extra}</level>'
+        return fmt + '\n'
+
+    # configure logger
+    from hiddifypanel.models import ConfigEnum, hconfig
+    logger.remove()
+    logger.add(sys.stderr, format=dynamic_formatter, level=hconfig(ConfigEnum.log_level), colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
+    # logger.trace('Logger initiated :)')
+
+
+# TODO: refactor this function
+
 def create_app(*args, cli=False, **config):
 
     app = APIFlask(__name__, static_url_path="/<proxy_path>/static/", instance_relative_config=True, version='2.0.0', title="Hiddify API",
@@ -75,14 +91,7 @@ def create_app(*args, cli=False, **config):
     with app.app_context():
         init_db()
 
-        # configure logger
-        from hiddifypanel.models import ConfigEnum, hconfig
-        logger.remove()
-        log_format = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level> | <level>{extra}</level>'
-        logger.add(sys.stderr, format=log_format, level=hconfig(ConfigEnum.log_level), colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
-
-    # flaskbabel = FlaskBabel(app)
-    # @babel.localeselector
+        init_logger()
 
     def get_locale():
         # Put your logic here. Application can store locale in

hiddifypanel-10.30.0.dev0/hiddifypanel/cache.py

@@ -0,0 +1,25 @@
+from redis_cache import RedisCache, chunks
+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')
+
+
+class CustomRedisCache(RedisCache):
+
+    def invalidate_all_cached_functions(self):
+        try:
+            logger.trace("Invalidating all cached functions")
+            chunks_gen = chunks(f'{self.prefix}*', 500)
+            for keys in chunks_gen:
+                self.client.delete(*keys)
+            logger.trace("Successfully invalidated all cached functions")
+            return True
+        except Exception as err:
+            with logger.contextualize(error=err):
+                logger.error("Failed to invalidate all cached functions")
+            return False
+
+
+cache = CustomRedisCache(redis_client=redis_client, prefix="h", serializer=dumps, deserializer=loads)

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/drivers/wireguard_api.py

@@ -9,15 +9,35 @@ from hiddifypanel.panel.run_commander import Command, commander
 class WireguardApi(DriverABS):
     def is_enabled(self) -> bool:
         return hconfig(ConfigEnum.wireguard_enable)
-    WG_LOCAL_USAGE_FILE_PATH = './hiddify_usages.json'
+    
+    WG_LOCAL_USAGE_FILE_PATH = os.path.join('/opt/hiddify-manager/','hiddify-panel','wireguard_usages.json')
+    OLD_WG_LOCAL_USAGE_FILE_PATH = os.path.join('/opt/hiddify-manager/','hiddify-panel','hiddify_usages.json')
 
     def __init__(self) -> None:
         super().__init__()
+
+        if os.path.isfile(WireguardApi.OLD_WG_LOCAL_USAGE_FILE_PATH) and not os.path.isfile(WireguardApi.WG_LOCAL_USAGE_FILE_PATH):
+            os.rename(WireguardApi.OLD_WG_LOCAL_USAGE_FILE_PATH,WireguardApi.WG_LOCAL_USAGE_FILE_PATH)
+
+        if not self.is_usages_file_exists_and_json():
+            self.init_empty_usages_file()
         # create empty local usage file
-        if not os.path.isfile(WireguardApi.WG_LOCAL_USAGE_FILE_PATH):
-            with open(WireguardApi.WG_LOCAL_USAGE_FILE_PATH, 'w+') as f:
-                json.dump({}, f)
 
+    def is_usages_file_exists_and_json(self) -> bool:
+        if os.path.isfile(WireguardApi.WG_LOCAL_USAGE_FILE_PATH):
+            try:
+                # try to load it as a JSON
+                self.__get_local_usage()
+                return True
+            except json.decoder.JSONDecodeError:
+                os.remove(WireguardApi.WG_LOCAL_USAGE_FILE_PATH)
+                return False
+        return False
+    def init_empty_usages_file(self):
+        with open(WireguardApi.WG_LOCAL_USAGE_FILE_PATH, 'w+') as f:
+            json.dump({}, f)
+
+    
     def __get_wg_usages(self) -> dict:
         raw_output = commander(Command.update_wg_usage, run_in_background=False)
         data = {}
@@ -34,7 +54,6 @@ class WireguardApi(DriverABS):
         return data
 
     def __get_local_usage(self) -> dict:
-
         with open(WireguardApi.WG_LOCAL_USAGE_FILE_PATH, 'r') as f:
             data = json.load(f)
             return data

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/hutils/convert.py

@@ -57,7 +57,7 @@ def json_to_time(time_str: str) -> datetime | str:
     try:
         return datetime.strptime(__fix_time_format(time_str), "%Y-%m-%d %H:%M:%S")
     except BaseException:
-        return time_str
+        return json_to_date(time_str)
 
 
 def format_timedelta(delta: timedelta, add_direction: bool = True, granularity: str = "days") -> str:

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/hutils/flask.py

@@ -5,7 +5,7 @@ from apiflask import abort as apiflask_abort
 from flask_babel import gettext as _
 from flask import url_for  # type: ignore
 from urllib.parse import urlparse
-from markupsafe import Markup
+from strenum import StrEnum
 
 import user_agents
 import re
@@ -17,7 +17,7 @@ from hiddifypanel import hutils
 
 
 def flash(message: str, category: str = "message"):
-    if not isinstance(message,str):
+    if not isinstance(message, str):
         message = str(message)
     return flask_flash(message, category)
 
@@ -82,6 +82,8 @@ def __parse_user_agent(ua: str) -> dict:
     res['is_shadowrocket'] = re.match('^(Shadowrocket)', ua, re.IGNORECASE) and True
     res['is_v2rayng'] = re.match('^(v2rayNG)', ua, re.IGNORECASE) and True
 
+    if res['is_v2rayng']:
+        res['v2rayng_version'] = generic_version
     if res['is_singbox']:
         res['singbox_version'] = generic_version
 
@@ -254,6 +256,30 @@ def extract_parent_info_from_url(url) -> Tuple[str | None, str | None, str | Non
         return domain, proxy_path, admin_uuid
     else:
         return None, None, None
+
+
+class ClientVersion(StrEnum):
+    v2ryang = 'v2rayng_version'
+    hiddify_next = 'hiddify_version'
+
+
+def is_client_version(client: ClientVersion, major_v: int = 0, minor_v: int = 0, patch_v: int = 0) -> bool:
+    '''If the user agent version be equals or higher than parameters returns True'''
+    if raw_v := g.user_agent.get(client):
+        # TODO: probably we don't need these checks and the compare_versions can handle it (need to be test)
+        raw_v_len = len(raw_v)
+        u_major_v = raw_v[0] if raw_v_len > 0 else 0
+        u_minor_v = raw_v[1] if raw_v_len > 1 else 0
+        u_patch_v = raw_v[2] if raw_v_len > 2 else 0
+
+        user_agent_v = f'{u_major_v}.{u_minor_v}.{u_patch_v}'
+        needed_version = f'{major_v}.{minor_v}.{patch_v}'
+
+        res = hutils.utils.compare_versions(user_agent_v, needed_version)
+        if res == 0 or res == 1:
+            return True
+    return False
+
 # region not used
 
 

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/hutils/importer/xui.py

@@ -1,14 +1,14 @@
 import sqlite3
 import json
-from typing import Any, Dict, List, Tuple
+import os
 import uuid as uuid_mod
+from typing import Any, Dict, List, Tuple
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+
 from hiddifypanel import hutils
 from hiddifypanel.models import *
 from hiddifypanel.database import db, db_execute
-import os
-from sqlalchemy import text
 
 
 def __query_fetch_json(db, query: str, **kwargs) -> List[Dict[str, Any]]:
@@ -65,9 +65,9 @@ def __create_hiddify_user_from_xui_values(id: str, values: Dict[str, Any]) -> "U
     user.uuid = id if hutils.auth.is_uuid_valid(id, 4) else uuid_mod.uuid4()
 
     if str(values['expiry_time']) == '0':
-        user.expiry_time = datetime.now() + relativedelta(years=10)
+        user.package_days = 3650
     else:
-        user.expiry_time = datetime.fromtimestamp(values['expiry_time'] / 1000)
+        user.package_days = max(0, (datetime.fromtimestamp(values['expiry_time'] / 1000) - datetime.today()).days)
 
     user.usage_limit = values['max_usage_bytes']
     user.current_usage = values['current_usage_bytes']
@@ -145,8 +145,7 @@ def import_data(db_path: str):
             User.add_or_update(commit=False, **u)
 
         for d in hiddify_domains_dict:
-            from hiddifypanel.panel import hiddify
-            hiddify.add_or_update_domain(commit=False, **d)
+            Domain.add_or_update(commit=False, **d)
 
         db.session.commit()  # type: ignore
     except Exception as err:

{hiddifypanel-10.20.3 → hiddifypanel-10.30.0.dev0}/hiddifypanel/hutils/network/__init__.py

@@ -2,3 +2,4 @@
 from . import auto_ip_selector
 # from .ip import get_domain_ip, get_socket_public_ip, get_interface_public_ip, get_ips, get_ip
 from .net import *
+from . import cf_api

hiddifypanel-10.30.0.dev0/hiddifypanel/hutils/network/cf_api.py

@@ -0,0 +1,84 @@
+import CloudFlare
+from hiddifypanel.models import hconfig, ConfigEnum
+
+__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):
+        return True
+
+    if hconfig(ConfigEnum.cloudflare):
+        __cf = CloudFlare.CloudFlare(token=hconfig(ConfigEnum.cloudflare))
+        if __cf and isinstance(__cf, CloudFlare.CloudFlare):
+            return True
+    return False
+
+
+def add_or_update_dns_record(domain: str, ip: str, dns_type: str = "A", proxied: bool = True) -> bool:
+    '''This function cloud throw an exception'''
+    if not __prepare_cf_api_client():
+        return False
+
+    zone_name = __extract_root_domain(domain)
+    zone = __get_zone(zone_name)
+    if zone:
+        record = __get_dns_record(zone, domain)
+        dns_name = domain[:-len(zone['name'])].replace('.', '')
+        # if the input domain is root itself
+        dns_name = '@' if not dns_name else dns_name
+        data = {
+            'name': dns_name,
+            'type': dns_type, 'content': ip, 'proxied': proxied
+        }
+        if not record:
+            api_res = __cf.zones.dns_records.post(zone['id'], data=data)
+        else:
+            api_res = __cf.zones.dns_records.put(zone['id'], record['id'], data=data)
+
+        # validate api response
+        if api_res['name'] == domain and api_res['type'] == dns_type and api_res['content'] == ip:
+            return True
+    return False
+
+
+def delete_dns_record(domain: str) -> bool:
+    '''Deletes a DNS record from cloudflare panel of user'''
+    if not __prepare_cf_api_client():
+        return False
+
+    zone_name = __extract_root_domain(domain)
+    zone = __get_zone(zone_name)
+    record = __get_dns_record(zone, domain)
+    if zone and record:
+        api_res = __cf.zones.dns_records.delete(zone['id'], record['id'])
+        if api_res['id'] == record['id']:
+            return True
+    return False
+
+
+def __get_zone(zone_name: str) -> dict | None:
+    zones = __cf.zones.get()
+    for z in zones:
+        if z['name'] == zone_name:
+            return z
+    return None
+
+
+def __get_dns_record(zone, domain: str) -> dict | None:
+    '''Returns dns record if exists'''
+    dns_records = __cf.zones.dns_records(zone['id'])
+    for r in dns_records:
+        if r['name'] == domain:
+            return r
+    return None
+
+
+def __extract_root_domain(domain: str) -> str:
+    domain_parts = domain.split(".")
+    if len(domain_parts) > 1:
+        return ".".join(domain_parts[-2:])
+    else:
+        return domain