fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-07 09:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

GeoContinentApp: refactored and fixed ECS implementation.

Browse Source
This commit is contained in:
Shreyas Zare
2022-11-20 15:23:18 +05:30
parent 58ca4dd789
commit a02458212f
2 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Apps/GeoContinentApp/Address.cs
View File

@@ -85,27 +85,16 @@ namespace GeoContinent
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonContinent = null;
EDnsClientSubnetOptionData clientSubnet = null;
if (request.EDNS is not null)
bool ecsUsed = false;
EDnsClientSubnetOptionData requestECS = request.GetEDnsClientSubnetOption();
if (requestECS is not null)
{
foreach (EDnsOption option in request.EDNS.Options)
if (_maxMind.DatabaseReader.TryCountry(requestECS.Address, out CountryResponse csResponse))
{
if (option.Code == EDnsOptionCode.EDNS_CLIENT_SUBNET)
{
EDnsClientSubnetOptionData cs = option.Data as EDnsClientSubnetOptionData;
if (_maxMind.DatabaseReader.TryCountry(cs.Address, out CountryResponse csResponse))
{
jsonContinent = jsonAppRecordData[csResponse.Continent.Code];
if (jsonContinent is null)
jsonContinent = jsonAppRecordData["default"];
else
clientSubnet = cs;
}
break;
}
ecsUsed = true;
jsonContinent = jsonAppRecordData[csResponse.Continent.Code];
if (jsonContinent is null)
jsonContinent = jsonAppRecordData["default"];
}
}
@@ -157,14 +146,18 @@ namespace GeoContinent
if (answers.Count > 1)
answers.Shuffle();
EDnsOption[] options = null;
EDnsOption[] options;
if (clientSubnet is not null)
if (requestECS is null)
{
options = new EDnsOption[]
{
new EDnsOption(EDnsOptionCode.EDNS_CLIENT_SUBNET, new EDnsClientSubnetOptionData(clientSubnet.SourcePrefixLength, clientSubnet.SourcePrefixLength, clientSubnet.Address))
};
options = null;
}
else
{
if (ecsUsed)
options = EDnsClientSubnetOptionData.GetEDnsClientSubnetOption(requestECS.SourcePrefixLength, requestECS.SourcePrefixLength, requestECS.Address);
else
options = EDnsClientSubnetOptionData.GetEDnsClientSubnetOption(requestECS.SourcePrefixLength, 0, requestECS.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));

43
Apps/GeoContinentApp/CNAME.cs
View File

@@ -79,27 +79,16 @@ namespace GeoContinent
dynamic jsonAppRecordData = JsonConvert.DeserializeObject(appRecordData);
dynamic jsonContinent = null;
EDnsClientSubnetOptionData clientSubnet = null;
if (request.EDNS is not null)
bool ecsUsed = false;
EDnsClientSubnetOptionData requestECS = request.GetEDnsClientSubnetOption();
if (requestECS is not null)
{
foreach (EDnsOption option in request.EDNS.Options)
if (_maxMind.DatabaseReader.TryCountry(requestECS.Address, out CountryResponse csResponse))
{
if (option.Code == EDnsOptionCode.EDNS_CLIENT_SUBNET)
{
EDnsClientSubnetOptionData cs = option.Data as EDnsClientSubnetOptionData;
if (_maxMind.DatabaseReader.TryCountry(cs.Address, out CountryResponse csResponse))
{
jsonContinent = jsonAppRecordData[csResponse.Continent.Code];
if (jsonContinent is null)
jsonContinent = jsonAppRecordData["default"];
else
clientSubnet = cs;
}
break;
}
ecsUsed = true;
jsonContinent = jsonAppRecordData[csResponse.Continent.Code];
if (jsonContinent is null)
jsonContinent = jsonAppRecordData["default"];
}
}
@@ -131,14 +120,18 @@ namespace GeoContinent
else
answers = new DnsResourceRecord[] { new DnsResourceRecord(request.Question[0].Name, DnsResourceRecordType.CNAME, DnsClass.IN, appRecordTtl, new DnsCNAMERecordData(cname)) };
EDnsOption[] options = null;
EDnsOption[] options;
if (clientSubnet is not null)
if (requestECS is null)
{
options = new EDnsOption[]
{
new EDnsOption(EDnsOptionCode.EDNS_CLIENT_SUBNET, new EDnsClientSubnetOptionData(clientSubnet.SourcePrefixLength, clientSubnet.SourcePrefixLength, clientSubnet.Address))
};
options = null;
}
else
{
if (ecsUsed)
options = EDnsClientSubnetOptionData.GetEDnsClientSubnetOption(requestECS.SourcePrefixLength, requestECS.SourcePrefixLength, requestECS.Address);
else
options = EDnsClientSubnetOptionData.GetEDnsClientSubnetOption(requestECS.SourcePrefixLength, 0, requestECS.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));