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

GeoCountryApp: updated implementation to support EDNS Client Subnet.

Browse Source
This commit is contained in:
Shreyas Zare
2022-11-12 17:07:11 +05:30
parent 0cf1daf5c9
commit a6efbb5c52
2 changed files with 100 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Apps/GeoCountryApp/Address.cs
View File

@@ -26,6 +26,7 @@ using System.Net.Sockets;
using System.Threading.Tasks;
using TechnitiumLibrary;
using TechnitiumLibrary.Net.Dns;
using TechnitiumLibrary.Net.Dns.EDnsOptions;
using TechnitiumLibrary.Net.Dns.ResourceRecords;
namespace GeoCountry
@@ -34,6 +35,7 @@ namespace GeoCountry
{
#region variables
IDnsServer _dnsServer;
MaxMind _maxMind;
#endregion
@@ -67,6 +69,7 @@ namespace GeoCountry
public Task InitializeAsync(IDnsServer dnsServer, string config)
{
_dnsServer = dnsServer;
_maxMind = MaxMind.Create(dnsServer);
return Task.CompletedTask;
@@ -80,20 +83,47 @@ namespace GeoCountry
case DnsResourceRecordType.A:
case DnsResourceRecordType.AAAA:
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonCountry;
dynamic jsonCountry = null;
if (_maxMind.DatabaseReader.TryCountry(remoteEP.Address, out CountryResponse response))
EDnsClientSubnetOptionData clientSubnet = null;
if (request.EDNS is not null)
{
jsonCountry = jsonAppRecordData[response.Country.IsoCode];
if (jsonCountry == null)
foreach (EDnsOption option in request.EDNS.Options)
{
if (option.Code == EDnsOptionCode.EDNS_CLIENT_SUBNET)
{
EDnsClientSubnetOptionData cs = option.Data as EDnsClientSubnetOptionData;
if (_maxMind.DatabaseReader.TryCountry(cs.Address, out CountryResponse csResponse))
{
jsonCountry = jsonAppRecordData[csResponse.Country.IsoCode];
if (jsonCountry is null)
jsonCountry = jsonAppRecordData["default"];
else
clientSubnet = cs;
}
break;
}
}
}
if (jsonCountry is null)
{
if (_maxMind.DatabaseReader.TryCountry(remoteEP.Address, out CountryResponse response))
{
jsonCountry = jsonAppRecordData[response.Country.IsoCode];
if (jsonCountry is null)
jsonCountry = jsonAppRecordData["default"];
}
else
{
jsonCountry = jsonAppRecordData["default"];
}
else
{
jsonCountry = jsonAppRecordData["default"];
}
}
if (jsonCountry == null)
if (jsonCountry is null)
return Task.FromResult<DnsDatagram>(null);
List<DnsResourceRecord> answers = new List<DnsResourceRecord>();
@@ -127,7 +157,17 @@ namespace GeoCountry
if (answers.Count > 1)
answers.Shuffle();
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers));
EDnsOption[] options = null;
if (clientSubnet is not null)
{
options = new EDnsOption[]
{
new EDnsOption(EDnsOptionCode.EDNS_CLIENT_SUBNET, new EDnsClientSubnetOptionData(clientSubnet.SourcePrefixLength, clientSubnet.SourcePrefixLength, clientSubnet.Address))
};
}
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers, null, null, _dnsServer.UdpPayloadSize, EDnsHeaderFlags.None, options));
default:
return Task.FromResult<DnsDatagram>(null);

60
Apps/GeoCountryApp/CNAME.cs
View File

@@ -25,6 +25,7 @@ using System.Collections.Generic;
using System.Net;
using System.Threading.Tasks;
using TechnitiumLibrary.Net.Dns;
using TechnitiumLibrary.Net.Dns.EDnsOptions;
using TechnitiumLibrary.Net.Dns.ResourceRecords;
namespace GeoCountry
@@ -33,6 +34,7 @@ namespace GeoCountry
{
#region variables
IDnsServer _dnsServer;
MaxMind _maxMind;
#endregion
@@ -66,6 +68,7 @@ namespace GeoCountry
public Task InitializeAsync(IDnsServer dnsServer, string config)
{
_dnsServer = dnsServer;
_maxMind = MaxMind.Create(dnsServer);
return Task.CompletedTask;
@@ -74,20 +77,47 @@ namespace GeoCountry
public Task<DnsDatagram> ProcessRequestAsync(DnsDatagram request, IPEndPoint remoteEP, DnsTransportProtocol protocol, bool isRecursionAllowed, string zoneName, string appRecordName, uint appRecordTtl, string appRecordData)
{
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonCountry;
dynamic jsonCountry = null;
if (_maxMind.DatabaseReader.TryCountry(remoteEP.Address, out CountryResponse response))
EDnsClientSubnetOptionData clientSubnet = null;
if (request.EDNS is not null)
{
jsonCountry = jsonAppRecordData[response.Country.IsoCode];
if (jsonCountry == null)
foreach (EDnsOption option in request.EDNS.Options)
{
if (option.Code == EDnsOptionCode.EDNS_CLIENT_SUBNET)
{
EDnsClientSubnetOptionData cs = option.Data as EDnsClientSubnetOptionData;
if (_maxMind.DatabaseReader.TryCountry(cs.Address, out CountryResponse csResponse))
{
jsonCountry = jsonAppRecordData[csResponse.Country.IsoCode];
if (jsonCountry is null)
jsonCountry = jsonAppRecordData["default"];
else
clientSubnet = cs;
}
break;
}
}
}
if (jsonCountry is null)
{
if (_maxMind.DatabaseReader.TryCountry(remoteEP.Address, out CountryResponse response))
{
jsonCountry = jsonAppRecordData[response.Country.IsoCode];
if (jsonCountry is null)
jsonCountry = jsonAppRecordData["default"];
}
else
{
jsonCountry = jsonAppRecordData["default"];
}
else
{
jsonCountry = jsonAppRecordData["default"];
}
}
if (jsonCountry == null)
if (jsonCountry is null)
return Task.FromResult<DnsDatagram>(null);
string cname = jsonCountry.Value;
@@ -101,7 +131,17 @@ namespace GeoCountry
else
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.CNAME, DnsClass.IN, appRecordTtl, new DnsCNAMERecordData(cname)) };
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers));
EDnsOption[] options = null;
if (clientSubnet is not null)
{
options = new EDnsOption[]
{
new EDnsOption(EDnsOptionCode.EDNS_CLIENT_SUBNET, new EDnsClientSubnetOptionData(clientSubnet.SourcePrefixLength, clientSubnet.SourcePrefixLength, clientSubnet.Address))
};
}
return Task.FromResult(new DnsDatagram(request.Identifier, true, request.OPCODE, true, false, request.RecursionDesired, isRecursionAllowed, false, false, DnsResponseCode.NoError, request.Question, answers, null, null, _dnsServer.UdpPayloadSize, EDnsHeaderFlags.None, options));
}
#endregion