Update for dnscrypt-proxy 2.1.0+ compatibility (bitbeans#558)

* Update config generation for dnscrypt-proxy 2.1.0+ * Update .NET SDK version * Fix AL1073 warning * Update toml for version 2.1.0 * Update dnscrypt-proxy * Remove legacy option * Further config updates for 2.1.0 * Update version * Automatically remove legacy config
Dola-Shuvi · Dec 30, 2021 · 46dcbb7 · 46dcbb7
1 parent bc47278
commit 46dcbb7
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 66 deletions.
diff --git a/SimpleDnsCrypt/App.config b/SimpleDnsCrypt/App.config
@@ -1,28 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="SimpleDnsCrypt.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="SimpleDnsCrypt.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
         <section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
     </configSections>
     <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <targets>
-        <target name="file" xsi:type="File"
-                layout="${longdate} ${logger} ${message}"
-                archiveEvery="Day"
-                maxArchiveFiles="1"
-                fileName="${basedir}/logs/${cached:${date:format=yyyy-MM-dd HH_mm_ss}}_${level}.log"
-                archiveFileName="${basedir}/logs/{#}.log"
-                archiveDateFormat="yyyy-MM-dd HH_mm_ss"
-                archiveNumbering="Date"/>
+        <target name="file" xsi:type="File" layout="${longdate} ${logger} ${message}" archiveEvery="Day" maxArchiveFiles="1" fileName="${basedir}/logs/${cached:${date:format=yyyy-MM-dd HH_mm_ss}}_${level}.log" archiveFileName="${basedir}/logs/{#}.log" archiveDateFormat="yyyy-MM-dd HH_mm_ss" archiveNumbering="Date"/>
       </targets>
       <rules>
-        <logger name="*" minlevel="Debug" writeTo="file" />
+        <logger name="*" minlevel="Debug" writeTo="file"/>
       </rules>
     </nlog>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
     <userSettings>
         <SimpleDnsCrypt.Properties.Settings>
@@ -45,7 +38,7 @@
                 <value>True</value>
             </setting>
             <setting name="PreferredLanguage" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="MinUpdateType" serializeAs="String">
                 <value>2</value>
@@ -54,16 +47,16 @@
                 <value>True</value>
             </setting>
             <setting name="DomainWhitelistRules" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="DomainBlacklistRules" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="DomainBlacklistFile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="QueryLogFile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="UpgradeRequired" serializeAs="String">
                 <value>True</value>
@@ -84,13 +77,13 @@
                 <value>True</value>
             </setting>
             <setting name="CloakingRulesFile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="IsCloakAndForwardTabVisible" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="ForwardingRulesFile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="WindowWidth" serializeAs="String">
                 <value>825</value>
@@ -100,4 +93,4 @@
             </setting>
         </SimpleDnsCrypt.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/SimpleDnsCrypt/DNSx64/dnscrypt-proxy.exe b/SimpleDnsCrypt/DNSx64/dnscrypt-proxy.exe
diff --git a/SimpleDnsCrypt/DNSx86/dnscrypt-proxy.exe b/SimpleDnsCrypt/DNSx86/dnscrypt-proxy.exe
diff --git a/SimpleDnsCrypt/Helper/PatchHelper.cs b/SimpleDnsCrypt/Helper/PatchHelper.cs
@@ -96,6 +96,19 @@ public static bool Patch()
 					};
 				return DnscryptProxyConfigurationManager.SaveConfiguration();
 			}
+			if (version.Equals("0.7.2"))
+			{
+				//removed: daemonize
+				var configFile = System.IO.Path.Combine(System.IO.Directory.GetCurrentDirectory(), Global.DnsCryptProxyFolder, Global.DnsCryptConfigurationFile);
+				if (!System.IO.File.Exists(configFile)) return false;
+				var settings = Nett.TomlSettings.Create(s => s.ConfigurePropertyMapping(m => m.UseTargetPropertySelector(standardSelectors => standardSelectors.IgnoreCase)));
+
+				Nett.TomlTable toml = Nett.Toml.ReadFile(configFile);
+				toml.Remove("daemonize");
+				DnscryptProxyConfigurationManager.DnscryptProxyConfiguration = Nett.Toml.ReadString<DnscryptProxyConfiguration>(toml.ToString(), settings);
+
+				return DnscryptProxyConfigurationManager.SaveConfiguration();
+			}
 
 			return false;
 		}

diff --git a/SimpleDnsCrypt/Models/DnscryptProxyConfiguration.cs b/SimpleDnsCrypt/Models/DnscryptProxyConfiguration.cs
@@ -228,11 +228,6 @@ public bool require_nofilter
 			}
 		}
 
-		/// <summary>
-		///     linux only.
-		/// </summary>
-		public bool daemonize { get; set; } = false;
-
 		/// <summary>
 		///     Always use TCP to connect to upstream servers.
 		/// </summary>
@@ -742,12 +737,12 @@ public int cache_neg_max_ttl
 		/// <summary>
 		///     Pattern-based blocking (blacklists).
 		/// </summary>
