Skip to content

Commit 9a1b674

Browse files
committed
Updated dnscrypt-proxy to 2.0.33
1 parent 1a85639 commit 9a1b674

5 files changed

Lines changed: 74 additions & 17 deletions

File tree

16.5 KB
Binary file not shown.
15.5 KB
Binary file not shown.

SimpleDnsCrypt/Helper/PatchHelper.cs

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
namespace SimpleDnsCrypt.Helper
1+
using System.Collections.Generic;
2+
using SimpleDnsCrypt.Models;
3+
4+
namespace SimpleDnsCrypt.Helper
25
{
36
/// <summary>
47
/// Class to update the configuration file.
@@ -44,7 +47,7 @@ public static bool Patch()
4447
{
4548
sources.Add("relays", new Models.Source
4649
{
47-
urls = new string[] { "https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md", "https://download.dnscrypt.info/resolvers-list/v2/relays.md" },
50+
urls = new[] { "https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md", "https://download.dnscrypt.info/resolvers-list/v2/relays.md" },
4851
cache_file = "relays.md",
4952
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3",
5053
refresh_delay = 72,
@@ -54,6 +57,33 @@ public static bool Patch()
5457
}
5558
return DnscryptProxyConfigurationManager.SaveConfiguration();
5659
}
60+
if (version.Equals("0.7.1"))
61+
{
62+
//changed: ignore_system_dns = true
63+
//added: broken_implementations
64+
DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.ignore_system_dns = true;
65+
var sources = DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.sources;
66+
if (!sources.ContainsKey("relays"))
67+
{
68+
sources.Add("relays", new Models.Source
69+
{
70+
urls = new[] { "https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md", "https://download.dnscrypt.info/resolvers-list/v2/relays.md" },
71+
cache_file = "relays.md",
72+
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3",
73+
refresh_delay = 72,
74+
prefix = ""
75+
});
76+
DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.sources = sources;
77+
}
78+
79+
DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.broken_implementations =
80+
new BrokenImplementations
81+
{
82+
broken_query_padding = new List<string> { "cisco", "cisco-ipv6", "cisco-familyshield" }
83+
};
84+
return DnscryptProxyConfigurationManager.SaveConfiguration();
85+
}
86+
5787
return false;
5888
}
5989
}

SimpleDnsCrypt/Models/DnscryptProxyConfiguration.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class DnscryptProxyConfiguration : PropertyChangedBase
5959
private ObservableCollection<string> _disabled_server_names;
6060
private string _blocked_query_response;
6161

62+
6263
[TomlIgnore]
6364
public new bool IsNotifying
6465
{
@@ -716,6 +717,8 @@ public int cache_neg_max_ttl
716717

717718
public AnonymizedDns anonymized_dns { get; set; }
718719

720+
public BrokenImplementations broken_implementations { get; set; }
721+
719722
/// <summary>
720723
/// </summary>
721724
public Dictionary<string, Source> sources
@@ -764,6 +767,27 @@ public List<Route> routes
764767
}
765768
}
766769

770+
public class BrokenImplementations : PropertyChangedBase
771+
{
772+
[TomlIgnore]
773+
public new bool IsNotifying
774+
{
775+
get => base.IsNotifying;
776+
set => base.IsNotifying = value;
777+
}
778+
779+
private List<string> _broken_query_padding;
780+
781+
public List<string> broken_query_padding
782+
{
783+
get => _broken_query_padding;
784+
set
785+
{
786+
_broken_query_padding = value;
787+
NotifyOfPropertyChange(() => broken_query_padding);
788+
}
789+
}
790+
}
767791

768792
public class Route : PropertyChangedBase
769793
{

SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ timeout = 5000
1212
keepalive = 30
1313
cert_refresh_delay = 240
1414
fallback_resolver = '9.9.9.9:53'
15-
ignore_system_dns = false
15+
ignore_system_dns = true
1616
netprobe_timeout = 60
1717
netprobe_address = '9.9.9.9:53'
1818
log_files_max_size = 10
@@ -28,28 +28,31 @@ cache_neg_min_ttl = 60
2828
cache_neg_max_ttl = 600
2929
disabled_server_names = []
3030
[query_log]
31-
format = 'ltsv'
31+
format = 'ltsv'
3232

3333
[nx_log]
34-
format = 'ltsv'
34+
format = 'ltsv'
3535

3636
[blacklist]
3737

3838
[ip_blacklist]
3939

40+
[broken_implementations]
41+
broken_query_padding = ['cisco', 'cisco-ipv6', 'cisco-familyshield']
42+
4043
[anonymized_dns]
4144

4245
[sources]
4346

44-
[sources.'public-resolvers']
45-
urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
46-
cache_file = 'public-resolvers.md'
47-
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
48-
prefix = ''
49-
50-
[sources.'relays']
51-
urls = ['https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
52-
cache_file = 'relays.md'
53-
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
54-
refresh_delay = 72
55-
prefix = ''
47+
[sources.'public-resolvers']
48+
urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
49+
cache_file = 'public-resolvers.md'
50+
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
51+
prefix = ''
52+
53+
[sources.'relays']
54+
urls = ['https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
55+
cache_file = 'relays.md'
56+
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
57+
refresh_delay = 72
58+
prefix = ''

0 commit comments

Comments
 (0)