hiddifypanel 9.0.0.dev20__tar.gz → 9.0.0.dev22__tar.gz

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/HISTORY.md

@@ -19,6 +19,8 @@
 
 * Add warp custom sites. 
 
+* Add issue from menu. 
+
 * Add custom CFG path. 
 
 * Fix bug when no backup exist. 
@@ -49,12 +51,22 @@
 
 #### Fix
 
+* Domains not removed. 
+
+* Domains in mtproxy. 
+
+* Bug in user.py. 
+
+* Get telegram bot in get_common_data method. 
+
 * Backup restore. 
 
 * Bug in report issue. 
 
 * Multiple ip. 
 
+* Common.py bug. 
+
 * Admin link. 
 
 * Admin link bug. 
@@ -155,6 +167,20 @@
 
 #### Other
 
+* Better mtproxy. 
+
+* Review code. 
+
+* Merge pull request #42 from Iam54r1n4/main. 
+
+* Merge github.com:hiddify/HiddifyPanel Add user.py api. 
+
+* Fix typo. 
+
+* Refactor github issue things. 
+
+* Merge branch 'main' of github.com:Iam54r1n4/HiddifyPanel. 
+
 * Add json5. 
 
 * Hide v2ray configs. 
@@ -165,6 +191,8 @@
 
 * Add default warp_sites. 
 
+* Merge branch 'main' of github.com:Iam54r1n4/HiddifyPanel. 
+
 * Fix version in the dependencies. 
 
 * Change name to hiddify manager. 

hiddifypanel-9.0.0.dev22/PKG-INFO

@@ -0,0 +1,127 @@
+Metadata-Version: 2.1
+Name: hiddifypanel
+Version: 9.0.0.dev22
+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: ansi2html==1.8.0
+Requires-Dist: async-timeout==4.0.3
+Requires-Dist: babel==2.12.1
+Requires-Dist: bootstrap-flask==2.2.0
+Requires-Dist: click==8.1.3
+Requires-Dist: cloudflare~=2.11.7
+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.3
+Requires-Dist: flask-admin==1.6.0
+Requires-Dist: flask-babel==3.1.0
+Requires-Dist: flask-babelex==0.9.4
+Requires-Dist: flask-restful==0.3.9
+Requires-Dist: Flask-WTF==1.1.1
+Requires-Dist: gunicorn==20.1.0
+Requires-Dist: h2~=4.1.0
+Requires-Dist: json5==0.9.14
+Requires-Dist: lastversion==3.3.2
+Requires-Dist: MarkupSafe==2.0.1
+Requires-Dist: maxminddb~=2.4.0
+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
+Requires-Dist: python-dateutil==2.8.2
+Requires-Dist: python-dotenv==1.0.0
+Requires-Dist: python-redis-cache==2.2.5
+Requires-Dist: pyuwsgi==2.0.22
+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: 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.2
+Requires-Dist: WTForms==3.0.1
+Requires-Dist: xtlsapi==3.1.2
+Provides-Extra: test
+Requires-Dist: flask-debugtoolbar; extra == "test"
+Requires-Dist: flask-shell-ipython; extra == "test"
+Requires-Dist: ipdb; extra == "test"
+Requires-Dist: pytest-flask; extra == "test"
+Requires-Dist: python-dotenv; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: flake8; extra == "test"
+Requires-Dist: black; extra == "test"
+Requires-Dist: isort; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: codecov; extra == "test"
+Requires-Dist: mypy; extra == "test"
+Requires-Dist: gitchangelog; extra == "test"
+Requires-Dist: mkdocs; extra == "test"
+
+# hiddifypanel 
+
+ hiddifypanel to create multi proxy using xray mtproxy and others
+
+# How to use it
+Please visit https://github.com/hiddify/hiddify-manager/wiki for the installation.
+
+# Source Code: https://github.com/hiddify1/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-9.0.0.dev22/hiddifypanel/VERSION

@@ -0,0 +1 @@
+9.0.0.dev22

hiddifypanel-9.0.0.dev22/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='9.0.0.dev22'
+from datetime import datetime
+__release_date__= datetime.strptime('2023-10-30','%Y-%m-%d')

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/hiddifypanel/models/domain.py

@@ -8,6 +8,7 @@ from strenum import StrEnum
 from hiddifypanel.panel.database import db
 from .config import hconfig
 from .config_enum import ConfigEnum
+from sqlalchemy.orm import backref
 
 
 class DomainType(StrEnum):
@@ -47,7 +48,7 @@ class Domain(db.Model, SerializerMixin):
     show_domains = db.relationship('Domain', secondary=ShowDomain,
                                    primaryjoin=id == ShowDomain.c.domain_id,
                                    secondaryjoin=id == ShowDomain.c.related_id,
-                                   # backref=backref('show_domains', lazy='dynamic')
+                                   backref=backref('showed_by_domains', lazy='dynamic')
                                    )
 
     def __repr__(self):
@@ -76,7 +77,7 @@ class Domain(db.Model, SerializerMixin):
 
     @property
     def need_valid_ssl(self):
-        return self.mode in ['direct', 'cdn', 'worker', 'relay', 'auto_cdn_ip', 'old_xtls_direct', 'sub_link_only']
+        return self.mode in [DomainType.direct, DomainType.cdn, DomainType.worker, DomainType.relay, DomainType.auto_cdn_ip, DomainType.old_xtls_direct, DomainType.sub_link_only]
 
     @property
     def port_index(self):

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/hiddifypanel/panel/admin/Dashboard.py

@@ -1,4 +1,6 @@
 import datetime
+import os
+import re
 
 from flask import render_template, url_for, request, jsonify, g, redirect, abort
 from flask_babelex import lazy_gettext as _
@@ -23,7 +25,7 @@ class Dashboard(FlaskView):
         ))
 
     def index(self):
-        print(hconfig(ConfigEnum.first_setup))
+        
         if hconfig(ConfigEnum.first_setup):
             return redirect(url_for("admin.QuickSetup:index"))
         if hiddifypanel.__release_date__ + datetime.timedelta(days=20) < datetime.datetime.now():
@@ -70,6 +72,8 @@ class Dashboard(FlaskView):
             d = domains[0]
             u = def_user.uuid
             flash((_('It seems that you have not created any users yet. Default user link: %(default_link)s', default_link=hiddify.get_user_link(u, d))), 'secondary')
+        if hiddify.is_ssh_password_authentication_enabled():
+            flash(_('ssh.password-login.warning.'), "warning")
 
     # except:
     #     flash((_('Error!!!')),'info')
@@ -85,3 +89,4 @@ class Dashboard(FlaskView):
         db.session.commit()
         flash(_("child has been removed!"), "success")
         return self.index()
+

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/hiddifypanel/panel/admin/DomainAdmin.py

@@ -1,6 +1,6 @@
 from hiddifypanel.models import *
 import re
-
+from hiddifypanel.panel.database import db
 from flask import Markup
 from flask import g, flash
 from flask_babelex import gettext as __
@@ -248,6 +248,9 @@ class DomainAdmin(AdminLTEModelView):
     def on_model_delete(self, model):
         if len(Domain.query.all()) <= 1:
             raise ValidationError(f"at least one domain should exist")
+        # ShowDomain.query.filter_by(related_id == model.id).delete()
+        model.showed_by_domains = []
+        # db.session.commit()
         hiddify.flash_config_success(restart_mode='apply', domain_changed=True)
 
     def after_model_delete(self, model):
@@ -260,7 +263,7 @@ class DomainAdmin(AdminLTEModelView):
             set_hconfig(ConfigEnum.first_setup, False)
         # if hconfig(ConfigEnum.parent_panel):
         #     hiddify_api.sync_child_to_parent()
-        if model.mode in [DomainType.direct, DomainType.cdn, DomainType.worker, DomainType.relay, DomainType.auto_cdn_ip, DomainType.old_xtls_direct, DomainType.sub_link_only]:
+        if model.need_valid_ssl():
             hiddify.exec_command(f"sudo /opt/hiddify-manager/acme.sh/get_cert.sh {model.domain}")
 
     def is_accessible(self):

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/hiddifypanel/panel/common.py

@@ -23,27 +23,9 @@ def init_app(app):
     def internal_server_error(e):
         if not hasattr(e, 'code') or e.code == 500:
             trace = traceback.format_exc()
-            trace = remove_unrelated_stacktrace_details(trace)
-            issue_body = f"""
-# Internal Error Stacktrace:
-**Error Message**:   {str(e)}
-```
-{trace}
-```
-## Details:
-**Hiddify Version**: {hiddifypanel.__version__}
-**Python Version**:  {python_version}
-**OS**:              {platform()}
-            """
-
-            # Add user agent if exists
-            if hasattr(g, 'user_agent') and str(g.user_agent):
-                issue_body += f"**User Agent**: {str(g.user_agent)}"
 
             # Create github issue link
-            issue_link = generate_github_issue_link(e, issue_body)
-            # Remove proxy path and uuid from stacktrace details
-            remove_sensetive_data_from_github_issue_link(issue_link)
+            issue_link = generate_github_issue_link_for_500_error(e, trace)
 
             last_version = hiddify.get_latest_release_version('hiddifypanel')
             has_update = "T" not in hiddifypanel.__version__ and "dev" not in hiddifypanel.__version__ and f'{last_version}' != hiddifypanel.__version__
@@ -53,40 +35,11 @@ def init_app(app):
 
         return render_template('error.html', error=e), e.code
 
