Further improvements to Ae.Dns.Console.

alanedwardes · Oct 5, 2020 · d9e0d7a · d9e0d7a
1 parent 1fa6093
commit d9e0d7a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 39 deletions.
diff --git a/misc/Ae.Dns.Console/Ae.Dns.Console.csproj b/misc/Ae.Dns.Console/Ae.Dns.Console.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.8" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
   </ItemGroup>
@@ -22,4 +22,10 @@
     <ProjectReference Include="..\..\src\Ae.Dns.Server\Ae.Dns.Server.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="config.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/misc/Ae.Dns.Console/DnsConfiguration.cs b/misc/Ae.Dns.Console/DnsConfiguration.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Ae.Dns.Console
+{
+    public sealed class DnsConfiguration
+    {
+        public Uri[] HttpsUpstreams { get; set; } = new Uri[0];
+        public string[] UdpUpstreams { get; set; } = new string[0];
+        public Uri[] RemoteBlocklists { get; set; } = new Uri[0];
+        public string[] AllowlistedDomains { get; set; } = new string[0];
+    }
+}
diff --git a/misc/Ae.Dns.Console/Program.cs b/misc/Ae.Dns.Console/Program.cs
@@ -7,62 +7,40 @@
 using Microsoft.Extensions.Logging;
 using Polly;
 using Serilog;
-using Serilog.Events;
 using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Runtime.Caching;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Ae.Dns.Console
 {
-    public sealed class DnsConfiguration
-    {
-        public Uri HttpClientResolver { get; set; } = new Uri("https://1.1.1.1/");
-        public Uri[] HttpsUpstreams { get; set; } = new Uri[0];
-        public string[] UdpUpstreams { get; set; } = new string[0];
-        public Uri[] RemoteBlocklists { get; set; } = new Uri[0];
-        public string[] AllowlistedDomains { get; set; } = new string[0];
-    }
-
     class Program
     {
         static void Main(string[] args) => DoWork(args).GetAwaiter().GetResult();
 
         private static async Task DoWork(string[] args)
         {
             var configuration = new ConfigurationBuilder()
+                .AddEnvironmentVariables()
                 .AddCommandLine(args)
+                .AddJsonFile("config.json", true)
                 .Build();
 
-            var dnsConfiguration = new DnsConfiguration();
-            configuration.Bind(dnsConfiguration);
-
-            const string staticDnsResolver = "StaticResolver";
-
             var logger = new LoggerConfiguration()
-                .MinimumLevel.Verbose()
-                .WriteTo.File("dns.log", LogEventLevel.Warning)
-                .WriteTo.Console()
+                .ReadFrom.Configuration(configuration)
                 .CreateLogger();
 
+            var dnsConfiguration = new DnsConfiguration();
+            configuration.Bind(dnsConfiguration);
+
             var services = new ServiceCollection();
             services.AddLogging(x => x.AddSerilog(logger));
 
-            services.AddHttpClient(staticDnsResolver, x => x.BaseAddress = dnsConfiguration.HttpClientResolver);
-
-            static DnsDelegatingHandler CreateDnsDelegatingHandler(IServiceProvider serviceProvider)
-            {
-                var httpClient = serviceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(staticDnsResolver);
-                return new DnsDelegatingHandler(new DnsHttpClient(httpClient));
-            }
-
             foreach (Uri httpsUpstream in dnsConfiguration.HttpsUpstreams)
             {
                 services.AddHttpClient<IDnsClient, DnsHttpClient>(x => x.BaseAddress = httpsUpstream)
-                        .AddHttpMessageHandler(CreateDnsDelegatingHandler)
                         .AddTransientHttpErrorPolicy(x => x.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))));
             }
 
@@ -72,24 +50,25 @@ static DnsDelegatingHandler CreateDnsDelegatingHandler(IServiceProvider serviceP
             }
 
             services.AddHttpClient<DnsRemoteSetFilter>()
-                    .AddHttpMessageHandler(CreateDnsDelegatingHandler)
                     .AddTransientHttpErrorPolicy(x => x.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt))));
 
             IServiceProvider provider = services.BuildServiceProvider();
 
+            var selfLogger = provider.GetRequiredService<ILogger<Program>>();
+
             var remoteFilter = provider.GetRequiredService<DnsRemoteSetFilter>();
 
+            selfLogger.LogInformation("Adding {RemoteBlocklistCount} remote blocklists", dnsConfiguration.RemoteBlocklists.Length);
+
             foreach (Uri remoteBlockList in dnsConfiguration.RemoteBlocklists)
             {
                 _ = remoteFilter.AddRemoteBlockList(remoteBlockList);
             }
 
-            var selfLogger = provider.GetRequiredService<ILogger<Program>>();
-
             var upstreams = provider.GetServices<IDnsClient>().ToArray();
             if (!upstreams.Any())
             {
-                throw new Exception("No upstream DNS servers specified");
+                throw new Exception("No upstream DNS servers specified - you must specify at least one");
             }
 
             selfLogger.LogInformation("Using {UpstreamCount} DNS upstreams", upstreams.Length);
@@ -98,6 +77,8 @@ static DnsDelegatingHandler CreateDnsDelegatingHandler(IServiceProvider serviceP
 
             IDnsClient cache = new DnsCachingClient(provider.GetRequiredService<ILogger<DnsCachingClient>>(), combinedDnsClient, new MemoryCache("dns"));
 
+            selfLogger.LogInformation("Adding {AllowListedDomains} domains to explicit allow list", dnsConfiguration.AllowlistedDomains.Length);
+
             var staticFilter = new DnsDelegateFilter(x => dnsConfiguration.AllowlistedDomains.Contains(x.Host));
 
             IDnsClient filter = new DnsFilterClient(provider.GetRequiredService<ILogger<DnsFilterClient>>(), new DnsCompositeOrFilter(remoteFilter, staticFilter), cache);

diff --git a/misc/Ae.Dns.Console/config.json b/misc/Ae.Dns.Console/config.json
@@ -0,0 +1,12 @@
+{
+    "serilog": {
+        "using": [ "Serilog.Sinks.Console" ],
+        "writeTo": [
+            { "name": "Console" }
+        ]
+    },
+    "httpsUpstreams": [
+        "https://dns.google/",
+        "https://cloudflare-dns.com/"
+    ]
+}
diff --git a/src/Ae.Dns.Client/Ae.Dns.Client.csproj b/src/Ae.Dns.Client/Ae.Dns.Client.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
     <PackageReference Include="System.Runtime.Caching" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/tests/Ae.Dns.Tests/Ae.Dns.Tests.csproj b/tests/Ae.Dns.Tests/Ae.Dns.Tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Moq" Version="4.14.6" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>