fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-06 16:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor code refactoring changes done.

Browse Source
This commit is contained in:
Shreyas Zare
2024-09-14 16:21:33 +05:30
parent 98df9d6e73
commit 278cf3d618
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Apps/AdvancedBlockingApp/App.cs
View File

@@ -998,7 +998,7 @@ namespace AdvancedBlocking
public bool IsZoneAllowed(string domain)
{
domain = domain.ToLower();
domain = domain.ToLowerInvariant();
//allowed, allow list zone, allowedRegex, regex allow list zone, adblock list zone
return IsZoneFound(_allowed, domain, out _) || IsZoneFound(_allowListZones, domain, out _, out _) || IsMatchFound(_allowedRegex, domain, out _) || IsMatchFound(_regexAllowListZones, domain, out _, out _) || App.IsZoneAllowed(_adBlockListZones, domain, out _, out _);
@@ -1006,7 +1006,7 @@ namespace AdvancedBlocking
public bool IsZoneBlocked(string domain, out string blockedDomain, out string blockedRegex, out UrlEntry listUrl)
{
domain = domain.ToLower();
domain = domain.ToLowerInvariant();
//blocked
if (IsZoneFound(_blocked, domain, out string foundZone1))
@@ -1132,7 +1132,7 @@ namespace AdvancedBlocking
_isRegexList = isRegexList;
_isAdblockList = isAdblockList;
_listFilePath = Path.Combine(Path.Combine(_dnsServer.ApplicationFolder, "blocklists"), Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(_listUrl.AbsoluteUri))).ToLower());
_listFilePath = Path.Combine(Path.Combine(_dnsServer.ApplicationFolder, "blocklists"), Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(_listUrl.AbsoluteUri))).ToLowerInvariant());
}
#endregion
@@ -1387,7 +1387,7 @@ namespace AdvancedBlocking
hostname = secondWord;
}
hostname = hostname.Trim('.').ToLower();
hostname = hostname.Trim('.').ToLowerInvariant();
switch (hostname)
{

10
Apps/AdvancedForwardingApp/App.cs
View File

@@ -81,9 +81,9 @@ namespace AdvancedForwarding
DnsForwarderRecordData forwarderRecord;
if (configProxyServer is null)
forwarderRecord = new DnsForwarderRecordData(protocol, forwarder, dnssecValidation, DnsForwarderRecordProxyType.DefaultProxy, null, 0, null, null);
forwarderRecord = new DnsForwarderRecordData(protocol, forwarder, dnssecValidation, DnsForwarderRecordProxyType.DefaultProxy, null, 0, null, null, 0);
else
forwarderRecord = new DnsForwarderRecordData(protocol, forwarder, dnssecValidation, configProxyServer.Type, configProxyServer.ProxyAddress, configProxyServer.ProxyPort, configProxyServer.ProxyUsername, configProxyServer.ProxyPassword);
forwarderRecord = new DnsForwarderRecordData(protocol, forwarder, dnssecValidation, configProxyServer.Type, configProxyServer.ProxyAddress, configProxyServer.ProxyPort, configProxyServer.ProxyUsername, configProxyServer.ProxyPassword, 0);
return forwarderRecord;
}
@@ -306,7 +306,7 @@ namespace AdvancedForwarding
public bool TryGetForwarderRecords(string domain, out IReadOnlyList<DnsForwarderRecordData> forwarderRecords)
{
domain = domain.ToLower();
domain = domain.ToLowerInvariant();
if ((_forwardings is not null) && (_forwardings.Count > 0) && Forwarding.TryGetForwarderRecords(domain, _forwardings, out forwarderRecords))
return true;
@@ -367,7 +367,7 @@ namespace AdvancedForwarding
_domainMap = jsonForwarding.ReadArrayAsMap("domains", delegate (JsonElement jsonDomain)
{
return new Tuple<string, object>(jsonDomain.GetString().ToLower(), null);
return new Tuple<string, object>(jsonDomain.GetString().ToLowerInvariant(), null);
});
}
@@ -384,7 +384,7 @@ namespace AdvancedForwarding
foreach (string domain in domains)
{
if (DnsClient.IsDomainNameValid(domain))
domainMap.TryAdd(domain.ToLower(), null);
domainMap.TryAdd(domain.ToLowerInvariant(), null);
}
_domainMap = domainMap;

4
Apps/DnsBlockListApp/App.cs
View File

@@ -731,7 +731,7 @@ namespace DnsBlockList
responseTXT = line;
if (DnsClient.IsDomainNameValid(domain))
domains.Enqueue(new BlockEntry<string>(domain.ToLower(), responseA, responseTXT));
domains.Enqueue(new BlockEntry<string>(domain.ToLowerInvariant(), responseA, responseTXT));
}
_blockListFileLastModified = File.GetLastWriteTimeUtc(fS.SafeFileHandle);
@@ -793,7 +793,7 @@ namespace DnsBlockList
public override bool IsBlocked(string domain, out string foundDomain, out IPAddress responseA, out string responseTXT)
{
if (IsDomainBlocked(domain.ToLower(), out BlockEntry<string> domainEntry))
if (IsDomainBlocked(domain.ToLowerInvariant(), out BlockEntry<string> domainEntry))
{
foundDomain = domainEntry.Key;
responseA = domainEntry.ResponseA is null ? _responseA : domainEntry.ResponseA;

2
Apps/FailoverApp/HealthService.cs
View File

@@ -391,7 +391,7 @@ namespace Failover
public HealthCheckResponse QueryStatus(string domain, DnsResourceRecordType type, string healthCheck, Uri healthCheckUrl, bool tryAdd)
{
domain = domain.ToLower();
domain = domain.ToLowerInvariant();
string healthMonitorKey = GetHealthMonitorKey(domain, type, healthCheck, healthCheckUrl);

2
Apps/FilterAaaaApp/App.cs
View File

@@ -30,7 +30,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
namespace FilterAaaa
{
public class App : IDnsApplication, IDnsPostProcessor
public sealed class App : IDnsApplication, IDnsPostProcessor
{
#region variables