fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-30 21:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

DnsWebService: fixed string comparison issue caused with certain system locale. removed blocked zone check at CustomBlockZone() since it hinders adding zone which alreay has sub zone in block zone.

Browse Source
This commit is contained in:
Shreyas Zare
2019-05-01 19:40:03 +05:30
parent b4a85ae2dd
commit 2f92daa178
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DnsServerCore/DnsWebService.cs
View File

@@ -1088,7 +1088,7 @@ namespace DnsServerCore
DnsResourceRecord soaRecord = soaResourceRecords[0];
DnsSOARecord soaRecordData = soaRecord.RDATA as DnsSOARecord;
if (soaRecordData.MasterNameServer.Equals(oldServerDomain, StringComparison.CurrentCultureIgnoreCase))
if (soaRecordData.MasterNameServer.Equals(oldServerDomain, StringComparison.OrdinalIgnoreCase))
{
string responsiblePerson = soaRecordData.ResponsiblePerson;
if (responsiblePerson.EndsWith(oldServerDomain))
@@ -1101,7 +1101,7 @@ namespace DnsServerCore
foreach (DnsResourceRecord nsResourceRecord in nsResourceRecords)
{
if ((nsResourceRecord.RDATA as DnsNSRecord).NSDomainName.Equals(oldServerDomain, StringComparison.CurrentCultureIgnoreCase))
if ((nsResourceRecord.RDATA as DnsNSRecord).NSDomainName.Equals(oldServerDomain, StringComparison.OrdinalIgnoreCase))
_dnsServer.AuthoritativeZoneRoot.UpdateRecord(nsResourceRecord, new DnsResourceRecord(nsResourceRecord.Name, nsResourceRecord.Type, nsResourceRecord.Class, nsResourceRecord.TtlValue, new DnsNSRecord(strServerDomain)));
}
@@ -2016,9 +2016,6 @@ namespace DnsServerCore
if (IPAddress.TryParse(domain, out IPAddress ipAddress))
domain = (new DnsQuestionRecord(ipAddress, DnsClass.IN)).Name;
if (_dnsServer.BlockedZoneRoot.ZoneExists(domain))
throw new DnsWebServiceException("Domain '" + domain + "' already exists in blocked zone.");
BlockZone(domain, _customBlockedZoneRoot, "custom");
BlockZone(domain, _dnsServer.BlockedZoneRoot, "custom");
@@ -2769,7 +2766,7 @@ namespace DnsServerCore
foreach (DnsResourceRecord record in dnsResponse.Answer)
{
if (record.Name.Equals(domain, StringComparison.CurrentCultureIgnoreCase))
if (record.Name.Equals(domain, StringComparison.OrdinalIgnoreCase))
{
recordsToSet.Add(record);
@@ -2784,7 +2781,7 @@ namespace DnsServerCore
foreach (Zone.ZoneInfo zone in _dnsServer.AuthoritativeZoneRoot.ListAuthoritativeZones())
{
if (domain.EndsWith(zone.ZoneName, StringComparison.CurrentCultureIgnoreCase))
if (domain.EndsWith(zone.ZoneName, StringComparison.OrdinalIgnoreCase))
{
SOARecordExists = true;
break;
@@ -2840,7 +2837,7 @@ namespace DnsServerCore
string logFile = Path.Combine(_log.LogFolder, log + ".log");
if (_log.CurrentLogFile.Equals(logFile, StringComparison.CurrentCultureIgnoreCase))
if (_log.CurrentLogFile.Equals(logFile, StringComparison.OrdinalIgnoreCase))
_log.DeleteCurrentLogFile();
else
File.Delete(logFile);