diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index 6849174..6380fe1 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -234,6 +234,11 @@ namespace ProxySU serverConfig = "TemplateConfg\\http2Web_server_config.json"; clientConfig = "TemplateConfg\\http2Web_client_config.json"; } + else if (String.Equals(ReceiveConfigurationParameters[0], "http2selfSigned")) + { + serverConfig = "TemplateConfg\\http2selfSigned_server_config.json"; + clientConfig = "TemplateConfg\\http2selfSigned_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")) { diff --git a/ProxySU/TemplateConfiguration.xaml b/ProxySU/TemplateConfiguration.xaml index 2fb659b..97c9425 100644 --- a/ProxySU/TemplateConfiguration.xaml +++ b/ProxySU/TemplateConfiguration.xaml @@ -144,9 +144,13 @@ - + - + + + + + diff --git a/ProxySU/TemplateConfiguration.xaml.cs b/ProxySU/TemplateConfiguration.xaml.cs index 9cadcbb..616bc4a 100644 --- a/ProxySU/TemplateConfiguration.xaml.cs +++ b/ProxySU/TemplateConfiguration.xaml.cs @@ -110,17 +110,7 @@ namespace ProxySU MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString(); } - //WebSocket+TLS(自签证书)模式被选中 - else if (RadioButtonWebSocketTLSselfSigned.IsChecked == true) - { - //传递模板类型 - MainWindow.ReceiveConfigurationParameters[0] = "WebSocketTLSselfSigned"; - //传递路径 - MainWindow.ReceiveConfigurationParameters[3] = TextBoxPath.Text.ToString(); - //传递域名 - //MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString(); - - } + //WebSocket+TLS+Web模式被选中 else if (RadioButtonWebSocketTLS2Web.IsChecked == true|| RadioButtonWebSocketTLS2WebHot.IsChecked==true) { @@ -152,6 +142,17 @@ namespace ProxySU } } } + //WebSocket+TLS(自签证书)模式被选中 + else if (RadioButtonWebSocketTLSselfSigned.IsChecked == true) + { + //传递模板类型 + MainWindow.ReceiveConfigurationParameters[0] = "WebSocketTLSselfSigned"; + //传递路径 + MainWindow.ReceiveConfigurationParameters[3] = TextBoxPath.Text.ToString(); + //传递域名 + //MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString(); + + } //http2模式被选中 else if (RadioButtonHTTP2.IsChecked == true) { @@ -199,6 +200,17 @@ namespace ProxySU } } } + //WebSocket+TLS(自签证书)模式被选中 + else if (RadioButtonWebSocketTLSselfSigned.IsChecked == true) + { + //传递模板类型 + MainWindow.ReceiveConfigurationParameters[0] = "http2selfSigned"; + //传递路径 + MainWindow.ReceiveConfigurationParameters[3] = TextBoxPath.Text.ToString(); + //传递域名 + //MainWindow.ReceiveConfigurationParameters[4] = TextBoxDomain.Text.ToString(); + + } //mKCP无伪装模式被选中 else if (RadioButtonMkcpNoCamouflage.IsChecked == true) { diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe index c71c86c..8677e32 100644 Binary files a/ProxySU/bin/Release/ProxySU.exe and b/ProxySU/bin/Release/ProxySU.exe differ diff --git a/ProxySU/bin/Release/Release.zip b/ProxySU/bin/Release/Release.zip index e4d4056..e012a99 100644 Binary files a/ProxySU/bin/Release/Release.zip and b/ProxySU/bin/Release/Release.zip differ diff --git a/ProxySU/bin/Release/TemplateConfg/http2selfSigned_client_config.json b/ProxySU/bin/Release/TemplateConfg/http2selfSigned_client_config.json new file mode 100644 index 0000000..ca23c19 --- /dev/null +++ b/ProxySU/bin/Release/TemplateConfg/http2selfSigned_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": "h2", + "security": "tls", + "httpSettings": { + "path": null + }, + "tlsSettings": { + "allowInsecure": true + } + } + } + ] +} \ No newline at end of file diff --git a/ProxySU/bin/Release/TemplateConfg/http2selfSigned_server_config.json b/ProxySU/bin/Release/TemplateConfg/http2selfSigned_server_config.json new file mode 100644 index 0000000..e570eb1 --- /dev/null +++ b/ProxySU/bin/Release/TemplateConfg/http2selfSigned_server_config.json @@ -0,0 +1,34 @@ +{ + "inbounds": [ + { + "port": null, + "protocol": "vmess", + "settings": { + "clients": [ + { + "id": null, + "alterId": 64 + } + ] + }, + "streamSettings": { + "network": "h2", + "security": "tls", + "tlsSettings": { + "certificates": [ + {} + ] + }, + "httpSettings": { + "path": null + } + } + } + ], + "outbounds": [ + { + "protocol": "freedom", + "settings": {} + } + ] +} \ No newline at end of file