-    def remove_sensetive_data_from_github_issue_link(issue_link):
-        if hasattr(g, 'user_uuid') and g.user_uuid:
-            issue_link.replace(f'{g.user_uuid}', '*******************')
-        if hconfig(ConfigEnum.proxy_path) and hconfig(ConfigEnum.proxy_path):
-            issue_link.replace(hconfig(ConfigEnum.proxy_path), '**********')
-
-    def remove_unrelated_stacktrace_details(stacktrace: str):
-        lines = stacktrace.splitlines()
-        if len(lines) < 1:
-            return ""
-
-        output = ''
-        skip_next_line = False
-        for i, line in enumerate(lines):
-            if i == 0:
-                output += line + '\n'
-                continue
-            if skip_next_line == True:
-                skip_next_line = False
-                continue
-            if line.strip().startswith('File'):
-                if 'hiddify' in line.lower():
-                    output += line + '\n'
-                    if i < len(lines)-1:
-                        output += lines[i + 1] + '\n'
-                skip_next_line = True
-
-        return output
-
-    def generate_github_issue_link(e, issue_body):
+    def generate_github_issue_link(title, issue_body):
         opts = {
             "user": 'hiddify',
             "repo": 'Hiddify-Manager',
-            "title": f"Internal server error: {e}",
+            "title": title,
             "body": issue_body,
         }
         issue_link = str(github_issue_generator.IssueUrl(opts).get_url())
@@ -169,4 +122,95 @@ def init_app(app):
             if (not telegrambot.bot) or (not telegrambot.bot.username):
                 telegrambot.register_bot()
             g.bot = telegrambot.bot
+        else:
+            g.bot = None
+
         # print(g.user)
+
+    def github_issue_details():
+        details = {
+            'hiddify_version': f'{hiddifypanel.__version__}',
+            'python_version': f'{python_version}',
+            'os_details': f'{platform()}',
+            'user_agent': 'Unknown'
+        }
+        if hasattr(g, 'user_agent') and str(g.user_agent):
+            details['user_agent'] = g.user_agent.ua_string
+        return details
+
+    def generate_github_issue_link_for_500_error(error, traceback, remove_sensetive_data=True, remove_unrelated_traceback_datails=True):
+
+        def remove_sensetive_data_from_github_issue_link(issue_link):
+            if hasattr(g, 'user_uuid') and g.user_uuid:
+                issue_link.replace(f'{g.user_uuid}', '*******************')
+            if hconfig(ConfigEnum.proxy_path) and hconfig(ConfigEnum.proxy_path):
+                issue_link.replace(hconfig(ConfigEnum.proxy_path), '**********')
+
+        def remove_unrelated_traceback_details(stacktrace: str):
+            lines = stacktrace.splitlines()
+            if len(lines) < 1:
+                return ""
+
+            output = ''
+            skip_next_line = False
+            for i, line in enumerate(lines):
+                if i == 0:
+                    output += line + '\n'
+                    continue
+                if skip_next_line == True:
+                    skip_next_line = False
+                    continue
+                if line.strip().startswith('File'):
+                    if 'hiddify' in line.lower():
+                        output += line + '\n'
+                        output += lines[i + 1] + '\n'
+                    skip_next_line = True
+
+            return output
+
+        if remove_unrelated_traceback_datails:
+            traceback = remove_unrelated_traceback_details(traceback)
+
+        gd = github_issue_details()
+
+        issue_body = f"""
+# Internal Error Stacktrace:
+**Error Message**:   {str(error)}
+```
+{traceback}
+```
+## Details:
+**Hiddify Version**: {gd['hiddify_version']}
+**Python Version**:  {gd['python_version']}
+**OS**:              {gd['os_details']}
+**User Agent**:      {gd['user_agent'] if gd['user_agent'] else "Unknown"}
+            """
+
+        # Create github issue link
+        issue_link = generate_github_issue_link(f"Internal server error: {error.name if hasattr(error,'name') and error.name != None and error.name else 'Unknown'}", issue_body)
+
+        if remove_sensetive_data:
+            remove_sensetive_data_from_github_issue_link(issue_link)
+
+        return issue_link
+
+    def generate_github_issue_link_for_admin_sidebar():
+
+        gd = github_issue_details()
+
+        issue_body = f"""
+# Bug:
+**Description**:     "Describe your problem"
+
+## Details:
+**Hiddify Version**: {gd['hiddify_version']}
+**Python Version**:  {gd['python_version']}
+**OS**:              {gd['os_details']}
+**User Agent**:      {gd['user_agent'] if gd['user_agent'] else "Unknown"}
+                """
+
+        # Create github issue link
+        issue_link = generate_github_issue_link('Please fill the title properly', issue_body)
+        return issue_link
+
+    app.jinja_env.globals['generate_github_issue_link_for_admin_sidebar'] = generate_github_issue_link_for_admin_sidebar

{hiddifypanel-9.0.0.dev20 → hiddifypanel-9.0.0.dev22}/hiddifypanel/panel/hiddify.py

@@ -724,3 +724,17 @@ def __parse_user_agent(ua):
     if res["is_browser"]:
         res['app'] = uaa.browser.family
     return res
+
+
+def is_ssh_password_authentication_enabled():
+    if os.path.isfile('/etc/ssh/sshd_config'):
+        content = ''
+        with open('/etc/ssh/sshd_config', 'r') as f:
+            for line in f.readlines():
+                line = line.strip()
+                if line.startswith('#'):
+                    continue
+                if re.search("^PasswordAuthentication\s+no", line, re.IGNORECASE):
+                    return False
+
+    return True