-		public Blacklist blacklist { get; set; }
+		public Blacklist blocked_names { get; set; }
 
 		/// <summary>
 		///     Pattern-based IP blocking (IP blacklists).
 		/// </summary>
-		public Blacklist ip_blacklist { get; set; }
+		public Blacklist blocked_ips { get; set; }
 
 		public AnonymizedDns anonymized_dns { get; set; }
 
@@ -986,7 +981,7 @@ public string file
 	public class Blacklist : PropertyChangedBase
 	{
 		private string _log_format;
-		private string _blacklist_file;
+		private string _blocked_names_file;
 		private string _log_file;
 
 		[TomlIgnore]
@@ -999,13 +994,13 @@ public class Blacklist : PropertyChangedBase
 		/// <summary>
 		///     Path to the file of blocking rules.
 		/// </summary>
-		public string blacklist_file
+		public string blocked_names_file
 		{
-			get => _blacklist_file;
+			get => _blocked_names_file;
 			set
 			{
-				_blacklist_file = value;
-				NotifyOfPropertyChange(() => blacklist_file);
+				_blocked_names_file = value;
+				NotifyOfPropertyChange(() => blocked_names_file);
 			}
 		}
 

diff --git a/SimpleDnsCrypt/Properties/AssemblyInfo.cs b/SimpleDnsCrypt/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly
 )]
-[assembly: AssemblyVersion("0.7.1")]
-[assembly: AssemblyFileVersion("0.7.1")]
+[assembly: AssemblyVersion("0.7.2")]
+[assembly: AssemblyFileVersion("0.7.2")]
diff --git a/SimpleDnsCrypt/Properties/Resources.Designer.cs b/SimpleDnsCrypt/Properties/Resources.Designer.cs
diff --git a/SimpleDnsCrypt/Properties/Settings.Designer.cs b/SimpleDnsCrypt/Properties/Settings.Designer.cs
diff --git a/SimpleDnsCrypt/Resources/Translation.Designer.cs b/SimpleDnsCrypt/Resources/Translation.Designer.cs
diff --git a/SimpleDnsCrypt/SimpleDnsCrypt.csproj b/SimpleDnsCrypt/SimpleDnsCrypt.csproj
@@ -8,13 +8,14 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>SimpleDnsCrypt</RootNamespace>
     <AssemblyName>SimpleDnsCrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -562,7 +563,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <TargetFrameworkSDKToolsDirectory Condition=" '$(PlatformTarget)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(PlatformTarget)\</TargetFrameworkSDKToolsDirectory>
+    <TargetFrameworkSDKToolsDirectory Condition=" '$(PlatformTarget)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)\</TargetFrameworkSDKToolsDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>copy "$(ProjectDir)DNS$(PlatformName)\*" "$(ProjectDir)$(OutDir)\dnscrypt-proxy\"</PostBuildEvent>

diff --git a/SimpleDnsCrypt/ViewModels/DomainBlacklistViewModel.cs b/SimpleDnsCrypt/ViewModels/DomainBlacklistViewModel.cs
@@ -132,26 +132,26 @@ private async void ManageDnsCryptBlacklist(DnscryptProxyConfiguration dnscryptPr
 					if (dnscryptProxyConfiguration == null) return;
 
 					var saveAndRestartService = false;
-					if (dnscryptProxyConfiguration.blacklist == null)
+					if (dnscryptProxyConfiguration.blocked_names == null)
 					{
-						dnscryptProxyConfiguration.blacklist = new Blacklist
+						dnscryptProxyConfiguration.blocked_names = new Blacklist
 						{
-							blacklist_file = _domainBlacklistFile,
+							blocked_names_file = _domainBlacklistFile,
 							log_format = defaultLogFormat
 						};
 						saveAndRestartService = true;
 					}
 
-					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blacklist.log_format) ||
-					    !dnscryptProxyConfiguration.blacklist.log_format.Equals(defaultLogFormat))
+					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blocked_names.log_format) ||
+					    !dnscryptProxyConfiguration.blocked_names.log_format.Equals(defaultLogFormat))
 					{
-						dnscryptProxyConfiguration.blacklist.log_format = defaultLogFormat;
+						dnscryptProxyConfiguration.blocked_names.log_format = defaultLogFormat;
 						saveAndRestartService = true;
 					}
 
-					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blacklist.blacklist_file))
+					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blocked_names.blocked_names_file))
 					{
-						dnscryptProxyConfiguration.blacklist.blacklist_file = _domainBlacklistFile;
+						dnscryptProxyConfiguration.blocked_names.blocked_names_file = _domainBlacklistFile;
 						saveAndRestartService = true;
 					}
 
