hiddifypanel 10.7.0.dev95__tar.gz → 10.8.0.dev97__tar.gz

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/HISTORY.md

@@ -125,6 +125,8 @@
 
 #### Changes
 
+* Don't send httpupgrade proxy to Streisand. 
+
 * Fix format of jinja commands. 
 
 * Refactor code with autopep8. 
@@ -281,6 +283,20 @@
 
 #### Fix
 
+* Exception when there is no valid domain. 
+
+* Don't let user create invalid domains. 
+
+* Unrequired fields in api (patch method) 
+
+* Domain bug. 
+
+* Bug. 
+
+* Incorrect type ip addr. 
+
+* Ssh server. 
+
 * Release message. 
 
 * Custom usage trojan. 
@@ -923,6 +939,91 @@ with A2_
 
 #### Other
 
+* Merge branch 'main' of github.com:hiddify/Hiddify-Panel. 
+
+* Merge pull request #149 from Mrclocks/main. 
+  _Update translations_
+
+* Inlang: update translations. 
+
+* Merge pull request #150 from Iam54r1n4/dev-patch26. 
+  _Fix bugs_
+
+* Merge pull request #148 from Iam54r1n4/dev-patch24. 
+  _Fix bugs_
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
+* Inlang: update translations. 
+
 * Makeing unified version. 
 
 * Disable changing proxy details. 

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.7.0.dev95
+Version: 10.8.0.dev97
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.8.0.dev97/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.8.0.dev97

hiddifypanel-10.8.0.dev97/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.8.0.dev97'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-03-07','%Y-%m-%d')

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/drivers/ssh_liberty_bridge_api.py

@@ -10,7 +10,7 @@ class SSHLibertyBridgeApi(DriverABS):
 
     def get_ssh_redis_client(self):
         if not hasattr(self, 'redis_client'):
-            self.redis_client = redis.from_url(hconfig(ConfigEnum.ssh_server_redis_url), decode_responses=True)
+            self.redis_client = redis.from_url('unix:///opt/hiddify-manager/other/redis/run.sock?db=1', decode_responses=True)
 
         return self.redis_client
 

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/admin/Actions.py

@@ -170,7 +170,7 @@ class Actions(FlaskView):
 
             tcp_ping = hutils.network.is_domain_reality_friendly(d)
             if tcp_ping:
-                dip = hutils.network.get_domain_ip(d)
+                dip = str(hutils.network.get_domain_ip(d))
                 dip_country = (IPCOUNTRY.get(dip) or {}).get('country', {}).get('iso_code', 'unknown')
                 if dip_country == "IR":
                     continue

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/admin/DomainAdmin.py

@@ -169,26 +169,25 @@ class DomainAdmin(AdminLTEModelView):
         if hconfig(ConfigEnum.cloudflare) and model.mode != DomainType.fake:
             try:
                 proxied = model.mode in [DomainType.cdn, DomainType.auto_cdn_ip]
-                cf_api.add_or_update_domain(model.domain, ipv4_list[0], "A", proxied=proxied)
+                cf_api.add_or_update_domain(model.domain, str(ipv4_list[0]), "A", proxied=proxied)
                 if ipv6_list:
-                    cf_api.add_or_update_domain(model.domain, ipv6_list[0], "AAAA", proxied=proxied)
+                    cf_api.add_or_update_domain(model.domain, str(ipv6_list[0]), "AAAA", proxied=proxied)
 
                 skip_check = True
             except Exception as e:
-                # raise e
                 raise ValidationError(__("Can not connect to Cloudflare.") + f' {e}')
         # elif model.mode==DomainType.auto_cdn_ip:
         if model.alias and not model.alias.replace("_", "").isalnum():
             hutils.flask.flash(__("Using alias with special charachters may cause problem in some clients like FairVPN."), 'warning')
-        #     raise ValidationError(_("You have to add your cloudflare api key to use this feature: "))
+            # raise ValidationError(_("You have to add your cloudflare api key to use this feature: "))
 
         dip = hutils.network.get_domain_ip(model.domain)
         if model.sub_link_only:
             if dip is None:
-                raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))
+                raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))  # type: ignore
         elif not skip_check:
             if dip is None:
-                raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))
+                raise ValidationError(_("Domain can not be resolved! there is a problem in your domain"))  # type: ignore
 
             domain_ip_is_same_as_panel = False
             domain_ip_is_same_as_panel |= dip in ipv4_list
@@ -196,24 +195,24 @@ class DomainAdmin(AdminLTEModelView):
                 domain_ip_is_same_as_panel |= ipaddress.ip_address(dip) == ipaddress.ip_address(ipv6)
 
             if model.mode == DomainType.direct and not domain_ip_is_same_as_panel:
-                hutils.flask.flash(
-                    __(f"Domain IP={dip} is not matched with your ip={', '.join(list(map(str, ipv4_list)))} which is required in direct mode"),
-                    category='warning')
-                # raise ValidationError(_("Domain IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode", server_ip=myip, domain_ip=dip))
+                # hutils.flask.flash(__(f"Domain IP={dip} is not matched with your ip={', '.join(list(map(str, ipv4_list)))} which is required in direct mode"),category='error')
+                raise ValidationError(
+                    __("Domain IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode", server_ip=', '.join(list(map(str, ipv4_list))), domain_ip=dip))  # type: ignore
 
             if domain_ip_is_same_as_panel and model.mode in [DomainType.cdn, DomainType.relay, DomainType.fake, DomainType.auto_cdn_ip]:
-                hutils.flask.flash(__(f"In CDN mode, Domain IP={dip} should be different to your ip={', '.join(list(map(str, ipv4_list)))}"), 'warning')
-                # raise ValidationError(_("In CDN mode, Domain IP=%(domain_ip)s should be different to your ip=%(server_ip)s", server_ip=myip, domain_ip=dip))
+                # hutils.flask.flash(__(f"In CDN mode, Domain IP={dip} should be different to your ip={', '.join(list(map(str, ipv4_list)))}"), 'warning')
+                raise ValidationError(__("In CDN mode, Domain IP=%(domain_ip)s should be different to your ip=%(server_ip)s", server_ip=', '.join(list(map(str, ipv4_list))), domain_ip=dip))  # type: ignore
 
             # if model.mode in [DomainType.ss_faketls, DomainType.telegram_faketls]:
             #     if len(Domain.query.filter(Domain.mode==model.mode and Domain.id!=model.id).all())>0:
             #         ValidationError(f"another {model.mode} is exist")
+
         model.domain = model.domain.lower()
         if model.mode == DomainType.direct and model.cdn_ip:
             raise ValidationError(f"Specifying CDN IP is only valid for CDN mode")
 
         if model.mode == DomainType.fake and not model.cdn_ip:
-            model.cdn_ip = ipv4_list[0]
+            model.cdn_ip = str(ipv4_list[0])
 
         # if model.mode==DomainType.fake and model.cdn_ip!=myip:
         #     raise ValidationError(f"Specifying CDN IP is only valid for CDN mode")

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/commercial/restapi/v2/admin/admin_user_api.py

@@ -26,6 +26,16 @@ class AdminSchema(Schema):
     lang = Enum(Lang, required=True)
 
 
+class PatchAdminSchema(AdminSchema):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].required = False
+        self.fields['mode'].required = False
+        self.fields['lang'].required = False
+        self.fields['can_add_admin'].required = False
+    pass
+
+
 class AdminUserApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin})]
 
@@ -36,7 +46,7 @@ class AdminUserApi(MethodView):
             abort(403, "You don't have permission to access this admin")
         return admin.to_dict()
 
-    @app.input(AdminSchema, arg_name='data')
+    @app.input(PatchAdminSchema, arg_name='data')
     @app.output(SuccessfulSchema)
     def patch(self, uuid, data):
         admin = AdminUser.by_uuid(uuid) or abort(404, "admin not found")

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/commercial/restapi/v2/admin/user_api.py

@@ -69,6 +69,13 @@ class UserSchema(Schema):
     )
 
 
