Updated dnscrypt-proxy settings for 2.0.42

bitbeans · Apr 11, 2020 · 191d75f · 191d75f
1 parent 4b77f98
commit 191d75f
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/SimpleDnsCrypt/Helper/PatchHelper.cs b/SimpleDnsCrypt/Helper/PatchHelper.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using SimpleDnsCrypt.Config;
 using SimpleDnsCrypt.Models;
 
 namespace SimpleDnsCrypt.Helper
@@ -60,8 +62,14 @@ public static bool Patch()
 			if (version.Equals("0.7.1"))
 			{
 				//changed: ignore_system_dns = true
+				//changed: block_unqualified = true
+				//changed: block_undelegated = true
 				//added: broken_implementations
+				//added: fallback_resolvers (instead of fallback_resolver)
 				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.ignore_system_dns = true;
+				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.block_unqualified = true;
+				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.block_undelegated = true;
+				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.fallback_resolvers = new ObservableCollection<string>(Global.DefaultFallbackResolvers);
 				var sources = DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.sources;
 				if (!sources.ContainsKey("relays"))
 				{
@@ -79,7 +87,12 @@ public static bool Patch()
 				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.broken_implementations =
 					new BrokenImplementations
 					{
-						broken_query_padding = new List<string> { "cisco", "cisco-ipv6", "cisco-familyshield" }
+						//broken_query_padding = new List<string> { "cisco", "cisco-ipv6", "cisco-familyshield" },
+						fragments_blocked = new List<string> { "cisco", "cisco-ipv6", "cisco-familyshield", 
+							"cisco-familyshield-ipv6", "quad9-dnscrypt-ip4-filter-alt", "quad9-dnscrypt-ip4-filter-pri", 
+							"quad9-dnscrypt-ip4-nofilter-alt", "quad9-dnscrypt-ip4-nofilter-pri", "quad9-dnscrypt-ip6-filter-alt", 
+							"quad9-dnscrypt-ip6-filter-pri", "quad9-dnscrypt-ip6-nofilter-alt", "quad9-dnscrypt-ip6-nofilter-pri", 
+							"cleanbrowsing-adult", "cleanbrowsing-family-ipv6", "cleanbrowsing-family", "cleanbrowsing-security" }
 					};
 				return DnscryptProxyConfigurationManager.SaveConfiguration();
 			}

diff --git a/SimpleDnsCrypt/Models/DnscryptProxyConfiguration.cs b/SimpleDnsCrypt/Models/DnscryptProxyConfiguration.cs
@@ -789,6 +789,7 @@ public class AnonymizedDns : PropertyChangedBase
 		}
 
 		private List<Route> _routes;
+		private bool _skip_incompatible;
 
 		public List<Route> routes
 		{
@@ -799,6 +800,19 @@ public List<Route> routes
 				NotifyOfPropertyChange(() => _routes);
 			}
 		}
+
+		/// <summary>
+		/// skip resolvers incompatible with anonymization instead of using them directly.
+		/// </summary>
+		public bool skip_incompatible
+		{
+			get => _skip_incompatible;
+			set
+			{
+				_skip_incompatible = value;
+				NotifyOfPropertyChange(() => skip_incompatible);
+			}
+		}
 	}
 
 	public class BrokenImplementations : PropertyChangedBase
@@ -811,6 +825,7 @@ public class BrokenImplementations : PropertyChangedBase
 		}
 
 		private List<string> _broken_query_padding;
+		private List<string> _fragments_blocked;
 
 		public List<string> broken_query_padding
 		{
@@ -821,6 +836,16 @@ public List<string> broken_query_padding
 				NotifyOfPropertyChange(() => broken_query_padding);
 			}
 		}
+
+		public List<string> fragments_blocked
+		{
+			get => _fragments_blocked;
+			set
+			{
+				_fragments_blocked = value;
+				NotifyOfPropertyChange(() => fragments_blocked);
+			}
+		}
 	}
 
 	public class Route : PropertyChangedBase

diff --git a/SimpleDnsCrypt/SimpleDnsCrypt.csproj b/SimpleDnsCrypt/SimpleDnsCrypt.csproj
@@ -526,6 +526,9 @@
     <PackageReference Include="helper-net">
       <Version>0.2.0</Version>
     </PackageReference>
+    <PackageReference Include="libsodium-net">
+      <Version>0.10.0</Version>
+    </PackageReference>
     <PackageReference Include="MahApps.Metro">
       <Version>1.6.5</Version>
     </PackageReference>

diff --git a/SimpleDnsCrypt/ViewModels/MainViewModel.cs b/SimpleDnsCrypt/ViewModels/MainViewModel.cs
@@ -413,7 +413,6 @@ public void OnClose(CancelEventArgs cancelEventArgs)
 			}
 		}
 
-
 
 		/// <summary>
 		///     The title of the window.

diff --git a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -40,9 +40,10 @@ format = 'ltsv'
 [ip_blacklist]
 
 [broken_implementations]
-broken_query_padding = ['cisco', 'cisco-ipv6', 'cisco-familyshield']
+fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familyshield-ipv6', 'quad9-dnscrypt-ip4-filter-alt', 'quad9-dnscrypt-ip4-filter-pri', 'quad9-dnscrypt-ip4-nofilter-alt', 'quad9-dnscrypt-ip4-nofilter-pri', 'quad9-dnscrypt-ip6-filter-alt', 'quad9-dnscrypt-ip6-filter-pri', 'quad9-dnscrypt-ip6-nofilter-alt', 'quad9-dnscrypt-ip6-nofilter-pri', 'cleanbrowsing-adult', 'cleanbrowsing-family-ipv6', 'cleanbrowsing-family', 'cleanbrowsing-security']
 
 [anonymized_dns]
+skip_incompatible = false
 
 [sources]
 

diff --git a/img/preview/querylog.png b/img/preview/querylog.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -413,7 +413,6 @@ public void OnClose(CancelEventArgs cancelEventArgs) @@
     			}
     		}
     		/// <summary>
     		///     The title of the window.
@@ Expand Down @@