配置重命名

FastGithub.Core/DomainConfig.cs

@@ -8,9 +8,9 @@ namespace FastGithub
     public class DomainConfig
     {
         /// <summary>
-        /// 是否不发送SNI
+        /// 是否发送SNI
         /// </summary>
-        public bool NoSni { get; set; } = true;
+        public bool TlsSni { get; set; }
 
         /// <summary>
         /// 目的地

FastGithub.Core/FastGithubConfig.cs

@@ -20,16 +20,16 @@ namespace FastGithub
 
 
         /// <summary>
-        /// 获取信任dns
+        /// 未污染的dns
         /// </summary>
         [AllowNull]
-        public IPEndPoint TrustedDns { get; private set; }
+        public IPEndPoint PureDns { get; private set; }
 
         /// <summary>
-        /// 获取非信任dns
+        /// 速度快的dns
         /// </summary>
         [AllowNull]
-        public IPEndPoint UnTrustedDns { get; private set; }
+        public IPEndPoint FastDns { get; private set; }
 
         /// <summary>
         /// 获取域名配置
@@ -54,8 +54,8 @@ namespace FastGithub
         private void Init(FastGithubOptions options)
         {
             this.domainConfigCache = new ConcurrentDictionary<string, DomainConfig?>();
-            this.TrustedDns = options.TrustedDns.ToIPEndPoint();
+            this.PureDns = options.PureDns.ToIPEndPoint();
-            this.UnTrustedDns = options.UntrustedDns.ToIPEndPoint();
+            this.FastDns = options.FastDns.ToIPEndPoint();
             this.DomainConfigs = options.DomainConfigs.ToDictionary(kv => new DomainMatch(kv.Key), kv => kv.Value);
         }
 

FastGithub.Core/FastGithubOptions.cs

@@ -8,14 +8,14 @@ namespace FastGithub
     public class FastGithubOptions
     {
         /// <summary>
-        /// 受信任的dns服务
+        /// 未污染的dns
         /// </summary>
-        public DnsConfig TrustedDns { get; set; } = new DnsConfig { IPAddress = "127.0.0.1", Port = 5533 };
+        public DnsConfig PureDns { get; set; } = new DnsConfig { IPAddress = "127.0.0.1", Port = 5533 };
 
         /// <summary>
-        /// 不受信任的dns服务
+        /// 速度快的dns
         /// </summary>
-        public DnsConfig UntrustedDns { get; set; } = new DnsConfig { IPAddress = "114.114.114.114", Port = 53 };
+        public DnsConfig FastDns { get; set; } = new DnsConfig { IPAddress = "114.114.114.114", Port = 53 };
 
         /// <summary>
         /// 代理的域名配置

FastGithub.Dns/DnsServerHostedService.cs

@@ -82,7 +82,7 @@ namespace FastGithub.Dns
             }
 
             this.logger.LogInformation("dns服务启动成功");
-            var secondary = this.fastGithubConfig.UnTrustedDns.Address;
+            var secondary = this.fastGithubConfig.FastDns.Address;
             this.dnsAddresses = this.SetNameServers(IPAddress.Loopback, secondary);
             FlushResolverCache();
 

FastGithub.Dns/RequestResolver.cs

@@ -36,12 +36,12 @@ namespace FastGithub.Dns
             this.fastGithubConfig = fastGithubConfig;
             this.logger = logger;
 
-            this.requestResolver = new UdpRequestResolver(fastGithubConfig.UnTrustedDns);
+            this.requestResolver = new UdpRequestResolver(fastGithubConfig.FastDns);
-            options.OnChange(opt => DnsConfigChanged(opt.UntrustedDns));
+            options.OnChange(opt => OptionsChanged(opt));
 
-            void DnsConfigChanged(DnsConfig config)
+            void OptionsChanged(FastGithubOptions opt)
             {
-                var dns = config.ToIPEndPoint();
+                var dns = opt.FastDns.ToIPEndPoint();
                 this.requestResolver = new UdpRequestResolver(dns);
             }
         }

FastGithub.ReverseProxy/DomainResolver.cs

@@ -57,7 +57,7 @@ namespace FastGithub.ReverseProxy
         {
             try
             {
-                var dns = this.fastGithubConfig.TrustedDns;
+                var dns = this.fastGithubConfig.PureDns;
                 var dnsClient = new DnsClient(dns);
                 var addresses = await dnsClient.Lookup(domain, DNS.Protocol.RecordType.A, cancellationToken);
                 var address = addresses?.FirstOrDefault();
@@ -80,7 +80,7 @@ namespace FastGithub.ReverseProxy
             }
             catch (Exception ex)
             {
-                var dns = this.fastGithubConfig.TrustedDns;
+                var dns = this.fastGithubConfig.PureDns;
                 throw new FastGithubException($"dns({dns})：{ex.Message}", ex);
             }
         }

FastGithub.ReverseProxy/ReverseProxyMiddleware.cs

@@ -47,9 +47,9 @@ namespace FastGithub.ReverseProxy
             }
 
             var destinationPrefix = GetDestinationPrefix(host, domainConfig.Destination);
-            var httpClient = domainConfig.NoSni
+            var httpClient = domainConfig.TlsSni
-               ? new HttpMessageInvoker(this.noSniHttpClientHanlder, disposeHandler: false)
+               ? new HttpMessageInvoker(this.sniHttpClientHanlder, disposeHandler: false)
-               : new HttpMessageInvoker(this.sniHttpClientHanlder, disposeHandler: false);
+               : new HttpMessageInvoker(this.noSniHttpClientHanlder, disposeHandler: false);
 
             var error = await httpForwarder.SendAsync(context, destinationPrefix, httpClient);
             await ResponseErrorAsync(context, error);

FastGithub/appsettings.json

@@ -1,68 +1,68 @@
 {
   "FastGithub": {
-    "TrustedDns": { // 用于解析DomainConfigs的域名，解析准确
+    "PureDns": { // 用于解析DomainConfigs的域名
       "IPAddress": "127.0.0.1",
       "Port": 5533 // 5533指向dnscrypt-proxy
     },
-    "UnTrustedDns": { // 用于解析不在DomainConfigs的域名，解析速度快
+    "FastDns": { // 用于解析不在DomainConfigs的域名
       "IPAddress": "114.114.114.114",
       "Port": 53
     },
     "DomainConfigs": { // 域名的*表示0到多个任意字符
       "github.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "githubstatus.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*.github.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*.github.io": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*.githubapp.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*.githubassets.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*.githubusercontent.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "*github*.s3.amazonaws.com": {
-        "NoSni": true,
+        "TlsSni": false,
         "Destination": null
       },
       "ajax.googleapis.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://gapis.geekzu.org/ajax/"
       },
       "fonts.googleapis.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://fonts.geekzu.org/"
       },
       "themes.googleusercontent.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://gapis.geekzu.org/g-themes/"
       },
       "fonts.gstatic.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://gapis.geekzu.org/g-fonts/"
       },
       "secure.gravatar.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://sdn.geekzu.org/"
       },
       "*.gravatar.com": {
-        "NoSni": false,
+        "TlsSni": true,
         "Destination": "https://fdn.geekzu.org/"
       }
     }