hiddifypanel 9.0.0.dev20__py3-none-any.whl → 9.0.0.dev22__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-9.0.0.dev20
+9.0.0.dev22

hiddifypanel/VERSION.py

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

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/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/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/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/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

hiddifypanel/panel/user/user.py

@@ -7,7 +7,6 @@ import datetime
 from hiddifypanel.models import *
 from hiddifypanel.panel.database import db
 from hiddifypanel.panel import hiddify, clean_ip
-
 from . import link_maker
 from flask_classful import FlaskView, route
 import random
@@ -19,15 +18,149 @@ import re
 
 class UserView(FlaskView):
 
+    # region api
     @route('/short/')
+    @route('/short')
     def short_link(self):
-        short = hiddify.add_short_link("/"+hconfig(ConfigEnum.proxy_path)+"/"+g.user.uuid+"/")
-        ua = hiddify.get_user_agent()
-        # if (ua['is_browser']):
-        return f"<div style='direction:ltr'>https://{urlparse(request.base_url).hostname}/{short}/</a><br><br>"+_("This link will expire in 5 minutes")
-        # return short
-
-    # @route('/test/')
+        short = hiddify.add_short_link(
+            "/"+hconfig(ConfigEnum.proxy_path)+"/"+g.user.uuid+"/")
+        full_url = f"https://{urlparse(request.base_url).hostname}/{short}"
+        data = {
+            "short": f"/{short}",
+            "url": full_url
+        }
+        return jsonify(data)
+
+    @route('/info/')
+    @route('/info')
+    def info(self):
+        c = get_common_data(g.user_uuid, 'new')
+        data = {
+            'profile_title': c['profile_title'],
+            'profile_url': f"https://{urlparse(request.base_url).hostname}/{g.proxy_path}/{g.user_uuid}/#{g.user.name}",
+            'profile_usage_current': g.user.current_usage_GB,
+            'profile_usage_total': g.user.usage_limit_GB,
+            'profile_remaining_days': g.user.remaining_days,
+            'profile_reset_days': days_to_reset(g.user),
+            'telegram_bot_url': f"https://t.me/{c['bot'].username}?start={g.user_uuid}" if c['bot'] else "",
+            'admin_message_html': hconfig(ConfigEnum.branding_freetext),
+            'admin_message_url': hconfig(ConfigEnum.branding_site),
+            'brand_title': hconfig(ConfigEnum.branding_title),
+            'brand_icon_url': "",
+            'doh': f"https://{urlparse(request.base_url).hostname}/{g.proxy_path}/dns/dns-query"
+        }
+
+        return jsonify(data)
+
+    @route('/mtproxies/')
+    @route('/mtproxies')
+    def mtproxies(self):
+        # get domains
+        c = get_common_data(g.user_uuid, 'new')
+        mtproxies = []
+        # TODO: Remove duplicated domains mapped to a same ipv4 and v6
+        for d in c['domains']:
+            if d.mode not in [DomainType.direct, DomainType.relay]:
+                continue
+            hexuuid = hconfig(ConfigEnum.shared_secret, d.child_id).replace('-', '')
+            telegram_faketls_domain_hex = hconfig(ConfigEnum.telegram_fakedomain, d.child_id).encode('utf-8').hex()
+            server_link = f'tg://proxy?server={d.domain}&port=443&secret=ee{hexuuid}{telegram_faketls_domain_hex}'
+            mtproxies.append({'title': d.alias or d.domain, 'link': server_link})
+
+        return jsonify(mtproxies)
+
+    @route('/all-configs/')
+    @route('/all-configs')
+    def configs(self):
+        def create_item(name, type, domain, protocol, transport, security, link):
+            return {
+                'name': name,
+                'type': type,
+                'domain': domain,
+                'protocol': protocol,
+                'transport': transport,
+                'security': security,
+                'link': link
+            }
+
+        items = []
+        base_url = f"https://{urlparse(request.base_url).hostname}/{g.proxy_path}/{g.user_uuid}/"
+        c = get_common_data(g.user_uuid, 'new')
+
+        # Add Auto
+        items.append(
+            create_item(
+                "Auto", "All", "All", "All", "All", "All",
+                f"{base_url}sub/?asn={c['asn']}")
+        )
+
+        # Add Full Singbox
+        items.append(
+            create_item(
+                "Full Singbox", "All", "All", "All", "All", "All",
+                f"{base_url}full-singbox.json?asn={c['asn']}"
+            )
+        )
+
+        # Add Clash Meta
+        items.append(
+            create_item(
+                "Clash Meta", "All", "All", "All", "All", "All",
+                f"clashmeta://install-config?url={base_url}clash/meta/all.yml&name=mnormal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+            )
+        )
+
+        # Add Clash
+        items.append(
+            create_item(
+                "Clash", "All", "All", "Except VLess", "All", "All",
+                f"clash://install-config?url={base_url}clash/all.yml&name=new_normal_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}"
+            )
+        )
+
+        # Add Singbox: SSh
+        if hconfig(ConfigEnum.ssh_server_enable):
+            items.append(
+                create_item(
+                    "Singbox: SSH", "SSH", "SSH", "SSH", "SSH", "SSH",
+                    f"{base_url}singbox.json?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+                )
+            )
+
+        # Add Subscription link
+        items.append(
+            create_item(
+                "Subscription link", "All", "All", "All", "All", "All",
+                f"{base_url}all.txt?name={c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}&asn={c['asn']}&mode={c['mode']}"
+            )
+        )
+
+        # Add Subscription link base64
+        items.append(
+            create_item(
+                "Subscription link b64", "All", "All", "All", "All", "All",
+                f"{base_url}all.txt?name=new_link_{c['db_domain'].alias or c['db_domain'].domain}-{c['asn']}-{c['mode']}&asn={c['asn']}&mode={c['mode']}&base64=True"
+            )
+        )
+
+        for pinfo in link_maker.get_all_validated_proxies(c['domains']):
+            items.append(
+                create_item(
+                    pinfo["name"].replace("_", " "),
+                    f"{'Auto ' if pinfo['dbdomain'].has_auto_ip else ''}{pinfo['mode']}",
+                    pinfo['server'],
+                    pinfo['proto'],
+                    pinfo['transport'],
+                    pinfo['l3'],
+                    f"{link_maker.to_link(pinfo)}"
+                )
+            )
+
+        return jsonify(items)
+
+    # endregion
+
+    @route('/test/')
     def test(self):
         ua = request.user_agent.string
         if re.match('^Mozilla', ua, re.IGNORECASE):
@@ -120,7 +253,8 @@ class UserView(FlaskView):
         domain = request.args.get("domain", None)
 
         c = get_common_data(g.user_uuid, mode, filter_domain=domain)
-        resp = Response(render_template('clash_proxies.yml', meta_or_normal=meta_or_normal, **c))
+        resp = Response(render_template('clash_proxies.yml',
+                        meta_or_normal=meta_or_normal, **c))
         resp.mimetype = "text/plain"
 
         return resp
@@ -170,7 +304,8 @@ class UserView(FlaskView):
         if request.method == 'HEAD':
             resp = ""
         else:
-            resp = render_template('clash_config.yml', typ=typ, meta_or_normal=meta_or_normal, **c, hash=hash_rnd)
+            resp = render_template(
+                'clash_config.yml', typ=typ, meta_or_normal=meta_or_normal, **c, hash=hash_rnd)
 
         return add_headers(resp, c)
 
@@ -210,7 +345,8 @@ class UserView(FlaskView):
         if request.method == 'HEAD':
             resp = ""
         else:
-            resp = link_maker.make_v2ray_configs(**c)  # render_template('all_configs.txt', **c, base64=do_base_64)
+            # render_template('all_configs.txt', **c, base64=do_base_64)
+            resp = link_maker.make_v2ray_configs(**c)
 
         # res = ""
         # for line in resp.split("\n"):
@@ -262,7 +398,8 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
     default_asn = request.args.get("asn")
     if filter_domain:
         domain = filter_domain
-        db_domain = Domain.query.filter(Domain.domain == domain).first() or Domain(domain=domain, mode=DomainType.direct, cdn_ip='', show_domains=[], child_id=0)
+        db_domain = Domain.query.filter(Domain.domain == domain).first() or Domain(
+            domain=domain, mode=DomainType.direct, cdn_ip='', show_domains=[], child_id=0)
         domains = [db_domain]
     else:
         domain = urlparse(request.base_url).hostname if not no_domain else None
@@ -284,7 +421,8 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
             domains = Domain.query.all()
         elif mode == 'new':
             # db_domain=Domain.query.filter(Domain.domain==domain).first()
-            domains = db_domain.show_domains or Domain.query.filter(Domain.sub_link_only != True).all()
+            domains = db_domain.show_domains or Domain.query.filter(
+                Domain.sub_link_only != True).all()
         else:
 
             domains = [db_domain]
@@ -309,8 +447,10 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
         d.has_auto_ip = False
         if d.mode == DomainType.auto_cdn_ip or d.cdn_ip:
             has_auto_cdn = True
-            d.has_auto_ip = d.mode == DomainType.auto_cdn_ip or (d.cdn_ip and "MTN" in d.cdn_ip)
-            d.cdn_ip = clean_ip.get_clean_ip(d.cdn_ip, d.mode == DomainType.auto_cdn_ip, default_asn)
+            d.has_auto_ip = d.mode == DomainType.auto_cdn_ip or (
+                d.cdn_ip and "MTN" in d.cdn_ip)
+            d.cdn_ip = clean_ip.get_clean_ip(
+                d.cdn_ip, d.mode == DomainType.auto_cdn_ip, default_asn)
             print("autocdn ip mode ", d.cdn_ip)
         if "*" in d.domain:
             d.domain = d.domain.replace("*", hiddify.get_random_string(5, 15))
@@ -321,9 +461,6 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
         UserMode.monthly: 30
 
     }
-    bot = None
-    if hconfig(ConfigEnum.license):
-        from hiddifypanel.panel.telegrambot import bot
 
     g.locale = hconfig(ConfigEnum.lang)
     expire_days = remaining_days(user)
@@ -333,7 +470,8 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
     if reset_days >= expire_days:
         reset_days = 1000
     # print(reset_days,expire_days,reset_days<=expire_days)
-    expire_s = int((datetime.date.today()+datetime.timedelta(days=expire_days)-datetime.date(1970, 1, 1)).total_seconds())
+    expire_s = int((datetime.date.today(
+    )+datetime.timedelta(days=expire_days)-datetime.date(1970, 1, 1)).total_seconds())
 
     user_ip = clean_ip.get_real_user_ip()
     asn = clean_ip.get_asn_short_name(user_ip)
@@ -360,7 +498,7 @@ def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
         'ConfigEnum': ConfigEnum,
         'link_maker': link_maker,
         'domains': domains,
-        "bot": bot,
+        "bot": g.bot,
         "db_domain": db_domain,
         "telegram_enable": hconfig(ConfigEnum.telegram_enable) and any([d for d in domains if d.mode in [DomainType.direct, DomainType.relay, DomainType.old_xtls_direct]]),
         "ip": user_ip,
@@ -375,7 +513,8 @@ def add_headers(res, c):
     resp = Response(res)
     resp.mimetype = "text/plain"
     resp.headers['Subscription-Userinfo'] = f"upload=0;download={c['usage_current_b']};total={c['usage_limit_b']};expire={c['expire_s']}"
-    resp.headers['profile-web-page-url'] = request.base_url.rsplit('/', 1)[0].replace("http://", "https://")+"/"
+    resp.headers['profile-web-page-url'] = request.base_url.rsplit(
+        '/', 1)[0].replace("http://", "https://")+"/"
 
     if hconfig(ConfigEnum.branding_site):
         resp.headers['support-url'] = hconfig(ConfigEnum.branding_site)

hiddifypanel/templates/admin-layout.html

@@ -119,9 +119,15 @@
           <li class="nav-item d-none">
             <a href="https://t.me/hiddify" target="_blank" class="nav-link">{{icon('brands','telegram','nav-icon')+_('admin.menu.telegram')}}</a>
           </li>
+          <li class="nav-item">
+            {% set issue_link = generate_github_issue_link_for_admin_sidebar() %}
+            <li class="nav-item">
+              <a href="{{issue_link}}" target="_blank" class=" nav-link">{{icon('solid','bug','nav-icon')+_('Bug')}}</a>
+            </li>
+          </li>
           <li class="nav-item">
             <a class="nav-item nav-link" role="button" data-toggle="modal" data-target="#modal-donation">
-              <i class="fa-solid fa-heart nav-icon"></i>&nbsp;{{_("Donation.title")}}
+              {{icon('solid','bug','nav-icon')+_("Donation.title")}}
             </a>
           </li>
         </div>