mirror of
https://github.com/proxysu/ProxySU.git
synced 2025-04-03 13:53:36 +03:00
完善Caddy安装设置
This commit is contained in:
ProxySU
parent
06500cb792
commit
b78d14058e
6 changed files with 89 additions and 40 deletions
|
|
@ -86,12 +86,12 @@
|
|||
<RowDefinition></RowDefinition>
|
||||
<RowDefinition></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Button x:Name="ButtonGuideConfiguration" Content="启用向导" Grid.Column="0" Grid.Row="0"></Button>
|
||||
<TextBlock Text="通过向导生成配置文件" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonGuideConfiguration" Visibility="Collapsed" Content="启用向导" Grid.Column="0" Grid.Row="0"></Button>
|
||||
<TextBlock Text="通过向导生成配置文件" Visibility="Collapsed" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonTemplateConfiguration" Content="打开模板库" Grid.Column="1" Grid.Row="0" Click="ButtonTemplateConfiguration_Click"></Button>
|
||||
<TextBlock Text="模板库" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonAdvancedConfiguration" Content="配置编辑器" Grid.Column="2" Grid.Row="0"></Button>
|
||||
<TextBlock Text="配置文件高级生成器
（有经验用户可以使用）" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<Button x:Name="ButtonAdvancedConfiguration" Visibility="Collapsed" Content="配置编辑器" Grid.Column="2" Grid.Row="0"></Button>
|
||||
<TextBlock Text="配置文件高级生成器
（有经验用户可以使用）" Visibility="Collapsed" Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" HorizontalAlignment="Center"></TextBlock>
|
||||
<!--<RadioButton x:Name="RadioButtonGuideConfiguration" Content="向导生成配置" Grid.Column="0" Grid.Row="0"></RadioButton>
|
||||
<RadioButton x:Name="RadioButtonTemplateConfiguration" Content="模板配置" Grid.Column="0" Grid.Row="1"></RadioButton>
|
||||
<RadioButton x:Name="RadioButtonAdvancedConfiguration" Content="高级配置" Grid.Column="0" Grid.Row="2"></RadioButton>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<Button x:Name="ButtonSetConfiguration" Margin="6" Content="配置" Grid.Column="2" Grid.Row="2" Click="ButtonSetConfiguration_Click"></Button>-->
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="BBR设置" Width="150" Height="30">
|
||||
<TabItem Header="BBR设置" Visibility="Collapsed" Width="150" Height="30">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
|
|
|
|||
|
|
@ -39,12 +39,10 @@ namespace ProxySU
|
|||
RadioButtonProxyNoLogin.IsChecked = true;
|
||||
RadioButtonSocks4.Visibility = Visibility.Collapsed;
|
||||
ReceiveConfigurationParameters = new string[6];
|
||||
//ReceiveConfigurationParameters[4] = "domaintext";
|
||||
|
||||
|
||||
}
|
||||
//开始布署安装
|
||||
//System.Diagnostics.Process exitProgram = System.Diagnostics.Process.GetProcessById(System.Diagnostics.Process.GetCurrentProcess().Id);
|
||||
|
||||
private void Button_Login_Click(object sender, RoutedEventArgs e)
|
||||
|
||||
{
|
||||
|
|
@ -62,14 +60,12 @@ namespace ProxySU
|
|||
if (RadioButtonPasswordLogin.IsChecked == true && string.IsNullOrEmpty(PasswordBoxHostPassword.Password) == true)
|
||||
{
|
||||
MessageBox.Show("登录密码为必填项，不能为空");
|
||||
//exitProgram.Kill();
|
||||
return;
|
||||
}
|
||||
string sshPassword = PasswordBoxHostPassword.Password.ToString();
|
||||
if (RadioButtonCertLogin.IsChecked == true && string.IsNullOrEmpty(TextBoxCertFilePath.Text) == true)
|
||||
{
|
||||
MessageBox.Show("密钥文件为必填项，不能为空");
|
||||
//exitProgram.Kill();
|
||||
return;
|
||||
}
|
||||
string sshPrivateKey = TextBoxCertFilePath.Text.ToString();
|
||||
|
|
@ -97,7 +93,6 @@ namespace ProxySU
|
|||
if (RadioButtonNoProxy.IsChecked==false&&(string.IsNullOrEmpty(TextBoxProxyHost.Text)==true||string.IsNullOrEmpty(TextBoxProxyPort.Text)==true))
|
||||
{
|
||||
MessageBox.Show("如果选择了代理，则代理地址与端口不能为空");
|
||||
//exitProgram.Kill();
|
||||
return;
|
||||
}
|
||||
string sshProxyHost = TextBoxProxyHost.Text.ToString();
|
||||
|
|
@ -105,14 +100,11 @@ namespace ProxySU
|
|||
if (RadiobuttonProxyYesLogin.IsChecked == true && (string.IsNullOrEmpty(TextBoxProxyUserName.Text) == true || string.IsNullOrEmpty(PasswordBoxProxyPassword.Password) == true))
|
||||
{
|
||||
MessageBox.Show("如果代理需要登录，则代理登录的用户名与密码不能为空");
|
||||
//exitProgram.Kill();
|
||||
return;
|
||||
}
|
||||
string sshProxyUser = TextBoxProxyUserName.Text.ToString();
|
||||
string sshProxyPassword = PasswordBoxProxyPassword.Password.ToString();
|
||||
|
||||
//TextBlockSetUpProcessing.Text = "登录中";
|
||||
//ProgressBarSetUpProcessing.IsIndeterminate = true;
|
||||
#endregion
|
||||
|
||||
|
||||
|
|
@ -161,7 +153,7 @@ namespace ProxySU
|
|||
{
|
||||
ReceiveConfigurationParameters[4] = TextBoxHost.Text.ToString();
|
||||
}
|
||||
|
||||
//选择模板
|
||||
if (String.IsNullOrEmpty(ReceiveConfigurationParameters[0]) == true)
|
||||
{
|
||||
MessageBox.Show("请先选择配置模板！");
|
||||
|
|
@ -475,13 +467,11 @@ namespace ProxySU
|
|||
|
||||
|
||||
//下载官方安装脚本安装
|
||||
//string installResult =client.RunCommand("echo 999999").Result.ToString();
|
||||
|
||||
client.RunCommand("curl -o /tmp/go.sh https://install.direct/go.sh");
|
||||
client.RunCommand("bash /tmp/go.sh");
|
||||
string installResult = client.RunCommand("find / -name v2ray").Result.ToString();
|
||||
//string installResult = client.RunCommand("bash /tmp/go.sh").Result;
|
||||
//installResult = installResult.Substring(0, installResult.Length - 1);
|
||||
//MessageBox.Show(installResult);
|
||||
|
||||
if (!installResult.Contains("/usr/bin/v2ray"))
|
||||
{
|
||||
MessageBox.Show("安装V2ray失败(官方脚本go.sh运行出错！");
|
||||
|
|
@ -491,10 +481,9 @@ namespace ProxySU
|
|||
return;
|
||||
}
|
||||
client.RunCommand("mv /etc/v2ray/config.json /etc/v2ray/config.json.1");
|
||||
//client.RunCommand("mkdir /etc/v2ray");
|
||||
//上传配置文件
|
||||
|
||||
currentStatus = "程序安装完毕，配置文件上传中......";
|
||||
//上传配置文件
|
||||
currentStatus = "V2ray程序安装完毕，配置文件上传中......";
|
||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
Thread.Sleep(1000);
|
||||
UploadConfig(connectionInfo, appConfig, upLoadPath);
|
||||
|
|
@ -510,13 +499,69 @@ namespace ProxySU
|
|||
Thread.Sleep(1000);
|
||||
upLoadPath = "/tmp/config.json";
|
||||
UploadConfig(connectionInfo, clientConfig, upLoadPath);
|
||||
|
||||
client.RunCommand("sed -i 's/##port##/" + ReceiveConfigurationParameters[1] + "/' "+ upLoadPath);
|
||||
|
||||
client.RunCommand("sed -i 's/##port##/" + ReceiveConfigurationParameters[1] + "/' " + upLoadPath);
|
||||
client.RunCommand("sed -i 's/##uuid##/" + ReceiveConfigurationParameters[2] + "/' " + upLoadPath);
|
||||
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);
|
||||
DownloadConfig(connectionInfo, "config\\config.json", upLoadPath);
|
||||
|
||||
//如果是WebSocket + TLS + Web模式，需要安装Caddy
|
||||
if (appConfig.Contains("WebSocketTLSWeb")==true)
|
||||
{
|
||||
currentStatus = "使用WebSocket + TLS + Web模式，正在安装Caddy......";
|
||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
Thread.Sleep(1000);
|
||||
|
||||
client.RunCommand("curl https://getcaddy.com -o getcaddy");
|
||||
client.RunCommand("bash getcaddy personal hook.service");
|
||||
client.RunCommand("mkdir -p /etc/caddy");
|
||||
client.RunCommand("mkdir -p /var/www");
|
||||
|
||||
//检测domain是否正确的解析到当前的VPS
|
||||
currentStatus = "正在检测域名是否解析到当前VPS的IP上......";
|
||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
Thread.Sleep(1000);
|
||||
|
||||
string nativeIp = client.RunCommand("curl -4 ip.sb").Result.ToString();
|
||||
string testDomain = client.RunCommand("ping " + ReceiveConfigurationParameters[4] + " -c 1 | grep -oE -m1 \"([0 - 9]{ 1,3}\\.){ 3}[0-9]{1,3}\"").Result.ToString();
|
||||
if (String.Equals(nativeIp, testDomain) == false)
|
||||
{
|
||||
currentStatus = "域名未能正确解析到当前VPS的IP上!";
|
||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
Thread.Sleep(1000);
|
||||
MessageBox.Show("域名未能正确解析到当前VPS的IP上，请检查！若解析设置正确，请等待生效后再重试安装");
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
currentStatus = "解析正确！上传Caddy配置文件......";
|
||||
textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
//currentStatus = "上传Caddy配置文件......";
|
||||
//textBlockName.Dispatcher.BeginInvoke(updateAction, textBlockName, progressBar, currentStatus);
|
||||
//Thread.Sleep(1000);
|
||||
appConfig = "TemplateConfg\\WebSocketTLSWeb_server_config.caddyfile";
|
||||
upLoadPath = "/etc/caddy/Caddyfile";
|
||||
UploadConfig(connectionInfo, appConfig, upLoadPath);
|
||||
//string[] splitDomain = ReceiveConfigurationParameters[4].Split('.');
|
||||
|
||||
string emailAddress = ReceiveConfigurationParameters[4];
|
||||
emailAddress = client.RunCommand("${"+ emailAddress+"/./@}").Result.ToString();
|
||||
|
||||
//client.RunCommand("sed -i 's/##port##/" + ReceiveConfigurationParameters[1] + "/' " + upLoadPath);
|
||||
//client.RunCommand("sed -i 's/##uuid##/" + ReceiveConfigurationParameters[2] + "/' " + upLoadPath);
|
||||
client.RunCommand("sed -i 's/##path##/\\" + ReceiveConfigurationParameters[3] + "/' " + upLoadPath);
|
||||
client.RunCommand("sed -i 's/##domain##/" + ReceiveConfigurationParameters[4] + "/' " + upLoadPath);
|
||||
client.RunCommand("sed -i 's/##email##/${" + emailAddress + ":=\"off\"}/' " + upLoadPath);
|
||||
//client.RunCommand("sed -i 's/##mkcpHeaderType##/" + ReceiveConfigurationParameters[5] + "/' " + upLoadPath);
|
||||
client.RunCommand("caddy -service install -agree -email "+ emailAddress + " -conf /etc/caddy/Caddyfile");
|
||||
client.RunCommand("caddy -service start");
|
||||
}
|
||||
|
||||
|
||||
client.Disconnect();
|
||||
|
||||
currentStatus = "安装成功";
|
||||
|
|
@ -697,9 +742,6 @@ namespace ProxySU
|
|||
private void ButtonTemplateConfiguration_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
WindowTemplateConfiguration windowTemplateConfiguration = new WindowTemplateConfiguration();
|
||||
|
||||
//windowTemplateConfiguration.Source = new Uri("Page1.xaml", UriKind.Relative);
|
||||
|
||||
windowTemplateConfiguration.ShowDialog();
|
||||
}
|
||||
//测试接收到的模板参数
|
||||
|
|
|
|||
|
|
@ -49,13 +49,14 @@
|
|||
<RadioButton x:Name="RadioButton2mKCP2DTLS" Content="mKCP+DTLS 1.2" Grid.Column="0" Grid.Row="6" Checked="RadioButtonTCP_Checked"></RadioButton>
|
||||
<TextBlock Text="伪装成 DTLS 1.2 数据包" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButton2mKCP2WireGuard" Content="mKCP+WireGuard" Grid.Column="0" Grid.Row="7" Checked="RadioButtonTCP_Checked"></RadioButton>
|
||||
<TextBlock Text="伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonHTTP2" Content="HTTP/2" Grid.Column="0" Grid.Row="8" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现" Grid.Column="1" Grid.Row="8" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonTLS" Content="TLS" Grid.Column="0" Grid.Row="9" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="使用TLS加密数据流" Grid.Column="1" Grid.Row="9" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web" Grid.Column="0" Grid.Row="10" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="目前是稳定性最好的，使用Caddy做网站前置，https数据流，不易被识别出流量特征" Grid.Column="1" Grid.Row="10" Grid.ColumnSpan="2"></TextBlock>
|
||||
<TextBlock Text="伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)" TextWrapping="Wrap" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonWebSocketTLS2Web" Content="WebSocket+TLS+Web" Grid.Column="0" Grid.Row="8" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="目前是稳定性最好的，使用Caddy做网站前置，https数据流，不易被识别出流量特征" TextWrapping="Wrap" Grid.Column="1" Grid.Row="8" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonHTTP2" Content="HTTP/2" Visibility="Collapsed" Grid.Column="0" Grid.Row="10" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="基于 HTTP/2 的传输方式。它完整按照 HTTP/2 标准实现" Visibility="Collapsed" Grid.Column="1" Grid.Row="10" Grid.ColumnSpan="2"></TextBlock>
|
||||
<RadioButton x:Name="RadioButtonTLS" Visibility="Collapsed" Content="TLS" Grid.Column="0" Grid.Row="9" Checked="RadioButtonHTTP2_Checked"></RadioButton>
|
||||
<TextBlock Text="使用TLS加密数据流" Visibility="Collapsed" Grid.Column="1" Grid.Row="9" Grid.ColumnSpan="2"></TextBlock>
|
||||
|
||||
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
|
@ -79,18 +80,19 @@
|
|||
<TextBlock x:Name="TextBlockServerListenPort" Text="服务端口：" Grid.Column="0" Grid.Row="0"></TextBlock>
|
||||
<TextBox x:Name="TextBoxServerListenPort" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonServerListenPort" Content="随机选择" Grid.Column="3" Grid.Row="0" Margin="5" Click="ButtonServerListenPort_Click"></Button>
|
||||
<TextBlock x:Name="TextBlockNewUUID" Text="新建UUID：" Grid.Column="0" Grid.Row="1"></TextBlock>
|
||||
<TextBlock x:Name="TextBlockNewUUID" Text="UUID：" Grid.Column="0" Grid.Row="1"></TextBlock>
|
||||
<TextBox x:Name="TextBoxNewUUID" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonNewUUID" Content="更新" Grid.Column="3" Grid.Row="1" Margin="5" Click="ButtonNewUUID_Click"></Button>
|
||||
<TextBlock x:Name="TextBlockExistingUUID" Text="使用现有UUID：" Grid.Column="0" Grid.Row="2"></TextBlock>
|
||||
<TextBox x:Name="TextBoxExistingUUID" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonExistingUUID" Content="粘贴到框中" Grid.Column="3" Grid.Row="2" Margin="5"></Button>
|
||||
<TextBlock Text="使用已有的UUID，直接粘贴到框中" TextWrapping="Wrap" Grid.Column="4" Grid.Row="1"></TextBlock>
|
||||
<TextBlock x:Name="TextBlockExistingUUID" Text="使用现有UUID：" Visibility="Collapsed" Grid.Column="0" Grid.Row="2"></TextBlock>
|
||||
<TextBox x:Name="TextBoxExistingUUID" Visibility="Collapsed" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonExistingUUID" Visibility="Collapsed" Content="粘贴到框中" Grid.Column="3" Grid.Row="2" Margin="5"></Button>
|
||||
<TextBlock x:Name="TextBlockPath" Text="路径：" Grid.Column="0" Grid.Row="3"></TextBlock>
|
||||
<TextBox x:Name="TextBoxPath" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonPath" Content="随机" Grid.Column="3" Grid.Row="3" Margin="5" Click="ButtonPath_Click"></Button>
|
||||
<TextBlock x:Name="TextBlockDomain" Text="域名：" Grid.Column="0" Grid.Row="4"></TextBlock>
|
||||
<TextBox x:Name="TextBoxDomain" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Margin="5"></TextBox>
|
||||
<Button x:Name="ButtonDomain" Content="检测" Grid.Column="3" Grid.Row="4" Margin="5"></Button>
|
||||
<Button x:Name="ButtonDomain" Content="检测" Visibility="Collapsed" Grid.Column="3" Grid.Row="4" Margin="5" Click="ButtonDomain_Click"></Button>
|
||||
|
||||
<Button x:Name="ButtondDecide" Content="确定" Grid.Column="1" Grid.Row="5" Margin="4" Click="ButtondDecide_Click"></Button>
|
||||
<Button x:Name="ButtondCancel" Content="取消" Grid.Column="2" Grid.Row="5" Margin="4" Click="ButtondCancel_Click" ></Button>
|
||||
|
|
|
|||
|
|
@ -183,5 +183,10 @@ namespace ProxySU
|
|||
TextBoxPath.Text = $"/{path}";
|
||||
//MessageBox.Show(path);
|
||||
}
|
||||
|
||||
private void ButtonDomain_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
##domain## {
|
||||
root /var/www
|
||||
tls ##email##
|
||||
proxy / ##sites##
|
||||
##sites##
|
||||
proxy ##path## localhost:10000 {
|
||||
websocket
|
||||
header_upstream -Origin
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue