hiddifypanel 10.12.0__tar.gz → 10.15.0.dev0__tar.gz

{hiddifypanel-10.12.0 → hiddifypanel-10.15.0.dev0}/HISTORY.md

@@ -1,6 +1,469 @@
 # Changelog
 
 
+## (unreleased)
+
+#### New
+
+* Add warp_sites validator. 
+
+* Add remaining days to reset. 
+
+#### Changes
+
+* Auth. 
+
+* Remove uuid as apikey (except for register) 
+
+* Better redis cache invalidation. 
+
+* Seperate child and node. 
+
+* Don't login with super admin account in node api calls need to be tested. 
+
+* Use Child.current instead of g.node in node apis need to be tested. 
+
+* Log to stdout. 
+
+* Refactor api_client(test) 
+
+* Refactor. 
+
+* User model ips property to devices. 
+
+* Improve code. 
+
+* Refactor api structure & implement get_panel_info function. 
+
+* Better query. 
+
+* Refactor child.py. 
+
+* Node auth. 
+
+* Child-parent(node) auth. 
+
+* Parse parent_panel as it's parent url with uuid (no unique id) 
+
+* Refactor. 
+
+* Refactor & bug fix. 
+
+* Hide parent settings for now. 
+
+* Refactor. 
+
+* Hide parent setting when panel is in parent mode. 
+
+* Refactor. 
+
+* Refactor. 
+
+* Refactor & bug fix. 
+
+* Authentication approach in api calls between child and parent. 
+
+* Little refactor. 
+
+* Improve usage api approach. 
+
+* Enable sync with parent when needed. 
+
+* Refactor child aliveness api. 
+
+* Send parent api request with api key. 
+
+* Parent APIs route (remove UUID) 
+
+* Refactor. 
+
+* Cleanup. 
+
+* Refactor & bug fix - child-parent-api. 
+
+* Don't set child_unique_id field manually in apis(there's no need anhymore) little refactoring. 
+
+* Change panel self child(child with 0 id) unique_id to hconfig(ConfigEnum.unique_id) instead of default "self" value. 
+
+* ConfigEnum.parent_panel category to too_advanced. 
+
+#### Fix
+
+* Bug. 
+
+* Child bug. 
+
+* Sqlachemey update. 
+
+* Send backup to admin through telegram bot. 
+
+* Add admin bug. 
+
+* Issue. 
+
+* Empty sites. 
+
+* Get proxies. 
+
+* Bug. 
+
+* Bug. 
+
+* Bug. 
+
+* Node auth. 
+
+* Redis_cache again. 
+
+* Redis_cache bug. 
+
+* Usage. 
+
+* Bug. 
+
+* Bug. 
+
+* Bug. 
+
+* Bug in usage api. 
+
+* Bug. 
+
+* Bugs. 
+
+* Circular import. 
+
+* Bug. 
+
+* Missing import. 
+
+* Missing import. 
+
+* Status api bug. 
+
+* Bug. 
+
+* Circular dependency. 
+
+* Refator. 
+
+* Merge conflict. 
+
+* Bug. 
+
+* Users usage api bug. 
+
+* Sync request bug. 
+
+* Bug in register api. 
+
+* Adding parent. 
+
+* Status api bug. 
+
+* Flask error handler. 
+
+* Bug. 
+
+* Bug in hiddify_api & init child APIs to app. 
+
+* Bug in hiddify_api. 
+
+* Bug in authentication. 
+
+* Small bug. 
+
+* Register/sync. 
+
+* Parent admin links in admin layout sidebar. 
+
+* Sync usage with parent automatically. 
+
+* Usage api (child side) 
+
+* Usage api (in child) 
+
+* Usage api. 
+
+* Child parent usage api. 
+
+* Bug. 
+
+* Usage api (test) 
+
+* Bug in getting child status. 
+
+* Parent dashboard bug. 
+
+* Adding domain bug. 
+
+* Admin layout ui (parent mode) 
+
+* Bugs. 
+
+* Bug. 
+
+* Bug. 
+
+* Bug and add description. 
+
+#### Other
+
+* Update. 
+
+* Merge pull request #189 from Iscgr/main. 
+  _Update translations_
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Merge branch 'hiddify:main' into main. 
+
+* Fink 🐦: update translations. 
+
+* Merge pull request #190 from Iam54r1n4/devp10-patch-1. 
+  _Bug fix_
+
+* Update. 
+
+* Fink 🐦: update translations. 
+
+* Update. 
+
+* Update to python 3.13. 
+
+* Update. 
+
+* Update. 
+
+* Update dependencies. 
+
+* Update translations. 
+
+* Merge. 
+
+* Merge pull request #187 from Iam54r1n4/devp-child-parent. 
+  _Implement child-parent(Nodes) API (Partly)_
+
+* Update config.py. 
+
+* Update child.py. 
+
+* Update api_client.py. 
+
+* Update api_client.py. 
+
+* Update base.py. 
+
+* Merge branch 'main' into devp-child-parent. 
+
+* Merge pull request #188 from Iam54r1n4/devp-disable-config. 
+  _disable unwanted configs_
+
+* Add: quic/xtls/h2"_enable" configs. 
+
+* Add: tcp enable. 
+
+* Add: vless/trojan/reality"_enable" configs. 
+
+* Merge pull request #183 from NiklasBuchfink/main. 
+  _Add Ninja i18n lint action_
+
+* Rename ninja-i18n.yml to ninja_i18n.yml. 
+
+* Add ninja-i18n.yml. 
+
+* Chg. 
+
+* Del: parent_admin_uuid config. 
+
+* Chg. 
+
+* Add: string/bool field to hconfig schema. 
+
+* Chg. 
+
+* Add: enum type descr to config_enum.py. 
+
+* Add: logging to child/parent apis. 
+
+* Add: invalidate cache after sync/register. 
+
+* Add: invalidate_all_cached_functions to redis cache. 
+
+* Add: logging to project and use it in hutils.node. 
+
+* Chg. 
+
+* Add: api http client & refactor api schemas. 
+
+* Add: version checking before registering. 
+
+* Add: panel info api (for now just getting panel version) 
+
+* Add: log level config. 
+
+* Add: new parent as a chlid to child parent after registering chg: node auth. 
+
+* Chg. 
+
+* Del: if. 
+
+* Better: query. 
+
+* Del: extras. 
+
+* Del: set_db parameter. 
+
+* Update xray_api.py. 
+
+* Add: db version for parent configs. 
+
+* Merge branch 'devp-child-parent' of github.com:Iam54r1n4/HiddifyPanel into devp-child-parent. 
+
+* Add: send sync request to childs from parent when needed. 
+
+* Add: request child to sync to hiddify_api.py. 
+
+* Add: sync with parent api for child. 
+
+* Add: child status api for parent. 
+
+* Add: request to register (child side) 
+
+* Add: some apis to child panel named actions these apis allow the parent panel to control the child panel. 
+
+* Add: register parent api used in parent panel to tell a panel register itself with the parent panel, if this api return 200 status code, means the targeted panel registered in parent. 
+
+* Add: authenticate request with panel unique id itself used in child-parent api calls. 
+
+* Add: panel_mode to str_config. 
+
+* Del: old unwanted code. 
+
+* Del: commented commands. 
+
+* Add: set db from parent api response. 
+
+* Add: parent api key. 
+
+* Add: equalize panel unique id and root child unique id. 
+
+* Add: insert data. 
+
+* Del: unused. 
+
+* Merge branch 'hiddify:main' into child_parent_api. 
+
+* Merge branch 'hiddify:main' into child_parent_api. 
+
+* Chg. 
+
+* Merge branch 'child_parent_api' of github.com:Iam54r1n4/HiddifyPanel into child_parent_api. 
+
+* Use: child-parent apis. 
+
+* Merge branch 'child_parent_api' of github.com:Iam54r1n4/HiddifyPanel into child_parent_api. 
+
+* Del: child's apis blueprint (we don't need them as an public api) 
+
+* Move child's apis to hiddify_api.py file. 
+
+* Merge branch 'main' of github.com:hiddify/HiddifyPanel into child_parent_api. 
+
+* Add: to_schmea and from_schema methods to models add: some function to utils. 
+
+* Add: usage api. 
+
+* Add: sync api. 
+
+* Add: register api. 
+
+* Del: unnecessary imports. 
+
+* Add: description to api schemas. 
+
+* Refactor: admin APIs. 
+
+* Refactor: user APIs. 
+
+
+
+## v10.14.0 (2024-03-25)
+
+#### Fix
+
+* Backup issue. 
+
+* Bug. 
+
+* Bug. 
+
+* Bug of inactive drivers. 
+
+#### Other
+
+* Add secret. 
+
+* Disable usage for xray when only singbox. 
+
+* Update. 
+
+* Update ui. 
+
+* Optimize user usage. 
+
+* Merge branch 'main' of github.com:hiddify/Hiddify-Panel. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Fink 🐦: update translations. 
+
+* Add version to title. 
+
+* Update translations. 
+
+
+
+## v10.12.1 (2024-03-20)
+
+#### Fix
+
+* Wireguard update usage bug. 
+
+#### Other
+
+* Merge pull request #185 from Iam54r1n4/devp-patch1. 
+  _Fix Wireguard update usage bug_
+
+* Merge pull request #184 from Sovamm/main. 
+  _Update translations_
+
+* Fink 🐦: update translations. 
+
+
+
 ## v10.12.0 (2024-03-19)
 
 #### New

