Merge pull request #1067 from M03ED/1.8.11

add random user agent support
Gozargah · Jul 1, 2024 · f7a2aae · f7a2aae
2 parents c607c46 + b285133
commit f7a2aae
Show file tree

Hide file tree

Showing 19 changed files with 236 additions and 23 deletions.
diff --git a/app/dashboard/build/locales/en.json b/app/dashboard/build/locales/en.json
@@ -105,6 +105,7 @@
   "hostsDialog.host.wildcard": "Use <badge>*</badge> to generate a random string (works for wildcard domain names)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "Enable MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "Fragment pattern",
   "hostsDialog.fragment.info": "Correct pattern: length,interval,packets",

diff --git a/app/dashboard/build/locales/fa.json b/app/dashboard/build/locales/fa.json
@@ -106,6 +106,7 @@
   "hostsDialog.host.wildcard": "از <badge>*</badge> برای ساخت عبارت تصادفی استفاده کنید (برای نام‌های wildcard کار می‌کند)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "فعالسازی MUX",
+  "hostsDialog.randomUserAgent":"استفاده از User Agent تصادفی",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "الگو فرگمنت",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/build/locales/ru.json b/app/dashboard/build/locales/ru.json
@@ -103,6 +103,7 @@
   "hostsDialog.host.wildcard": "Используйте <badge>*</badge>, чтобы сгенерировать случайную строку (работает для wildcard доменов)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "Давать возможность MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "Шаблон фрагмента",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/build/locales/zh.json b/app/dashboard/build/locales/zh.json
@@ -97,6 +97,7 @@
   "hostsDialog.fingerprint": "指纹",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "使能够 MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "碎片图案",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/public/locales/en.json b/app/dashboard/public/locales/en.json
@@ -105,6 +105,7 @@
   "hostsDialog.host.wildcard": "Use <badge>*</badge> to generate a random string (works for wildcard domain names)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "Enable MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "Fragment pattern",
   "hostsDialog.fragment.info": "Correct pattern: length,interval,packets",

diff --git a/app/dashboard/public/locales/fa.json b/app/dashboard/public/locales/fa.json
@@ -106,6 +106,7 @@
   "hostsDialog.host.wildcard": "از <badge>*</badge> برای ساخت عبارت تصادفی استفاده کنید (برای نام‌های wildcard کار می‌کند)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "فعالسازی MUX",
+  "hostsDialog.randomUserAgent":"استفاده از User Agent تصادفی",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "الگو فرگمنت",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/public/locales/ru.json b/app/dashboard/public/locales/ru.json
@@ -103,6 +103,7 @@
   "hostsDialog.host.wildcard": "Используйте <badge>*</badge>, чтобы сгенерировать случайную строку (работает для wildcard доменов)",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "Давать возможность MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "Шаблон фрагмента",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/public/locales/zh.json b/app/dashboard/public/locales/zh.json
@@ -97,6 +97,7 @@
   "hostsDialog.fingerprint": "指纹",
   "hostsDialog.sockopt": "Sockopt",
   "hostsDialog.muxEnable": "使能够 MUX",
+  "hostsDialog.randomUserAgent":"Use random user agent",
   "hostsDialog.allowinsecure": "Allow Insecure",
   "hostsDialog.fragment": "碎片图案",
   "hostsDialog.fragment.info": "length,interval,packet (e.g. 10-100,100-200,tlshello)",

