增加HTTP2+TLS+Web模式

ProxySU/MainWindow.xaml.cs

@@ -204,6 +204,11 @@ namespace ProxySU
                 serverConfig = "TemplateConfg\\tcpTLSselfSigned_server_config.json";
                 clientConfig = "TemplateConfg\\tcpTLSselfSigned_client_config.json";
             }
+            else if (String.Equals(ReceiveConfigurationParameters[0], "webSocket"))
+            {
+                serverConfig = "TemplateConfg\\webSocket_server_config.json";
+                clientConfig = "TemplateConfg\\webSocket_client_config.json";
+            }
             else if (String.Equals(ReceiveConfigurationParameters[0], "WebSocketTLS"))
             {
                 serverConfig = "TemplateConfg\\WebSocket_TLS_server_config.json";
@@ -224,6 +229,11 @@ namespace ProxySU
                 serverConfig = "TemplateConfg\\http2_server_config.json";
                 clientConfig = "TemplateConfg\\http2_client_config.json";
             }
+            else if (String.Equals(ReceiveConfigurationParameters[0], "http2Web"))
+            {
+                serverConfig = "TemplateConfg\\http2Web_server_config.json";
+                clientConfig = "TemplateConfg\\http2Web_client_config.json";
+            }
             //else if (String.Equals(ReceiveConfigurationParameters[0], "MkcpNone")|| String.Equals(ReceiveConfigurationParameters[0], "mKCP2SRTP")||String.Equals(ReceiveConfigurationParameters[0], "mKCPuTP")|| String.Equals(ReceiveConfigurationParameters[0], "mKCP2WechatVideo")|| String.Equals(ReceiveConfigurationParameters[0], "mKCP2DTLS")|| String.Equals(ReceiveConfigurationParameters[0], "mKCP2WireGuard"))
             else if (ReceiveConfigurationParameters[0].Contains("mKCP"))
             {
@@ -653,7 +663,7 @@ namespace ProxySU
                         //设置uuid
                         serverJson["inbounds"][0]["settings"]["clients"][0]["id"] = ReceiveConfigurationParameters[2];
                         //除WebSocketTLSWeb模式外设置监听端口
-                        if (serverConfig.Contains("WebSocketTLSWeb") == false)
+                        if (serverConfig.Contains("WebSocketTLSWeb") == false && serverConfig.Contains("http2Web") == false)
                         {
                             serverJson["inbounds"][0]["port"] = ReceiveConfigurationParameters[1];
                         }
@@ -729,9 +739,9 @@ namespace ProxySU
                     }
 
                     //如果是WebSocket + TLS + Web模式，需要安装Caddy
-                    if (serverConfig.Contains("WebSocketTLSWeb")==true)
+                    if (serverConfig.Contains("WebSocketTLSWeb")==true || serverConfig.Contains("http2Web") == true)
                     {
-                        currentStatus = "使用WebSocket + TLS + Web模式，正在安装Caddy......";
+                        currentStatus = "使用WebSocket+TLS+Web/HTTP2+TLS+Web模式，正在安装Caddy......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         Thread.Sleep(1000);
                         
@@ -744,7 +754,14 @@ namespace ProxySU
                         currentStatus = "上传Caddy配置文件......";
                         textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
                         Thread.Sleep(1000);
+                        if (serverConfig.Contains("WebSocketTLSWeb") == true)
+                        {
                         serverConfig = "TemplateConfg\\WebSocketTLSWeb_server_config.caddyfile";
+                        }
+                        if (serverConfig.Contains("http2Web") == true)
+                        {
+                            serverConfig = "TemplateConfg\\http2Web_server_config.caddyfile";
+                        }
                         upLoadPath = "/etc/caddy/Caddyfile";
                         UploadConfig(connectionInfo, serverConfig, upLoadPath);
 

ProxySU/TemplateConfiguration.xaml

@@ -113,14 +113,15 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <!--<RadioButton x:Name="RadioButtonWebSocket" Content="WebSocket"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
+                            <RadioButton x:Name="RadioButtonWebSocket" Content="WebSocket"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="1" Checked="RadioButtonTCP_Checked"/>
-                            <TextBlock Text="数据加密传输，传输协议使用WebSocket，未启用TLS,将被识别为WebSocket流量。" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>-->
+                            <TextBlock Text="数据加密传输，传输协议使用WebSocket，未启用TLS,将被识别为WebSocket流量。" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
                             <RadioButton x:Name="RadioButtonWebSocketTLS" Content="WebSocket+TLS"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="2" Checked="RadioButtonHTTP2_Checked"/>
                             <TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(需要域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
                             <RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="3" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
                             <TextBlock Text="稳定性强，使用Caddy做伪装网站，隐藏代理，会被识别为访问网站的https流量，抗封锁识别最强。(需要域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="3"></TextBlock>
                             <RadioButton x:Name="RadioButtonWebSocketTLSselfSigned" Content="WebSocket+TLS(自签证书)"  GroupName="TemplateGroup" Grid.Column="0" Grid.Row="4" Checked="RadioButtonWebSocketTLSselfSigned_Checked"></RadioButton>
                             <TextBlock Text="数据加密传输，传输协议使用WebSocket，启用TLS,将被识别为TLS流量。(无需域名)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="3"></TextBlock>
+                            <TextBlock Text="Shadowrocket (ios)需要手动打开“允许不安全”选项" TextWrapping="Wrap" Grid.Column="4" Grid.Row="4" ></TextBlock>
 
                         </Grid>
                     </TabItem>
@@ -142,9 +143,9 @@
                                 <RowDefinition></RowDefinition>
                                 <RowDefinition></RowDefinition>
                             </Grid.RowDefinitions>
-                            <RadioButton x:Name="RadioButtonHTTP2" Content="HTTP/2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonHTTP2_Checked"></RadioButton>
+                            <RadioButton x:Name="RadioButtonHTTP2" Content="HTTP2"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="1" Checked="RadioButtonHTTP2_Checked"></RadioButton>
                             <TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现"  Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3"></TextBlock>
-                            <RadioButton x:Name="RadioButtonHTTP2Web" Content="HTTP/2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
+                            <RadioButton x:Name="RadioButtonHTTP2Web" Content="HTTP2+TLS+Web"  GroupName="TemplateGroup"  Grid.Column="0" Grid.Row="2" Checked="RadioButtonWebSocketTLS2Web_Checked"></RadioButton>
                             <TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现，增加伪装网站"  Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="3"></TextBlock>
                         </Grid>
                     </TabItem>

ProxySU/TemplateConfiguration.xaml.cs

@@ -86,6 +86,13 @@ namespace ProxySU
                 //传递域名
                // MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString();
 
+            }
+            //webSocket模式被选中
+            if (RadioButtonWebSocket.IsChecked == true)
+            {
+                //传递模板类型
+                MainWindow.ReceiveConfigurationParameters[0] = "webSocket";
+
             }
             //WebSocket+TLS模式被选中
             else if (RadioButtonWebSocketTLS.IsChecked == true)
@@ -161,6 +168,37 @@ namespace ProxySU
                 MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString();
                
             }
+            //http2+TLS+Web模式被选中
+            else if (RadioButtonHTTP2Web.IsChecked == true)
+            {
+                if (string.IsNullOrEmpty(TextBoxDomain.Text.ToString()) == true)
+                {
+                    MessageBox.Show("域名不能为空！");
+                    return;
+                }
+                //传递模板类型
+                MainWindow.ReceiveConfigurationParameters[0] = "http2Web";
+                //传递路径
+                MainWindow.ReceiveConfigurationParameters[3] = TextBoxPath.Text.ToString();
+                //传递域名
+                MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString();
+                //传递伪装网站
+                MainWindow.ReceiveConfigurationParameters[7] = TextBoxMaskSites.Text.ToString();
+                //处理伪装网站域名中的前缀
+                if (TextBoxMaskSites.Text.ToString().Length >= 7)
+                {
+                    string testDomain = TextBoxMaskSites.Text.Substring(0, 7);
+                    if (String.Equals(testDomain, "https:/") || String.Equals(testDomain, "http://"))
+                    {
+                        //MessageBox.Show(testDomain);
+                        MainWindow.ReceiveConfigurationParameters[7] = TextBoxMaskSites.Text.Replace("/", "\\/");
+                    }
+                    else
+                    {
+                        MainWindow.ReceiveConfigurationParameters[7] = "http:\\/\\/" + TextBoxMaskSites.Text;
+                    }
+                }
+            }
             //mKCP无伪装模式被选中
             else if (RadioButtonMkcpNoCamouflage.IsChecked == true)
             {

ProxySU/bin/Release/TemplateConfg/WebSocketTLSWeb_client_config.json

@@ -25,27 +25,24 @@
 			"settings": {
 				"vnext": [
 					{
-						"address":null,
+						"address": null,
-						"port":null,
+						"port": null,
-						"users":[
+						"users": [
 							{
-								"id":null,
+								"id": null,
-								"alterId":16,
+								"alterId": 16,
-								"security":"auto"
+								"security": "auto"
 							}
 						]
 					}
 				]
 			},
-			"streamSettings":{
+			"streamSettings": {
-				"network":"ws",
+				"network": "ws",
-				"security":"tls",
+				"security": "tls",
-				"wsSettings":{
+				"wsSettings": {
-					"path":null
+					"path": null
 				}
-			},
-			"mux": {
-					"enabled": true
 			}
 		}
 	]

ProxySU/bin/Release/TemplateConfg/WebSocketTLSWeb_server_config.caddyfile

@@ -1,4 +1,6 @@
 ##domain## {
+   log stdout
+   errors stderr
   root /var/www
   tls off
   ##sites##

ProxySU/bin/Release/TemplateConfg/WebSocket_TLS_client_config.json

@@ -0,0 +1,49 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "ws",
+				"security": "tls",
+				"wsSettings": {
+					"path": null
+				}
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/WebSocket_TLS_selfSigned_client_config.json

@@ -0,0 +1,52 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "ws",
+				"security": "tls",
+				"wsSettings": {
+					"path": null
+				},
+				"tlsSettings": {
+					"allowInsecure": true
+				}
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/WebSocket_TLS_selfSigned_server_config.json

@@ -0,0 +1,34 @@
+{
+	"inbounds": [
+		{
+			"port": null,
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"security": "tls",
+				"tlsSettings": {
+					"certificates": [
+						{}
+					]
+				},
+				"network": "ws",
+				"wsSettings": {
+					"path": null
+				}
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/WebSocket_TLS_server_config.json

@@ -0,0 +1,37 @@
+{
+	"inbounds": [
+		{
+			"port": null,
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"security": "tls",
+				"tlsSettings": {
+					"certificates": [
+						{
+							"certificateFile": "/etc/v2ray/ssl/v2ray_ssl.crt",
+							"keyFile": "/etc/v2ray/ssl/v2ray_ssl.key"
+						}
+					]
+				},
+				"network": "ws",
+				"wsSettings": {
+					"path": null
+				}
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/http2Web_client_config.json

@@ -0,0 +1,49 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "h2",
+				"security": "tls",
+				"httpSettings": {
+					"path": null
+				}
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/http2Web_server_config.caddyfile

@@ -0,0 +1,14 @@
+##domain## {
+    log stdout
+    errors stderr
+    root /var/www
+    tls off
+	##sites##
+    proxy ##path## https://localhost:10000 {
+        insecure_skip_verify
+        header_upstream Host {host}
+        header_upstream X-Real-IP {remote}
+        header_upstream X-Forwarded-For {remote}
+        header_upstream X-Forwarded-Port {server_port}
+        header_upstream X-Forwarded-Proto "https"
+}

ProxySU/bin/Release/TemplateConfg/http2Web_server_config.json

@@ -0,0 +1,35 @@
+{
+	"inbounds": [
+		{
+			"port": 10000,
+			"listen": "127.0.0.1",
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "h2",
+				"security": "tls",
+				"httpSettings": {
+					"path": null
+				},
+				"tlsSettings": {
+					"certificates": [
+						{}
+					]
+				}
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/http2_client_config.json

@@ -43,9 +43,6 @@
 				"httpSettings": {
 					"path": null
 				}
-			},
-			"mux": {
-				"enabled": true
 			}
 		}
 	]

ProxySU/bin/Release/TemplateConfg/http2_server_config.json

@@ -17,8 +17,8 @@
 				"tlsSettings": {
 					"certificates": [
 						{
-							"certificateFile": "/etc/v2ray/ssl/v2ray-h2-ssl.pem",
+							"certificateFile": "/etc/v2ray/ssl/v2ray_ssl.crt",
-							"keyFile": "/etc/v2ray/ssl/v2ray-h2-ssl.key"
+							"keyFile": "/etc/v2ray/ssl/v2ray_ssl.key"
 						}
 					]
 				},

ProxySU/bin/Release/TemplateConfg/mkcp_client_config.json

@@ -51,9 +51,6 @@
 						"type": null
 					}
 				}
-			},
-			"mux": {
-				"enabled": true
 			}
 		}
 	]

ProxySU/bin/Release/TemplateConfg/tcpTLSselfSigned_client_config.json

@@ -0,0 +1,49 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "tcp",
+				"security": "tls",
+				"tlsSettings": {
+					"allowInsecure": true
+				 }
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/tcpTLSselfSigned_server_config.json

@@ -0,0 +1,31 @@
+{
+	"inbounds": [
+		{
+			"port": null,
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"security": "tls",
+				"tlsSettings": {
+					"certificates": [
+						{}
+					]
+				},
+				"network": "tcp"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/tcp_TLS_client_config.json

@@ -0,0 +1,46 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "tcp",
+				"security": "tls"
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/tcp_TLS_server_config.json

@@ -0,0 +1,34 @@
+{
+	"inbounds": [
+		{
+			"port": null,
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"security": "tls",
+				"tlsSettings": {
+					"certificates": [
+						{
+							"certificateFile": "/etc/v2ray/ssl/v2ray_ssl.crt",
+							"keyFile": "/etc/v2ray/ssl/v2ray_ssl.key"
+						}
+					]
+				},
+				"network": "tcp"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/tcp_client_config.json

@@ -39,9 +39,6 @@
 			},
 			"streamSettings": {
 				"network": "tcp"
-			},
-			"mux": {
-				"enabled": true
 			}
 		}
 	]

ProxySU/bin/Release/TemplateConfg/tcp_http_client_config.json

@@ -1,6 +1,6 @@
 {
 	"inbounds": [
-	    {
+		{
 			"protocol": "http",
 			"port": 1081
 		},

ProxySU/bin/Release/TemplateConfg/webSocket_client_config.json

@@ -0,0 +1,45 @@
+{
+	"inbounds": [
+		{
+			"protocol": "http",
+			"port": 1081
+		},
+		{
+			"port": 1080,
+			"protocol": "socks",
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			},
+			"settings": {
+				"auth": "noauth"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "vmess",
+			"settings": {
+				"vnext": [
+					{
+						"address": null,
+						"port": null,
+						"users": [
+							{
+								"id": null,
+								"alterId": 16,
+								"security": "auto"
+							}
+						]
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "ws"
+			}
+		}
+	]
+}

ProxySU/bin/Release/TemplateConfg/webSocket_server_config.json

@@ -0,0 +1,25 @@
+{
+	"inbounds": [
+		{
+			"port": null,
+			"protocol": "vmess",
+			"settings": {
+				"clients": [
+					{
+						"id": null,
+						"alterId": 64
+					}
+				]
+			},
+			"streamSettings": {
+				"network": "ws"
+			}
+		}
+	],
+	"outbounds": [
+		{
+			"protocol": "freedom",
+			"settings": {}
+		}
+	]
+}