Add obfs 4 hysteria2

2dust · Jan 22, 2024 · ff91a5d · ff91a5d
1 parent d76679c
commit ff91a5d
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 0 deletions.
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -713,6 +713,7 @@ public static int AddHysteria2Server(Config config, ProfileItem profileItem, boo
 
             profileItem.address = profileItem.address.TrimEx();
             profileItem.id = profileItem.id.TrimEx();
+            profileItem.path = profileItem.path.TrimEx();
             profileItem.network = string.Empty;
 
             if (Utils.IsNullOrEmpty(profileItem.streamSecurity))

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -283,6 +283,15 @@ private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
 
                     outbound.password = node.id;
 
+                    if (!Utils.IsNullOrEmpty(node.path))
+                    {
+                        outbound.obfs = new()
+                        {
+                            type = "salamander",
+                            password = node.path.TrimEx(),
+                        };
+                    }
+
                     outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
                     outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
 

diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -180,6 +180,11 @@ private static string ShareHysteria2(ProfileItem item)
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
             dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
 
             string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
@@ -883,6 +888,7 @@ private static ProfileItem ResolveHysteria2(string result)
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
             item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
             return item;

diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -121,6 +121,7 @@ public class Outbound4Sbox
         public Tls4Sbox tls { get; set; }
         public Multiplex4Sbox multiplex { get; set; }
         public Transport4Sbox transport { get; set; }
+        public HyObfs4Sbox obfs { get; set; }
     }
 
     public class Tls4Sbox
@@ -174,6 +175,12 @@ public class Headers4Sbox
         public string? Host { get; set; }
     }
 
+    public class HyObfs4Sbox
+    {
+        public string? type { get; set; }
+        public string? password { get; set; }
+    }
+
     public class Server4Sbox
     {
         public string tag { get; set; }

diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -1180,4 +1180,7 @@
   <data name="TbLocalAddress" xml:space="preserve">
     <value>Address(Ip,Ipv6)</value>
   </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
 </root>
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -1177,4 +1177,7 @@
   <data name="TbLocalAddress" xml:space="preserve">
     <value>Address(Ip,Ipv6)</value>
   </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>混淆密码(obfs password)</value>
+  </data>
 </root>
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -429,6 +429,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -449,6 +450,21 @@
                         Width="400"
                         Margin="{StaticResource ServerItemMargin}"
                         Style="{StaticResource DefTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="{StaticResource ServerItemMargin}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPath7}" />
+                    <TextBox
+                        x:Name="txtPath7"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource ServerItemMargin}"
+                        Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
                     x:Name="gridTuic"

diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -191,6 +191,7 @@ public AddServerWindow(ProfileItem profileItem)
 
                     case EConfigType.Hysteria2:
                         this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId7.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath7.Text).DisposeWith(disposables);
                         break;
 
                     case EConfigType.Tuic: