diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index b012588..1d8938f 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -212,12 +212,12 @@ namespace ProxySU clientConfig = "TemplateConfg\\mkcp_client_config.json"; } - else if (String.Equals(ReceiveConfigurationParameters[0], "HTTP2")) + else if (String.Equals(ReceiveConfigurationParameters[0], "Http2")) { //File.Copy("TemplateConfg\\tcp_server_config.json", "ConfigUpload\\tcp_server_config.json", true); - serverConfig = "TemplateConfg\\HTTP2_server_config.json"; - clientConfig = "TemplateConfg\\tcp_client_config.json"; + serverConfig = "TemplateConfg\\http2_server_config.json"; + clientConfig = "TemplateConfg\\http2_client_config.json"; } else if (String.Equals(ReceiveConfigurationParameters[0], "QuicNone") || String.Equals(ReceiveConfigurationParameters[0], "QuicSRTP") || String.Equals(ReceiveConfigurationParameters[0], "Quic2uTP") || String.Equals(ReceiveConfigurationParameters[0], "QuicWechatVideo") || String.Equals(ReceiveConfigurationParameters[0], "QuicDTLS") || String.Equals(ReceiveConfigurationParameters[0], "QuicWireGuard")) { @@ -503,9 +503,9 @@ namespace ProxySU //MessageBox.Show(timesStamp2.ToString()); //如果使用如果是WebSocket + TLS + Web模式，需要检测域名解析是否正确 - if (serverConfig.Contains("WebSocketTLSWeb") == true) + if (serverConfig.Contains("WebSocketTLSWeb") == true || serverConfig.Contains("Http2") == true) { - currentStatus = "使用WebSocket + TLS + Web模式，正在检测域名是否解析到当前VPS的IP上......"; + currentStatus = "正在检测域名是否解析到当前VPS的IP上......"; textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); Thread.Sleep(1000); @@ -593,7 +593,12 @@ namespace ProxySU { serverJson["inbounds"][0]["streamSettings"]["wsSettings"]["path"] = ReceiveConfigurationParameters[3]; } - //mkcp模式下，设置伪装类型 + //如果是Http2模式下，设置路径 + if (serverConfig.Contains("http2") == true) + { + serverJson["inbounds"][0]["streamSettings"]["httpSettings"]["path"] = ReceiveConfigurationParameters[3]; + } + //mkcp模式下，设置伪装类型 if (serverConfig.Contains("mkcp") == true) { serverJson["inbounds"][0]["streamSettings"]["kcpSettings"]["header"]["type"] = ReceiveConfigurationParameters[5]; @@ -616,7 +621,7 @@ namespace ProxySU //client.RunCommand("sed -i 's/##path##/\\" + ReceiveConfigurationParameters[3] + "/' " + upLoadPath); ////client.RunCommand("sed -i 's/##domain##/" + ReceiveConfigurationParameters[4] + "/' " + upLoadPath); //client.RunCommand("sed -i 's/##mkcpHeaderType##/" + ReceiveConfigurationParameters[5] + "/' " + upLoadPath); - client.RunCommand("systemctl restart v2ray"); + //client.RunCommand("systemctl restart v2ray"); File.Delete(@"config.json"); //打开防火墙端口 @@ -696,7 +701,54 @@ namespace ProxySU client.RunCommand("caddy -service start"); } - + if (serverConfig.Contains("http2") == true) + { + currentStatus = "使用Http2模式，正在安装acme.sh......"; + textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); + Thread.Sleep(1000); + + if (getApt == false) + { + //client.RunCommand("apt-get -qq update"); + client.RunCommand("apt-get -y -qq install socat"); + } + if (getYum == false) + { + //client.RunCommand("yum -q makecache"); + client.RunCommand("yum -y -q install socat"); + } + if (getZypper == false) + { + // client.RunCommand("zypper ref"); + client.RunCommand("zypper -y install socat"); + } + client.RunCommand("curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | INSTALLONLINE=1 sh"); + client.RunCommand("cd ~/.acme.sh/"); + client.RunCommand("alias acme.sh=~/.acme.sh/acme.sh"); + + currentStatus = "申请域名证书......"; + textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); + Thread.Sleep(1000); + + client.RunCommand("mkdir -p /etc/v2ray/ssl"); + client.RunCommand($"/root/.acme.sh/acme.sh --issue --standalone -d {ReceiveConfigurationParameters[4]}"); + + currentStatus = "安装证书到V2ray......"; + textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); + Thread.Sleep(1000); + client.RunCommand($"/root/.acme.sh/acme.sh --installcert -d {ReceiveConfigurationParameters[4]} --certpath /etc/v2ray/ssl/v2ray-h2-ssl.pem --keypath /etc/v2ray/ssl/v2ray-h2-ssl.key --capath /etc/v2ray/ssl/v2ray-h2-ssl.pem --reloadcmd \"systemctl restart v2ray\""); + } + + currentStatus = "正在启动V2ray......"; + textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); + Thread.Sleep(1000); + //启动V2ray服务 + client.RunCommand("systemctl restart v2ray"); + + currentStatus = "V2ray启动成功！"; + textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus); + Thread.Sleep(1000); + //生成客户端配置 currentStatus = "生成客户端配置......"; @@ -718,6 +770,10 @@ namespace ProxySU { clientJson["outbounds"][0]["streamSettings"]["wsSettings"]["path"] = ReceiveConfigurationParameters[3]; } + if (clientConfig.Contains("http2") == true) + { + clientJson["outbounds"][0]["streamSettings"]["httpSettings"]["path"] = ReceiveConfigurationParameters[3]; + } if (clientConfig.Contains("mkcp")==true) { clientJson["outbounds"][0]["streamSettings"]["kcpSettings"]["header"]["type"] = ReceiveConfigurationParameters[5]; diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs index f43812d..189940d 100644 --- a/ProxySU/ResultClientInformation.xaml.cs +++ b/ProxySU/ResultClientInformation.xaml.cs @@ -166,7 +166,7 @@ namespace ProxySU HidePathAndTLS(); ShowQuicKey(); } - else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "HTTP2")) + else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "Http2")) { TextBoxTransmission.Text = "h2"; TextBoxCamouflageType.Text = "none"; diff --git a/ProxySU/TemplateConfiguration.xaml.cs b/ProxySU/TemplateConfiguration.xaml.cs index 4c9668b..68d4c50 100644 --- a/ProxySU/TemplateConfiguration.xaml.cs +++ b/ProxySU/TemplateConfiguration.xaml.cs @@ -57,7 +57,7 @@ namespace ProxySU else if (RadioButtonHTTP2.IsChecked == true) { //传递模板类型 - MainWindow.ReceiveConfigurationParameters[0] = "HTTP2"; + MainWindow.ReceiveConfigurationParameters[0] = "Http2"; //传递路径 MainWindow.ReceiveConfigurationParameters[3] = TextBoxPath.Text.ToString(); //传递域名 diff --git a/ProxySU/bin/Release/ProxySU.exe b/ProxySU/bin/Release/ProxySU.exe index 0595d9f..18f0e40 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 d1c6ea6..e0c814f 100644 Binary files a/ProxySU/bin/Release/Release.zip and b/ProxySU/bin/Release/Release.zip differ diff --git a/ProxySU/bin/Release/TemplateConfg/http2_client_config.json b/ProxySU/bin/Release/TemplateConfg/http2_client_config.json new file mode 100644 index 0000000..769f4d1 --- /dev/null +++ b/ProxySU/bin/Release/TemplateConfg/http2_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 + } + }, + "mux": { + "enabled": true + } + } + ] +} \ No newline at end of file diff --git a/ProxySU/bin/Release/TemplateConfg/http2_server_config.json b/ProxySU/bin/Release/TemplateConfg/http2_server_config.json new file mode 100644 index 0000000..568b03e --- /dev/null +++ b/ProxySU/bin/Release/TemplateConfg/http2_server_config.json @@ -0,0 +1,37 @@ +{ + "inbounds": [ + { + "port": null, + "protocol": "vmess", + "settings": { + "clients": [ + { + "id": null, + "alterId": 64 + } + ] + }, + "streamSettings": { + "network": "h2", + "security": "tls", + "tlsSettings": { + "certificates": [ + { + "certificateFile": "/etc/v2ray/ssl/v2ray-h2-ssl.pem", + "keyFile": "/etc/v2ray/ssl/v2ray-h2-ssl.key" + } + ] + }, + "httpSettings": { + "path": null + } + } + } + ], + "outbounds": [ + { + "protocol": "freedom", + "settings": {} + } + ] +} \ No newline at end of file