diff --git a/app/dashboard/src/components/HostsDialog.tsx b/app/dashboard/src/components/HostsDialog.tsx
@@ -119,6 +119,7 @@ const hostsSchema = z.record(
       allowinsecure: z.boolean().nullable().default(false),
       is_disabled: z.boolean().default(true),
       fragment_setting: z.string().nullable(),
+      random_user_agent: z.boolean().default(false),
       security: z.string(),
       alpn: z.string(),
       fingerprint: z.string(),
@@ -175,6 +176,7 @@ const AccordionInbound: FC<AccordionInboundType> = ({
       allowinsecure: false,
       is_disabled: false,
       fragment_setting: "",
+      random_user_agent: false,
       security: "inbound_default",
       alpn: "",
       fingerprint: "",
@@ -920,6 +922,28 @@ const AccordionInbound: FC<AccordionInboundType> = ({
                             </Error>
                           )}
                       </FormControl>
+                      <FormControl
+                        isInvalid={
+                          !!(
+                            accordionErrors &&
+                            accordionErrors[index]?.random_user_agent
+                          )
+                        }
+                      >
+                        <Checkbox
+                          {...form.register(
+                            hostKey + "." + index + ".random_user_agent"
+                          )}
+                        >
+                          <FormLabel>{t("hostsDialog.randomUserAgent")}</FormLabel>
+                        </Checkbox>
+                        {accordionErrors &&
+                          accordionErrors[index]?.random_user_agent && (
+                            <Error>
+                              {accordionErrors[index]?.random_user_agent?.message}
+                            </Error>
+                          )}
+                      </FormControl>
                     </VStack>
                   </AccordionPanel>
                 </AccordionItem>

diff --git a/app/db/crud.py b/app/db/crud.py
@@ -85,6 +85,7 @@ def update_hosts(db: Session, inbound_tag: str, modified_hosts: List[ProxyHostMo
             is_disabled=host.is_disabled,
             mux_enable=host.mux_enable,
             fragment_setting=host.fragment_setting,
+            random_user_agent=host.random_user_agent,
         ) for host in modified_hosts
     ]
     db.commit()

diff --git a/app/db/migrations/versions/31f92220c0d0_add_support_random_user_agent.py b/app/db/migrations/versions/31f92220c0d0_add_support_random_user_agent.py
@@ -0,0 +1,28 @@
+"""Add Support Random User-Agent
+
+Revision ID: 31f92220c0d0
+Revises: 4f045f53bef8
+Create Date: 2024-06-01 21:28:33.310627
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '31f92220c0d0'
+down_revision = '4f045f53bef8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('hosts', sa.Column('random_user_agent', sa.Boolean(), server_default='0', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('hosts', 'random_user_agent')
+    # ### end Alembic commands ###
diff --git a/app/db/models.py b/app/db/models.py
@@ -194,6 +194,7 @@ class ProxyHost(Base):
     is_disabled = Column(Boolean, nullable=True, default=False)
     mux_enable = Column(Boolean, nullable=False, default=False, server_default='0')
     fragment_setting = Column(String(100), nullable=True)
+    random_user_agent = Column(Boolean, nullable=False, default=False, server_default='0')
 
 
 class System(Base):

diff --git a/app/models/proxy.py b/app/models/proxy.py
@@ -149,6 +149,7 @@ class ProxyHost(BaseModel):
     is_disabled: Union[bool, None] = None
     mux_enable: Union[bool, None] = None
     fragment_setting: Optional[str] = Field(None, nullable=True)
+    random_user_agent: Union[bool, None] = None
 
     class Config:
         orm_mode = True

diff --git a/app/subscription/share.py b/app/subscription/share.py
@@ -282,7 +282,8 @@ def process_inbounds_and_tags(
                         "ais": host["allowinsecure"]
                         or inbound.get("allowinsecure", ""),
                         "mux_enable": host["mux_enable"],
-                        "fragment_setting": host["fragment_setting"]
+                        "fragment_setting": host["fragment_setting"],
+                        "random_user_agent": host["random_user_agent"],
                     }
                 )
 

diff --git a/app/subscription/singbox.py b/app/subscription/singbox.py
@@ -1,8 +1,9 @@
 import json
+from random import choice
 from app.templates import render_template
 from app.subscription.funcs import get_grpc_gun
 
-from config import SINGBOX_SUBSCRIPTION_TEMPLATE, MUX_TEMPLATE
+from config import SINGBOX_SUBSCRIPTION_TEMPLATE, MUX_TEMPLATE, USER_AGENT_TEMPLATE
 
 
 class SingBoxConfiguration(str):
@@ -11,6 +12,13 @@ def __init__(self):
         template = render_template(SINGBOX_SUBSCRIPTION_TEMPLATE)
         self.config = json.loads(template)
         self.mux_template = render_template(MUX_TEMPLATE)
+        temp_user_agent_data = render_template(USER_AGENT_TEMPLATE)
+        user_agent_data = json.loads(temp_user_agent_data)
+
+        if 'list' in user_agent_data and isinstance(user_agent_data['list'], list):
+            self.user_agent_list = user_agent_data['list']
+        else:
+            self.user_agent_list = []
 
     def add_outbound(self, outbound_data):
         self.config["outbounds"].append(outbound_data)
@@ -65,16 +73,17 @@ def tls_config(sni=None, fp=None, tls=None, pbk=None,
 
         return config
 
-    @staticmethod
-    def transport_config(transport_type='',
+    def transport_config(self,
+                         transport_type='',
                          host='',
                          path='',
                          method='',
                          idle_timeout="15s",
                          ping_timeout="15s",
                          max_early_data=None,
                          early_data_header_name=None,
-                         permit_without_stream=False):
+                         permit_without_stream=False,
+                         random_user_agent: bool = False):
 
         transport_config = {}
 
@@ -87,8 +96,12 @@ def transport_config(transport_type='',
                     transport_config['path'] = path
                 if method:
                     transport_config['method'] = method
+                if host or random_user_agent:
+                    transport_config['headers'] = {}
                 if host:
                     transport_config["host"] = [host]
+                if random_user_agent:
+                    transport_config['headers']['User-Agent'] = choice(self.user_agent_list)
                 if idle_timeout:
                     transport_config['idle_timeout'] = idle_timeout
                 if ping_timeout:
@@ -97,8 +110,12 @@ def transport_config(transport_type='',
             elif transport_type == "ws":
                 if path:
                     transport_config['path'] = path
+                if host or random_user_agent:
+                    transport_config['headers'] = {}
                 if host:
                     transport_config['headers'] = {'Host': host}
+                if random_user_agent:
+                    transport_config['headers']['User-Agent'] = choice(self.user_agent_list)
                 if max_early_data is not None:
                     transport_config['max_early_data'] = max_early_data
                 if early_data_header_name:
@@ -118,6 +135,9 @@ def transport_config(transport_type='',
                 transport_config['host'] = host
                 if path:
                     transport_config['path'] = path
+                if random_user_agent:
+                    transport_config['headers'] = {}
+                    transport_config['headers']['User-Agent'] = choice(self.user_agent_list)
 
         return transport_config
 
@@ -139,6 +159,7 @@ def make_outbound(self,
                       headers='',
                       ais='',
                       mux_enable: bool = False,
+                      random_user_agent: bool = False,
                       ):
 
         config = {
@@ -173,7 +194,8 @@ def make_outbound(self,
                 host=host,
                 path=path,
                 max_early_data=max_early_data,
-                early_data_header_name=early_data_header_name
+                early_data_header_name=early_data_header_name,
+                random_user_agent=random_user_agent,
             )
         else:
             config["network"] = net
@@ -215,7 +237,8 @@ def add(self, remark: str, address: str, inbound: dict, settings: dict):
             sid=inbound.get('sid', ''),
             headers=inbound['header_type'],
             ais=inbound.get('ais', ''),
-            mux_enable=inbound.get('mux_enable', False))
+            mux_enable=inbound.get('mux_enable', False),
+            random_user_agent=inbound.get('random_user_agent', False),)
 
         if inbound['protocol'] == 'vmess':
             outbound['uuid'] = settings['id']