集成dns

FastGithub/DnsHostedService.cs

@@ -0,0 +1,79 @@
+using DNS.Client.RequestResolver;
+using DNS.Protocol;
+using DNS.Protocol.ResourceRecords;
+using DNS.Server;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FastGithub
+{
+    sealed class DnsHostedService : IHostedService, IRequestResolver
+    {
+        private readonly DnsServer dnsServer;
+        private readonly GithubScanService githubScanService;
+        private readonly ILogger<DnsHostedService> logger;
+
+        public DnsHostedService(
+            GithubScanService githubScanService,
+            IOptions<DnsOptions> options,
+            ILogger<DnsHostedService> logger)
+        {
+            this.dnsServer = new DnsServer(this, options.Value.UpStream);
+            this.githubScanService = githubScanService;
+            this.logger = logger;
+        }
+
+        /// <summary>
+        /// 解析dns
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task<IResponse> IRequestResolver.Resolve(IRequest request, CancellationToken cancellationToken)
+        {
+            var response = Response.FromRequest(request);
+            var question = request.Questions.FirstOrDefault();
+
+            if (question != null && question.Type == RecordType.A)
+            {
+                var domain = question.Name.ToString();
+                if (domain.Contains("github", StringComparison.OrdinalIgnoreCase))
+                {
+                    var contexts = this.githubScanService.Result
+                        .Where(item => item.Domain == domain)
+                        .OrderBy(item => item.HttpElapsed);
+
+                    foreach (var context in contexts)
+                    {
+                        var record = new IPAddressResourceRecord(question.Name, context.Address, TimeSpan.FromMinutes(2d));
+                        response.AnswerRecords.Add(record);
+                        this.logger.LogWarning(record.ToString());
+                    }
+
+                    return Task.FromResult<IResponse>(response);
+                }
+            }
+
+            return Task.FromResult<IResponse>(response);
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            this.dnsServer.Listen();
+            this.logger.LogInformation("dns服务启用成功");
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            this.dnsServer.Dispose();
+            this.logger.LogInformation("dns服务已终止");
+            return Task.CompletedTask;
+        }
+    }
+}

FastGithub/DnsOptions.cs

@@ -0,0 +1,9 @@
+using System.Net;
+
+namespace FastGithub
+{
+    class DnsOptions
+    {
+        public IPAddress UpStream { get; set; } = IPAddress.Parse("114.114.114.114");
+    }
+}

FastGithub/FastGithub.csproj

@@ -3,15 +3,16 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup> 
 
   <ItemGroup>
+    <PackageReference Include="DNS" Version="6.1.0" />
     <PackageReference Include="IPNetwork2" Version="2.5.320" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-preview.4.21253.7" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0-preview.4.21253.7" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

FastGithub/GithubContext.cs