+class PatchUserSchema(UserSchema):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].required = False
+    pass
+
+
 class UserApi(MethodView):
     decorators = [login_required({Role.super_admin, Role.admin, Role.agent})]
 
@@ -80,7 +87,7 @@ class UserApi(MethodView):
 
         return user.to_dict(False)
 
-    @app.input(UserSchema, arg_name="data")
+    @app.input(PatchUserSchema, arg_name="data")
     @app.output(SuccessfulSchema)
     def patch(self, uuid, data):
         user = User.by_uuid(uuid) or abort(404, "user not found")

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/init_db.py

@@ -86,8 +86,6 @@ def _v65():
     add_config_if_not_exist(ConfigEnum.mux_brutal_down_mbps, '100')
 
 
-def _v64():
-    set_hconfig(ConfigEnum.ssh_server_redis_url, "unix:///opt/hiddify-manager/other/redis/run.sock?db=1")
 
 
 def _v63():
@@ -182,7 +180,7 @@ def _v45():
 
     if not Proxy.query.filter(Proxy.name == "SSH").first():
         db.session.add(Proxy(l3='ssh', transport='ssh', cdn='direct', proto='ssh', enable=True, name="SSH"))
-    add_config_if_not_exist(ConfigEnum.ssh_server_redis_url, "unix:///opt/hiddify-manager/other/redis/run.sock?db=1")
+    
     add_config_if_not_exist(ConfigEnum.ssh_server_port, hutils.random.get_random_unused_port())
     add_config_if_not_exist(ConfigEnum.ssh_server_enable, False)
 # def _v43():

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/user/link_maker.py

@@ -302,6 +302,10 @@ def make_proxy(hconfigs, proxy: Proxy, domain_db: Domain, phttp=80, ptls=443, pp
 def to_link(proxy):
     if 'error' in proxy:
         return proxy
+    # ignore httpupgrade for Streisand
+    if g.user_agent.get('is_streisand') and proxy.get('transport') == 'httpupgrade':
+        return {'msg': 'ignore httpupgrade for streisand'}
+
     orig_name_link = (proxy['extra_info'] + " " + proxy["name"]).strip()
     name_link = hutils.encode.url_encode(orig_name_link)
     if proxy['proto'] == 'vmess':

{hiddifypanel-10.7.0.dev95 → hiddifypanel-10.8.0.dev97}/hiddifypanel/panel/user/user.py

@@ -284,19 +284,22 @@ def get_domain_information(no_domain=False, filter_domain=None, alternative=None
             # print("autocdn ip mode ", d.cdn_ip)
         if "*" in d.domain:
             d.domain = d.domain.replace("*", hutils.random.get_random_string(5, 15))
-    if len(domains) == 0:
-        domains = [Domain(id=0, domain=alternative, mode=DomainType.direct, cdn_ip='', show_domains=[], child_id=0)]
-        domains[0].has_auto_ip = True
 
-    return domains, has_auto_cdn
+    valid_domains = [d for d in domains if d.mode != DomainType.fake and d.mode != DomainType.reality]
+
+    if len(valid_domains) == 0:
+        valid_domains = [Domain(id=0, domain=alternative, mode=DomainType.direct, cdn_ip='', show_domains=[], child_id=0)]
+        valid_domains[0].has_auto_ip = True
+
+    return domains, valid_domains, has_auto_cdn
 
 
 def get_common_data(user_uuid, mode, no_domain=False, filter_domain=None):
     '''Usable for user account'''
     # uuid_secret=str(uuid.UUID(user_secret))
-    domains, has_auto_cdn = get_domain_information(no_domain, filter_domain, urlparse(request.base_url).hostname)
-    domains_valid = [d for d in domains if d.mode != DomainType.fake and d.mode != DomainType.reality]
-    db_domain = domains_valid[0]
+    domains, valid_domains, has_auto_cdn = get_domain_information(no_domain, filter_domain, urlparse(request.base_url).hostname)
+
+    db_domain = valid_domains[0]  # TODO refactor
     domain = db_domain.domain
     user: User = g.account if g.account.uuid == user_uuid else User.by_uuid(f'{user_uuid}')
     if user is None: