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

DnsWebService: Added support query log export feature. Updated SelfSignedCertCheck to generate new self-signed cert automatically 1yr before current cert expires. Fixed issue in StopAsync() that caused null ref issue when saving config in dispose call.

Browse Source
This commit is contained in:
Shreyas Zare
2025-01-11 17:44:18 +05:30
parent 6c2adf6d04
commit 634df67bed
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DnsServerCore/DnsWebService.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2024 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2025 Shreyas Zare (shreyas@technitium.com)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -559,7 +559,7 @@ namespace DnsServerCore
//settings
_webService.MapGetAndPost("/api/settings/get", _settingsApi.GetDnsSettings);
_webService.MapGetAndPost("/api/settings/set", _settingsApi.SetDnsSettings);
_webService.MapGetAndPost("/api/settings/set", _settingsApi.SetDnsSettingsAsync);
_webService.MapGetAndPost("/api/settings/getTsigKeyNames", _settingsApi.GetTsigKeyNames);
_webService.MapGetAndPost("/api/settings/forceUpdateBlockLists", _settingsApi.ForceUpdateBlockLists);
_webService.MapGetAndPost("/api/settings/temporaryDisableBlocking", _settingsApi.TemporaryDisableBlocking);
@@ -604,6 +604,7 @@ namespace DnsServerCore
_webService.MapGetAndPost("/api/logs/delete", _logsApi.DeleteLog);
_webService.MapGetAndPost("/api/logs/deleteAll", _logsApi.DeleteAllLogs);
_webService.MapGetAndPost("/api/logs/query", _logsApi.QueryLogsAsync);
_webService.MapGetAndPost("/api/logs/export", _logsApi.ExportLogsAsync);
}
private Task WebServiceHttpsRedirectionMiddleware(HttpContext context, RequestDelegate next)
@@ -643,6 +644,7 @@ namespace DnsServerCore
case "/api/blocked/export":
case "/api/settings/backup":
case "/api/logs/download":
case "/api/logs/export":
{
if (!TryGetSession(context, out UserSession session))
throw new InvalidTokenWebServiceException("Invalid token or session expired.");
@@ -941,6 +943,15 @@ namespace DnsServerCore
try
{
LoadWebServiceTlsCertificate(selfSignedCertificateFilePath, null);
if (!generateNew)
{
if (_webServiceSslServerAuthenticationOptions.ServerCertificateContext.TargetCertificate.NotAfter < DateTime.UtcNow.AddYears(1))
{
_log.Write("Web Service TLS self signed certificate is nearing expiration and will be regenerated.");
SelfSignedCertCheck(true, throwException); //force generate new cert
}
}
}
catch (Exception ex)
{
@@ -2981,7 +2992,6 @@ namespace DnsServerCore
}
_log?.Write("DNS Server (v" + _currentVersion.ToString() + ") was stopped successfully.");
_dnsServer = null;
}
catch (Exception ex)
{