{hiddifypanel-10.12.0 → hiddifypanel-10.15.0.dev0}/PKG-INFO

@@ -1,65 +1,65 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.12.0
+Version: 10.15.0.dev0
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: flask-simplelogin==0.1.2
-Requires-Dist: flask_session==0.4.1
-Requires-Dist: python-slugify==8.0.1
-Requires-Dist: flask_cors
-Requires-Dist: flask_login
-Requires-Dist: ansi2html==1.8.0
+Requires-Dist: APIFlask==2.1.1
+Requires-Dist: Babel==2.14.0
+Requires-Dist: Bootstrap-Flask==2.3.3
+Requires-Dist: Cython==3.0.10
+Requires-Dist: Flask-Admin==1.6.1
+Requires-Dist: Flask-AdminLTE3==1.0.9
+Requires-Dist: Flask-Classful==0.16.0
+Requires-Dist: Flask-Cors==4.0.0
+Requires-Dist: Flask-Login==0.6.3
+Requires-Dist: Flask-RESTful==0.3.10
+Requires-Dist: Flask-SQLAlchemy==3.1.1
+Requires-Dist: Flask-Session==0.8.0
+Requires-Dist: Flask-WTF==1.2.1
+Requires-Dist: Flask==3.0.2
+Requires-Dist: MarkupSafe==2.1.5
+Requires-Dist: PyMySQL==1.1.0
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: SQLAlchemy-Utils==0.41.2
+Requires-Dist: SQLAlchemy-serializer==1.4.6
+Requires-Dist: SQLAlchemy==2.0.29
+Requires-Dist: StrEnum==0.4.15
+Requires-Dist: WTForms==3.1.2
+Requires-Dist: Werkzeug==3.0.1
+Requires-Dist: ansi2html==1.9.1
 Requires-Dist: async-timeout==4.0.3
-Requires-Dist: babel==2.14.0
-Requires-Dist: bootstrap-flask==2.2.0
-Requires-Dist: click==8.1.3
-Requires-Dist: cloudflare==2.12.4
-Requires-Dist: cryptography>=41.0.0
-Requires-Dist: cython==3.0.3
-Requires-Dist: dynaconf==3.2.3
-Requires-Dist: flask_adminlte3==1.0.9
-Requires-Dist: flask_classful==0.14.2
-Requires-Dist: flask_sqlalchemy==2.5.1
-Requires-Dist: flask==2.1.0
-Requires-Dist: flask-admin==1.6.1
+Requires-Dist: bjoern==3.2.2
+Requires-Dist: click==8.1.7
+Requires-Dist: cloudflare==2.19.2
+Requires-Dist: cryptography==42.0.5
+Requires-Dist: dynaconf==3.2.5
+Requires-Dist: fastenumplus==1.4.0
+Requires-Dist: flask-apispec==0.11.4
 Requires-Dist: flask-babel==4.0.0
-Requires-Dist: flask-restful==0.3.9
-Requires-Dist: Flask-WTF==1.2.1
+Requires-Dist: flask-simplelogin==0.1.2
 Requires-Dist: h2==4.1.0
-Requires-Dist: json5==0.9.14
-Requires-Dist: lastversion==3.3.2
-Requires-Dist: MarkupSafe==2.1.1
-Requires-Dist: maxminddb==2.4.0
+Requires-Dist: json5==0.9.24
+Requires-Dist: lastversion==3.5.2
+Requires-Dist: loguru==0.7.2
+Requires-Dist: maxminddb==2.6.0
+Requires-Dist: mysqlclient==2.2.4
 Requires-Dist: netifaces==0.11.0