@@ -196,7 +196,7 @@ private async void ManageDnsCryptBlacklist(DnscryptProxyConfiguration dnscryptPr
 				{
 					//disable blacklist again
 					_isBlacklistEnabled = false;
-					dnscryptProxyConfiguration.blacklist.blacklist_file = null;
+					dnscryptProxyConfiguration.blocked_names.blocked_names_file = null;
 					DnscryptProxyConfigurationManager.DnscryptProxyConfiguration = dnscryptProxyConfiguration;
 					DnscryptProxyConfigurationManager.SaveConfiguration();
 					if (DnsCryptProxyManager.IsDnsCryptProxyRunning())

diff --git a/SimpleDnsCrypt/ViewModels/DomainBlockLogViewModel.cs b/SimpleDnsCrypt/ViewModels/DomainBlockLogViewModel.cs
@@ -132,26 +132,26 @@ private async void DomainBlockLog(DnscryptProxyConfiguration dnscryptProxyConfig
 					if (dnscryptProxyConfiguration == null) return;
 
 					var saveAndRestartService = false;
-					if (dnscryptProxyConfiguration.blacklist == null)
+					if (dnscryptProxyConfiguration.blocked_names == null)
 					{
-						dnscryptProxyConfiguration.blacklist = new Blacklist
+						dnscryptProxyConfiguration.blocked_names = new Blacklist
 						{
 							log_file = Global.DomainBlockLogFileName,
 							log_format = defaultLogFormat
 						};
 						saveAndRestartService = true;
 					}
 
-					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blacklist.log_format) ||
-						!dnscryptProxyConfiguration.blacklist.log_format.Equals(defaultLogFormat))
+					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blocked_names.log_format) ||
+						!dnscryptProxyConfiguration.blocked_names.log_format.Equals(defaultLogFormat))
 					{
-						dnscryptProxyConfiguration.blacklist.log_format = defaultLogFormat;
+						dnscryptProxyConfiguration.blocked_names.log_format = defaultLogFormat;
 						saveAndRestartService = true;
 					}
 
-					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blacklist.log_file))
+					if (string.IsNullOrEmpty(dnscryptProxyConfiguration.blocked_names.log_file))
 					{
-						dnscryptProxyConfiguration.blacklist.log_file = Global.DomainBlockLogFileName;
+						dnscryptProxyConfiguration.blocked_names.log_file = Global.DomainBlockLogFileName;
 						saveAndRestartService = true;
 					}
 
@@ -187,7 +187,7 @@ private async void DomainBlockLog(DnscryptProxyConfiguration dnscryptProxyConfig
 					}
 
 					DomainBlockLogFile = Path.Combine(Directory.GetCurrentDirectory(), Global.DnsCryptProxyFolder,
-						dnscryptProxyConfiguration.blacklist.log_file);
+						dnscryptProxyConfiguration.blocked_names.log_file);
 
 					if (!string.IsNullOrEmpty(_domainBlockLogFile))
 					{
@@ -238,7 +238,7 @@ await Task.Run(() =>
 				{
 					//disable block log again
 					_isDomainBlockLogLogging = false;
-					dnscryptProxyConfiguration.blacklist.log_file = null;
+					dnscryptProxyConfiguration.blocked_names.log_file = null;
 					DnscryptProxyConfigurationManager.DnscryptProxyConfiguration = dnscryptProxyConfiguration;
 					DnscryptProxyConfigurationManager.SaveConfiguration();
 					if (DnsCryptProxyManager.IsDnsCryptProxyRunning())

diff --git a/SimpleDnsCrypt/ViewModels/MainViewModel.cs b/SimpleDnsCrypt/ViewModels/MainViewModel.cs
@@ -497,20 +497,20 @@ public void Initialize()
 				QueryLogViewModel.IsQueryLogLogging = true;
 			}
 
-			if (!string.IsNullOrEmpty(DnscryptProxyConfiguration?.blacklist?.log_file))
+			if (!string.IsNullOrEmpty(DnscryptProxyConfiguration?.blocked_names?.log_file))
 			{
-				if (!File.Exists(DnscryptProxyConfiguration.blacklist.log_file))
+				if (!File.Exists(DnscryptProxyConfiguration.blocked_names.log_file))
 				{
-					File.Create(DnscryptProxyConfiguration.blacklist.log_file).Dispose();
+					File.Create(DnscryptProxyConfiguration.blocked_names.log_file).Dispose();
 				}
 				DomainBlockLogViewModel.IsDomainBlockLogLogging = true;
 			}
 
-			if (!string.IsNullOrEmpty(DnscryptProxyConfiguration?.blacklist?.blacklist_file))
+			if (!string.IsNullOrEmpty(DnscryptProxyConfiguration?.blocked_names?.blocked_names_file))
 			{
-				if (!File.Exists(DnscryptProxyConfiguration.blacklist.blacklist_file))
+				if (!File.Exists(DnscryptProxyConfiguration.blocked_names.blocked_names_file))
 				{
-					File.Create(DnscryptProxyConfiguration.blacklist.blacklist_file).Dispose();
+					File.Create(DnscryptProxyConfiguration.blocked_names.blocked_names_file).Dispose();
 				}
 				DomainBlacklistViewModel.IsBlacklistEnabled = true;
 			}

diff --git a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -35,9 +35,9 @@ format = 'ltsv'
 [nx_log]
 format = 'ltsv'
 
-[blacklist]
+[blocked_names]
 
-[ip_blacklist]
+[blocked_ips]
 
 [broken_implementations]
 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']