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

WebServiceSettingsApi: sorting tsig keys by key name. Updated SetDnsSettings() to use new TsigKey constructor for key auto generation.

Browse Source
This commit is contained in:
Shreyas Zare
2023-09-23 18:18:19 +05:30
parent 812fcb310e
commit 45483c3cdb
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
DnsServerCore/WebServiceSettingsApi.cs
View File

@@ -22,12 +22,12 @@ using DnsServerCore.Dns;
using Microsoft.AspNetCore.Http;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Security.Cryptography;
using System.Text;
using System.Text.Json;
using System.Threading;
@@ -44,8 +44,6 @@ namespace DnsServerCore
{
#region variables
readonly static RandomNumberGenerator _rng = RandomNumberGenerator.Create();
readonly DnsWebService _dnsWebService;
Timer _blockListUpdateTimer;
@@ -305,7 +303,7 @@ namespace DnsServerCore
if (_dnsWebService.DnsServer.TsigKeys is not null)
{
foreach (KeyValuePair<string, TsigKey> tsigKey in _dnsWebService.DnsServer.TsigKeys)
foreach (KeyValuePair<string, TsigKey> tsigKey in _dnsWebService.DnsServer.TsigKeys.ToImmutableSortedDictionary())
{
jsonWriter.WriteStartObject();
@@ -886,16 +884,9 @@ namespace DnsServerCore
string algorithmName = strTsigKeyParts[i + 2];
if (sharedSecret.Length == 0)
{
byte[] key = new byte[32];
_rng.GetBytes(key);
tsigKeys.Add(keyName, new TsigKey(keyName, Convert.ToBase64String(key), algorithmName));
}
tsigKeys.Add(keyName, new TsigKey(keyName, algorithmName));
else
{
tsigKeys.Add(keyName, new TsigKey(keyName, sharedSecret, algorithmName));
}
}
_dnsWebService.DnsServer.TsigKeys = tsigKeys;