@@ -1,19 +1,22 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Net;
 
 namespace FastGithub
 {
     class GithubContext
     {
-        [AllowNull]
+        public string Domain { get;  }
-        public string Domain { get; set; }
 
-        [AllowNull]
+        public IPAddress Address { get;  }
-        public IPAddress Address { get; set; }
 
         public TimeSpan? HttpElapsed { get; set; }
 
+        public GithubContext(string domain,IPAddress address)
+        {
+            this.Domain = domain;
+            this.Address = address;
+        }
+
         public override string ToString()
         {
             return $"{Address}\t{Domain}\t# {HttpElapsed}";

FastGithub/GithubHostedService.cs

@@ -1,35 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace FastGithub
-{
-    sealed class GithubHostedService : IHostedService
-    {
-        private readonly IServiceScopeFactory serviceScopeFactory;
-        private readonly IHostApplicationLifetime hostApplicationLifetime;
-
-        public GithubHostedService(
-            IServiceScopeFactory serviceScopeFactory,
-            IHostApplicationLifetime hostApplicationLifetime)
-        {
-            this.serviceScopeFactory = serviceScopeFactory;
-            this.hostApplicationLifetime = hostApplicationLifetime;
-        }
-
-
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            var scope = this.serviceScopeFactory.CreateScope();
-            var service = scope.ServiceProvider.GetRequiredService<GithubService>();
-            await service.ScanAddressAsync(cancellationToken);
-            this.hostApplicationLifetime.StopApplication();
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
-    }
-}

FastGithub/GithubOptions.cs

@@ -4,8 +4,12 @@ namespace FastGithub
 {
     class GithubOptions
     {
+        public TimeSpan ScanAllInterval { get; set; } = TimeSpan.FromHours(12d);
+
+        public TimeSpan ScanResultInterval { get; set; } = TimeSpan.FromMinutes(5d);
+
         public Uri MetaUri { get; set; } = new Uri("https://gitee.com/jiulang/fast-github/raw/master/FastGithub/meta.json");
-         
+
         public TimeSpan PortScanTimeout { get; set; } = TimeSpan.FromSeconds(1d);
 
         public TimeSpan HttpsScanTimeout { get; set; } = TimeSpan.FromSeconds(5d);

FastGithub/GithubScanAllHostedService.cs

@@ -0,0 +1,31 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FastGithub
+{
+    sealed class GithubScanAllHostedService : BackgroundService
+    {
+        private readonly GithubScanService githubScanService;
+        private readonly IOptionsMonitor<GithubOptions> options;
+
+        public GithubScanAllHostedService(
+            GithubScanService githubScanService,
+            IOptionsMonitor<GithubOptions> options)
+        {
+            this.githubScanService = githubScanService;
+            this.options = options;
+        }
+
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (stoppingToken.IsCancellationRequested == false)
+            {
+                await githubScanService.ScanAllAsync(stoppingToken);
+                await Task.Delay(this.options.CurrentValue.ScanResultInterval, stoppingToken);
+            }
+        }
+    }
+}

FastGithub/GithubScanBuilder.cs

@@ -7,10 +7,10 @@ namespace FastGithub
     /// <summary>
     /// 表示中间件创建者
     /// </summary>
-    sealed class GithubBuilder : IGithubBuilder
+    sealed class GithubScanBuilder : IGithubScanBuilder
     {
-        private readonly GithubDelegate completedHandler;
+        private readonly GithubScanDelegate completedHandler;
-        private readonly List<Func<GithubDelegate, GithubDelegate>> middlewares = new();
+        private readonly List<Func<GithubScanDelegate, GithubScanDelegate>> middlewares = new();
 
         /// <summary>
         /// 获取服务提供者
@@ -21,7 +21,7 @@ namespace FastGithub
         /// 中间件创建者
         /// </summary>
         /// <param name="appServices"></param>
-        public GithubBuilder(IServiceProvider appServices)
+        public GithubScanBuilder(IServiceProvider appServices)
             : this(appServices, context => Task.CompletedTask)
         {
         }
@@ -31,7 +31,7 @@ namespace FastGithub
         /// </summary>
         /// <param name="appServices"></param>
         /// <param name="completedHandler">完成执行内容处理者</param>
-        public GithubBuilder(IServiceProvider appServices, GithubDelegate completedHandler)
+        public GithubScanBuilder(IServiceProvider appServices, GithubScanDelegate completedHandler)
         {
             this.AppServices = appServices;
             this.completedHandler = completedHandler;
@@ -42,7 +42,7 @@ namespace FastGithub
         /// </summary>
         /// <param name="middleware"></param>
         /// <returns></returns>
-        public IGithubBuilder Use(Func<GithubDelegate, GithubDelegate> middleware)
+        public IGithubScanBuilder Use(Func<GithubScanDelegate, GithubScanDelegate> middleware)
         {
             this.middlewares.Add(middleware);
             return this;
@@ -53,7 +53,7 @@ namespace FastGithub
         /// 创建所有中间件执行处理者
         /// </summary>
         /// <returns></returns>
-        public GithubDelegate Build()
+        public GithubScanDelegate Build()
         {
             var handler = this.completedHandler;
             for (var i = this.middlewares.Count - 1; i >= 0; i--)

FastGithub/GithubScanBuilderExtensions.cs

@@ -6,7 +6,7 @@ namespace FastGithub
     /// <summary>
     /// 中间件创建者扩展
     /// </summary>
-    static class GithubBuilderExtensions
+    static class GithubScanBuilderExtensions
     {
         /// <summary>
         /// 使用中间件
@@ -14,7 +14,7 @@ namespace FastGithub
         /// <typeparam name="TMiddleware"></typeparam>
         /// <param name="builder"></param>
         /// <returns></returns>
-        public static IGithubBuilder Use<TMiddleware>(this IGithubBuilder builder) where TMiddleware : class, IGithubMiddleware
+        public static IGithubScanBuilder Use<TMiddleware>(this IGithubScanBuilder builder) where TMiddleware : class, IGithubScanMiddleware
         {
             return builder.AppServices.GetService(typeof(TMiddleware)) is TMiddleware middleware
                ? builder.Use(middleware.InvokeAsync)
@@ -28,7 +28,7 @@ namespace FastGithub
         /// <param name="builder"></param>
         /// <param name="middleware"></param>
         /// <returns></returns>
-        public static IGithubBuilder Use(this IGithubBuilder builder, Func<GithubContext, Func<Task>, Task> middleware)
+        public static IGithubScanBuilder Use(this IGithubScanBuilder builder, Func<GithubContext, Func<Task>, Task> middleware)
         {
             return builder.Use(next => context => middleware(context, () => next(context)));
         }

FastGithub/GithubScanDelegate.cs

@@ -7,5 +7,5 @@ namespace FastGithub
     /// </summary> 
     /// <param name="context">中间件上下文</param>
     /// <returns></returns>
-    delegate Task GithubDelegate(GithubContext context);
+    delegate Task GithubScanDelegate(GithubContext context);
 }

FastGithub/GithubScanResultHostedService.cs

@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FastGithub
+{
+    sealed class GithubScanResultHostedService : BackgroundService
+    {
+        private readonly GithubScanService githubScanService;
+        private readonly IOptionsMonitor<GithubOptions> options;
+
+        public GithubScanResultHostedService(
+            GithubScanService githubScanService,
+            IOptionsMonitor<GithubOptions> options)
+        {
+            this.githubScanService = githubScanService;
+            this.options = options;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (stoppingToken.IsCancellationRequested == false)
+            {
+                await Task.Delay(this.options.CurrentValue.ScanResultInterval, stoppingToken);
+                await githubScanService.ScanResultAsync();
+            }
+        }
+    }
+}

FastGithub/GithubScanService.cs

@@ -0,0 +1,51 @@
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FastGithub
+{
+    sealed class GithubScanService
+    {
+        private readonly GithubMetaService metaService;
+        private readonly GithubScanDelegate scanDelegate;
+
+        public ConcurrentQueue<GithubContext> Result { get; } = new();
+
+        public GithubScanService(
+            GithubMetaService metaService,
+            GithubScanDelegate scanDelegate)
+        {
+            this.metaService = metaService;
+            this.scanDelegate = scanDelegate;
+        }
+
+        public async Task ScanAllAsync(CancellationToken cancellationToken = default)
+        {
+            var meta = await this.metaService.GetMetaAsync(cancellationToken);
+            if (meta != null)
+            {
+                this.Result.Clear();
+                var scanTasks = meta.ToGithubContexts().Select(ctx => ScanAsync(ctx));
+                await Task.WhenAll(scanTasks);
+            }
+        }
+
+        public async Task ScanResultAsync()
+        {
+            while (this.Result.TryDequeue(out var context))
+            {
+                await this.ScanAsync(context);
+            }
+        }
+
+        private async Task ScanAsync(GithubContext context)
+        {
+            await this.scanDelegate(context);
+            if (context.HttpElapsed != null)
+            {
+                this.Result.Enqueue(context);
+            }
+        }
+    }
+}

FastGithub/GithubService.cs

@@ -1,73 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace FastGithub
-{
-    sealed class GithubService
-    {
-        private readonly GithubMetaService githubMetaService;
-        private readonly GithubDelegate githubDelegate;
-        private readonly ILogger<GithubService> logger;
-
-        public GithubService(
-            GithubMetaService githubMetaService,
-            GithubDelegate githubDelegate,
-            ILogger<GithubService> logger)
-        {
-            this.githubMetaService = githubMetaService;
-            this.githubDelegate = githubDelegate;
-            this.logger = logger;
-        }
-
-        public async Task ScanAddressAsync(CancellationToken cancellationToken = default)
-        {
-            var meta = await this.githubMetaService.GetMetaAsync(cancellationToken);
-            if (meta != null)
-            {
-                var scanTasks = this.GetMetaScanTasks(meta);
-                var contexts = await Task.WhenAll(scanTasks);
-
-                var sortedContexts = contexts
-                    .Where(item => item.HttpElapsed != null)
-                    .OrderBy(item => item.Domain)
-                    .ThenBy(item => item.HttpElapsed);
-
-                using var fileStream = File.OpenWrite("github.txt");
-                using var fileWriter = new StreamWriter(fileStream);
-
-                foreach (var context in sortedContexts)
-                {
-                    var message = context.ToString();
-                    await fileWriter.WriteLineAsync(message);
-                }
-            }
-
-            this.logger.LogInformation("扫描结束");
-        }
-
-
-        private IEnumerable<Task<GithubContext>> GetMetaScanTasks(Meta meta)
-        {
-            foreach (var item in meta.ToDomainAddress())
-            {
-                var context = new GithubContext
-                {
-                    Domain = item.Domain,
-                    Address = item.Address,
-                };
-                yield return InvokeAsync(context);
-            }
-
-
-            async Task<GithubContext> InvokeAsync(GithubContext context)
-            {
-                await this.githubDelegate(context);
-                return context;
-            }
-        }
-    }
-}

FastGithub/IGithubScanBuilder.cs

@@ -5,7 +5,7 @@ namespace FastGithub
     /// <summary>
     /// 定义中间件管道创建者的接口
     /// </summary> 
-    interface IGithubBuilder
+    interface IGithubScanBuilder
     {
         /// <summary>
         /// 获取服务提供者
@@ -17,12 +17,12 @@ namespace FastGithub
         /// </summary>
         /// <param name="middleware">中间件</param>
         /// <returns></returns>
-        IGithubBuilder Use(Func<GithubDelegate, GithubDelegate> middleware);
+        IGithubScanBuilder Use(Func<GithubScanDelegate, GithubScanDelegate> middleware);
 
         /// <summary>
         /// 创建所有中间件执行处理者
         /// </summary>
         /// <returns></returns>
-        GithubDelegate Build();
+        GithubScanDelegate Build();
     }
 }

FastGithub/IGithubScanMiddleware.cs

@@ -6,7 +6,7 @@ namespace FastGithub
     /// <summary>
     /// 定义中间件的接口
     /// </summary> 
-    interface IGithubMiddleware
+    interface IGithubScanMiddleware
     {
         /// <summary>
         /// 执行中间件

FastGithub/Meta.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Sockets;
 using System.Text.Json.Serialization;
 
@@ -37,7 +36,7 @@ namespace FastGithub
         public string[] Dependabot { get; set; } = Array.Empty<string>();
 
 
-        public IEnumerable<DomainAddress> ToDomainAddress()
+        public IEnumerable<GithubContext> ToGithubContexts()
         {
             foreach (var range in IPRange.From(this.Web).OrderBy(item => item.Size))
             {
@@ -45,7 +44,7 @@ namespace FastGithub
                 {
                     foreach (var address in range)
                     {
-                        yield return new DomainAddress("github.com", address);
+                        yield return new GithubContext("github.com", address);
                     }
                 }
             }
@@ -56,12 +55,10 @@ namespace FastGithub
                 {
                     foreach (var address in range)
                     {
-                        yield return new DomainAddress("api.github.com", address);
+                        yield return new GithubContext("api.github.com", address);
                     }
                 }
             }
-        }
+        } 
-
-        public record DomainAddress(string Domain, IPAddress Address);
     }
 }

FastGithub/Middlewares/ConcurrentMiddleware.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 
 namespace FastGithub.Middlewares
 {
-    sealed class ConcurrentMiddleware : IGithubMiddleware
+    sealed class ConcurrentMiddleware : IGithubScanMiddleware
     {
         private readonly SemaphoreSlim semaphoreSlim = new(Environment.ProcessorCount * 4);
 

FastGithub/Middlewares/HttpsScanMiddleware.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace FastGithub.Middlewares
 {
-    sealed class HttpsScanMiddleware : IGithubMiddleware
+    sealed class HttpsScanMiddleware : IGithubScanMiddleware
     {
         private readonly IOptionsMonitor<GithubOptions> options;
         private readonly ILogger<HttpsScanMiddleware> logger;
@@ -50,11 +50,11 @@ namespace FastGithub.Middlewares
             }
             catch (TaskCanceledException)
             {
-                this.logger.LogInformation($"{context.Domain} {context.Address}连接超时");
+                this.logger.LogTrace($"{context.Domain} {context.Address}连接超时");
             }
             catch (Exception ex)
             {
-                this.logger.LogInformation($"{context.Domain} {context.Address} {ex.Message}");
+                this.logger.LogTrace($"{context.Domain} {context.Address} {ex.Message}");
             }
         }
     }

FastGithub/Middlewares/PortScanMiddleware.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace FastGithub.Middlewares
 {
-    sealed class PortScanMiddleware : IGithubMiddleware
+    sealed class PortScanMiddleware : IGithubScanMiddleware
     {
         private const int PORT = 443;
         private readonly IOptionsMonitor<GithubOptions> options;
@@ -33,7 +33,7 @@ namespace FastGithub.Middlewares
             }
             catch (Exception)
             {
-                this.logger.LogInformation($"{context.Domain} {context.Address}的{PORT}端口未开放");
+                this.logger.LogTrace($"{context.Domain} {context.Address}的{PORT}端口未开放");
             }
         }
     }

FastGithub/Middlewares/ScanOkLogMiddleware.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 
 namespace FastGithub.Middlewares
 {
-    sealed class ScanOkLogMiddleware : IGithubMiddleware
+    sealed class ScanOkLogMiddleware : IGithubScanMiddleware
     {
         private readonly ILogger<ScanOkLogMiddleware> logger;
 
@@ -17,7 +17,7 @@ namespace FastGithub.Middlewares
         {
             if (context.HttpElapsed != null)
             {
-                this.logger.LogWarning(context.ToString());
+                this.logger.LogInformation(context.ToString());
             }
 
             return next();

FastGithub/Program.cs

@@ -28,10 +28,11 @@ namespace FastGithub
                 .ConfigureServices((ctx, services) =>
                 {
                     services
+                        .Configure<DnsOptions>(ctx.Configuration.GetSection("Dns"))
                         .Configure<GithubOptions>(ctx.Configuration.GetSection("Github"))
                         .AddHttpClient()
-                        .AddTransient<GithubMetaService>()
+                        .AddSingleton<GithubMetaService>()
-                        .AddTransient<GithubService>()
+                        .AddSingleton<GithubScanService>()
 
                         .AddSingleton<PortScanMiddleware>()
                         .AddSingleton<HttpsScanMiddleware>()
@@ -39,14 +40,16 @@ namespace FastGithub
                         .AddSingleton<ScanOkLogMiddleware>()
                         .AddSingleton(serviceProvider =>
                         {
-                            return new GithubBuilder(serviceProvider, ctx => Task.CompletedTask)
+                            return new GithubScanBuilder(serviceProvider, ctx => Task.CompletedTask)
                                 .Use<ConcurrentMiddleware>()
                                 .Use<PortScanMiddleware>()
                                 .Use<HttpsScanMiddleware>()
                                 .Use<ScanOkLogMiddleware>()
                                 .Build();
                         })
-                        .AddHostedService<GithubHostedService>()
+                        .AddHostedService<DnsHostedService>()
+                        .AddHostedService<GithubScanAllHostedService>()
+                        .AddHostedService<GithubScanResultHostedService>()
                         ;
                 });
 

FastGithub/appsettings.json

@@ -1,12 +1,17 @@
 {
+  "Dns": {
+    "UpStream": "114.114.114.114"
+  },
   "Github": {
+    "ScanAllInterval": "12:00:00", // 完整扫描时间间隔
+    "ScanResultInterval": "00:05:00", // 结果扫描时间间隔
     "MetaUri": "https://gitee.com/jiulang/fast-github/raw/master/FastGithub/meta.json", // ip资源文件uri    
     "PortScanTimeout": "00:00:01", // 端口扫描超时时间
     "HttpsScanTimeout": "00:00:05" // https扫描超时时间
   },
   "Logging": {
     "LogLevel": {
-      "Default": "Warning",
+      "Default": "Information",
       "System": "Warning",
       "Microsoft": "Warning"
     }