From 0811f175c8e6691c9c49e2f9390ca17320ba7d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E4=B9=9D?= <366193849@qq.com>
Date: Wed, 8 Sep 2021 14:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4ListenConfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FastGithub.Configuration/FastGithubOptions.cs | 5 ---
FastGithub.Configuration/ListenConfig.cs | 18 --------
FastGithub.Dns/DnsOverUdpHostedService.cs | 44 ++++--------------
FastGithub.Dns/DnsOverUdpServer.cs | 45 ++++++++++++++-----
.../KestrelServerOptionsExtensions.cs | 12 +++--
FastGithub/appsettings.json | 6 +--
6 files changed, 49 insertions(+), 81 deletions(-)
delete mode 100644 FastGithub.Configuration/ListenConfig.cs
diff --git a/FastGithub.Configuration/FastGithubOptions.cs b/FastGithub.Configuration/FastGithubOptions.cs
index 013414a..69faac7 100644
--- a/FastGithub.Configuration/FastGithubOptions.cs
+++ b/FastGithub.Configuration/FastGithubOptions.cs
@@ -8,11 +8,6 @@ namespace FastGithub.Configuration
///
public class FastGithubOptions
{
- ///
- /// 监听配置
- ///
- public ListenConfig Listen { get; set; } = new ListenConfig();
-
///
/// 回退的dns
///
diff --git a/FastGithub.Configuration/ListenConfig.cs b/FastGithub.Configuration/ListenConfig.cs
deleted file mode 100644
index c209ab9..0000000
--- a/FastGithub.Configuration/ListenConfig.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace FastGithub.Configuration
-{
- ///
- /// 监听配置
- ///
- public record ListenConfig
- {
- ///
- /// 监听的ssh端口
- ///
- public int SshPort { get; init; } = 22;
-
- ///
- /// 监听的dns端口
- ///
- public int DnsPort { get; init; } = 53;
- }
-}
diff --git a/FastGithub.Dns/DnsOverUdpHostedService.cs b/FastGithub.Dns/DnsOverUdpHostedService.cs
index 2f88f3a..13ec6b0 100644
--- a/FastGithub.Dns/DnsOverUdpHostedService.cs
+++ b/FastGithub.Dns/DnsOverUdpHostedService.cs
@@ -17,15 +17,15 @@ namespace FastGithub.Dns
{
private readonly DnsOverUdpServer dnsOverUdpServer;
private readonly IEnumerable conflictValidators;
- private readonly IOptionsMonitor options;
private readonly ILogger logger;
+
///
/// dns后台服务
///
///
///
- ///
+ ///
///
public DnsOverUdpHostedService(
DnsOverUdpServer dnsOverUdpServer,
@@ -35,9 +35,7 @@ namespace FastGithub.Dns
{
this.dnsOverUdpServer = dnsOverUdpServer;
this.conflictValidators = conflictValidators;
- this.options = options;
this.logger = logger;
-
options.OnChange(opt => SystemDnsUtil.FlushResolverCache());
}
@@ -48,26 +46,15 @@ namespace FastGithub.Dns
///
public override async Task StartAsync(CancellationToken cancellationToken)
{
- var dnsPort = this.options.CurrentValue.Listen.DnsPort;
- this.dnsOverUdpServer.Bind(IPAddress.Any, dnsPort);
- this.logger.LogInformation($"已监听udp端口{dnsPort}，DNS服务启动完成");
-
- const int STANDARD_DNS_PORT = 53;
- if (dnsPort == STANDARD_DNS_PORT)
+ try
{
- try
- {
- SystemDnsUtil.SetAsPrimitiveDns();
- SystemDnsUtil.FlushResolverCache();
- }
- catch (Exception ex)
- {
- this.logger.LogWarning(ex.Message);
- }
+ const int DNS_PORT = 53;
+ this.dnsOverUdpServer.Listen(IPAddress.Any, DNS_PORT);
+ this.logger.LogInformation($"已监听udp端口{DNS_PORT}，DNS服务启动完成");
}
- else
+ catch (Exception ex)
{
- this.logger.LogWarning($"由于使用了非标准DNS端口{dnsPort}，你需要将{nameof(FastGithub)}设置为标准DNS的上游");
+ this.logger.LogError($"DNS服务启动失败：{ex.Message}{Environment.NewLine}请配置系统或浏览器使用{nameof(FastGithub)}的DoH，或向系统hosts文件添加github相关域名的ip为127.0.0.1");
}
foreach (var item in this.conflictValidators)
@@ -96,21 +83,6 @@ namespace FastGithub.Dns
public override Task StopAsync(CancellationToken cancellationToken)
{
this.dnsOverUdpServer.Dispose();
- this.logger.LogInformation("DNS服务已停止");
-
- try
- {
- SystemDnsUtil.RemoveFromPrimitiveDns();
- }
- catch (Exception ex)
- {
- this.logger.LogWarning(ex.Message);
- }
- finally
- {
- SystemDnsUtil.FlushResolverCache();
- }
-
return base.StopAsync(cancellationToken);
}
}
diff --git a/FastGithub.Dns/DnsOverUdpServer.cs b/FastGithub.Dns/DnsOverUdpServer.cs
index 8d38c06..ab121df 100644
--- a/FastGithub.Dns/DnsOverUdpServer.cs
+++ b/FastGithub.Dns/DnsOverUdpServer.cs
@@ -19,6 +19,8 @@ namespace FastGithub.Dns
private readonly Socket socket = new(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
private readonly byte[] buffer = new byte[ushort.MaxValue];
+ private bool listened = false;
+
///
/// dns服务器
///
@@ -33,12 +35,13 @@ namespace FastGithub.Dns
}
///
- /// 绑定地址和端口
+ /// 监听IP地址和端口
///
///
///
- ///
- public void Bind(IPAddress address, int port)
+ ///
+ ///
+ public void Listen(IPAddress address, int port)
{
if (OperatingSystem.IsWindows())
{
@@ -56,17 +59,17 @@ namespace FastGithub.Dns
this.socket.IOControl(SIO_UDP_CONNRESET, new byte[4], new byte[4]);
}
+ this.socket.Bind(new IPEndPoint(address, port));
+ this.listened = true;
+
try
{
- this.socket.Bind(new IPEndPoint(address, port));
+ SystemDnsUtil.SetAsPrimitiveDns();
+ SystemDnsUtil.FlushResolverCache();
}
- catch (SocketException ex) when (ex.SocketErrorCode == SocketError.AccessDenied)
+ catch (Exception ex)
{
- if (OperatingSystem.IsLinux())
- {
- throw new FastGithubException($"请以root身份运行", ex);
- }
- throw;
+ this.logger.LogWarning(ex.Message);
}
}
@@ -77,6 +80,11 @@ namespace FastGithub.Dns
///
public async Task HandleAsync(CancellationToken cancellationToken)
{
+ if (this.listened == false)
+ {
+ return;
+ }
+
var remoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
while (cancellationToken.IsCancellationRequested == false)
{
@@ -121,6 +129,23 @@ namespace FastGithub.Dns
public void Dispose()
{
this.socket.Dispose();
+ if (this.listened == false)
+ {
+ return;
+ }
+
+ try
+ {
+ SystemDnsUtil.RemoveFromPrimitiveDns();
+ }
+ catch (Exception ex)
+ {
+ this.logger.LogWarning(ex.Message);
+ }
+ finally
+ {
+ SystemDnsUtil.FlushResolverCache();
+ }
}
}
}
diff --git a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
index 8c06047..be65491 100644
--- a/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
+++ b/FastGithub.ReverseProxy/KestrelServerOptionsExtensions.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
using System;
using System.Net;
@@ -72,18 +71,17 @@ namespace FastGithub
///
public static void ListenGithubSshProxy(this KestrelServerOptions kestrel)
{
- var listenOptions = kestrel.ApplicationServices.GetRequiredService>();
- var sshPort = listenOptions.Value.Listen.SshPort;
+ const int SSH_PORT = 22;
var logger = kestrel.GetLogger();
- if (LocalMachine.CanListenTcp(sshPort) == false)
+ if (LocalMachine.CanListenTcp(SSH_PORT) == false)
{
- logger.LogWarning($"由于tcp端口{sshPort}已经被其它进程占用，github的ssh代理功能将受限");
+ logger.LogWarning($"由于tcp端口{SSH_PORT}已经被其它进程占用，github的ssh代理功能将受限");
}
else
{
- kestrel.Listen(IPAddress.Any, sshPort, listen => listen.UseConnectionHandler());
- logger.LogInformation($"已监听tcp端口{sshPort}，github的ssh代理启动完成");
+ kestrel.Listen(IPAddress.Any, SSH_PORT, listen => listen.UseConnectionHandler());
+ logger.LogInformation($"已监听tcp端口{SSH_PORT}，github的ssh代理启动完成");
}
}
diff --git a/FastGithub/appsettings.json b/FastGithub/appsettings.json
index 60f4d4a..15aab34 100644
--- a/FastGithub/appsettings.json
+++ b/FastGithub/appsettings.json
@@ -1,10 +1,6 @@
{
// 新增的子配置文件appsettings.*.json，重启应用程序才生效
"FastGithub": {
- "Listen": {
- "SshPort": 22, // ssh监听的端口，修改后重启应用才生效
- "DnsPort": 53 // dns监听的端口，修改后重启应用才生效
- },
"FallbackDns": [ // 用于解析不在DomainConfigs的域名
{
"IPAddress": "114.114.114.114",
@@ -16,7 +12,7 @@
}
],
"DomainConfigs": {
- "*.x.y.z.com": { // 域名的*表示除.之外0到多个任意字符
+ "*.fastgithub.com": { // 域名的*表示除.之外0到多个任意字符
"TlsSni": false, // 指示tls握手时是否发送SNI
"TlsSniPattern": null, // SNI表达式，@domain变量表示取域名值 @ipaddress变量表示取ip @random变量表示取随机值，其它字符保留不替换
"TlsIgnoreNameMismatch": false, // 是否忽略服务器证书域名不匹配，当不发送SNI时服务器可能发回域名不匹配的证书，默认为false