-Requires-Dist: paramiko==3.3.1
-Requires-Dist: ping3==4.0.4
-Requires-Dist: psutil==5.9.5
-Requires-Dist: pymysql==1.1.0
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: python-dotenv==1.0.0
-Requires-Dist: python-redis-cache==3.0
-Requires-Dist: pyyaml~=6.0.1
-Requires-Dist: redis~=5.0.0
-Requires-Dist: requests~=2.31.0
-Requires-Dist: setuptools~=65.5.1
+Requires-Dist: paramiko==3.4.0
+Requires-Dist: ping3==4.0.5
+Requires-Dist: psutil==5.9.8
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: python-redis-cache==3.1.0
+Requires-Dist: python-slugify==8.0.4
+Requires-Dist: redis==5.0.3
+Requires-Dist: requests==2.31.0
 Requires-Dist: six==1.16.0
-Requires-Dist: SQLAlchemy-Utils==0.41.1
-Requires-Dist: sqlalchemy==1.4.46
-Requires-Dist: SQLAlchemy-serializer==1.4.1
-Requires-Dist: StrEnum==0.4.15
 Requires-Dist: telebot==0.0.5
-Requires-Dist: user_agents==2.2.0
-Requires-Dist: werkzeug==2.1.0
-Requires-Dist: WTForms==3.0.1
+Requires-Dist: user-agents==2.2.0
 Requires-Dist: xtlsapi==3.1.2
-Requires-Dist: apiflask==2.0.2
-Requires-Dist: flask-apispec==0.11.4
-Requires-Dist: bjoern==3.2.2
-Requires-Dist: mysqlclient<=2.2.4
-Requires-Dist: fastenumplus==1.4.0
 Provides-Extra: test
 Requires-Dist: flask-debugtoolbar; extra == "test"
 Requires-Dist: flask-shell-ipython; extra == "test"

hiddifypanel-10.15.0.dev0/hiddifypanel/VERSION

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

hiddifypanel-10.15.0.dev0/hiddifypanel/VERSION.py

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

{hiddifypanel-10.12.0 → hiddifypanel-10.15.0.dev0}/hiddifypanel/auth.py

@@ -4,7 +4,7 @@ from hiddifypanel.hutils.flask import hurl_for
 from flask_login.utils import _get_user
 from functools import wraps
 from hiddifypanel.models import *
-
+from apiflask import abort as json_abort
 from hiddifypanel import hutils
 from werkzeug.local import LocalProxy
 current_account: "BaseAccount" = LocalProxy(lambda: _get_user())
@@ -97,14 +97,17 @@ def login_user(user: AdminUser | User, remember=False, duration=None, force=Fals
     return True
 
 
-def login_required(roles: set[Role] | None = None):
+def login_required(roles: set[Role] | None = None, node_auth: bool = False):
+    '''When both roles and node_auth is set, means authentication can be done by either uuid or unique_id'''
     def wrapper(fn):
         @wraps(fn)
         def decorated_view(*args, **kwargs):
             # print('xxxx', current_account)
-            if not current_account:
+            if node_auth and not Child.node and not roles:
+                json_abort(403, 'Unauthorized node')
+            if not current_account and not node_auth:
                 return redirect_to_login()  # type: ignore
-            if roles:
+            if roles and not Child.node:
                 account_role = current_account.role
                 if account_role not in roles:
                     return redirect_to_login()  # type: ignore
@@ -151,6 +154,12 @@ def auth_before_request():
 
     elif apikey := request.headers.get("Hiddify-API-Key"):
         account = get_account_by_api_key(apikey, is_admin_path)
+        if not account:
+            # when parent/child panel needs to call another parent/child api, it will pass its unique id in the header as apikey
+            if node := Child.by_unique_id(apikey):
+                g.node = node
+                return
+
         if not account:
             return logout_redirect()
     elif request.authorization:
@@ -201,6 +210,8 @@ def logout_redirect():
 
 
 def redirect_to_login():
+    if hutils.flask.is_api_call(request.path):
+        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))