diff --git a/FastGithub.Scanner/GithubDnsHttpHandler.cs b/FastGithub.Scanner/GithubDnsHttpHandler.cs deleted file mode 100644 index 69b2033..0000000 --- a/FastGithub.Scanner/GithubDnsHttpHandler.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using System; -using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; - -namespace FastGithub.Scanner -{ - /// - /// Github的dns解析的httpHandler - /// 使扫描索结果作为github的https请求的域名解析 - /// - [Service(ServiceLifetime.Transient)] - sealed class GithubDnsHttpHandler : DelegatingHandler - { - private readonly GithubScanResults scanResults; - - /// - /// Github的dns解析的httpHandler - /// - public GithubDnsHttpHandler(GithubScanResults scanResults) - { - this.scanResults = scanResults; - } - - /// - /// 发送消息 - /// - /// - /// - /// - protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - var uri = request.RequestUri; - if (uri != null && uri.HostNameType == UriHostNameType.Dns) - { - var address = this.scanResults.FindBestAddress(uri.Host); - if (address != null) - { - var builder = new UriBuilder(uri) - { - Scheme = Uri.UriSchemeHttp, - Host = address.ToString(), - Port = 443 - }; - request.RequestUri = builder.Uri; - request.Headers.Host = uri.Host; - } - } - - return await base.SendAsync(request, cancellationToken); - } - } -} diff --git a/FastGithub.Scanner/LookupProviders/IPAddressComProvider.cs b/FastGithub.Scanner/LookupProviders/IPAddressComProvider.cs index 82bb46d..9f158e8 100644 --- a/FastGithub.Scanner/LookupProviders/IPAddressComProvider.cs +++ b/FastGithub.Scanner/LookupProviders/IPAddressComProvider.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; +using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; @@ -86,13 +87,11 @@ namespace FastGithub.Scanner.LookupProviders /// private async Task> LookupAsync(HttpClient httpClient, string domain, CancellationToken cancellationToken) { - var keyValue = new KeyValuePair("host", domain); - var content = new FormUrlEncodedContent(Enumerable.Repeat(keyValue, 1)); using var request = new HttpRequestMessage { Method = HttpMethod.Post, RequestUri = lookupUri, - Content = content + Content = new StringContent($"host={domain}", Encoding.UTF8, "application/x-www-form-urlencoded") }; using var response = await httpClient.SendAsync(request, cancellationToken); diff --git a/FastGithub.Scanner/ScannerServiceCollectionExtensions.cs b/FastGithub.Scanner/ScannerServiceCollectionExtensions.cs index d8fa143..11f3c38 100644 --- a/FastGithub.Scanner/ScannerServiceCollectionExtensions.cs +++ b/FastGithub.Scanner/ScannerServiceCollectionExtensions.cs @@ -28,7 +28,6 @@ namespace FastGithub services .AddHttpClient(nameof(Scanner)) .SetHandlerLifetime(TimeSpan.FromMinutes(5d)) - .AddHttpMessageHandler() .ConfigureHttpClient(httpClient => { httpClient.Timeout = TimeSpan.FromSeconds(10d);