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

code refactoring changes.

Browse Source
This commit is contained in:
Shreyas Zare
2022-12-24 17:15:06 +05:30
parent cecd7c1457
commit 2d5c5df0f1
7 changed files with 420 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
DnsServerCore/WebServiceAppsApi.cs
View File

@@ -86,16 +86,16 @@ namespace DnsServerCore
{
try
{
if (_dnsWebService.DnsServer.DnsApplicationManager.Applications.Count < 1)
if (_dnsWebService._dnsServer.DnsApplicationManager.Applications.Count < 1)
return;
_dnsWebService.Log.Write("DNS Server has started automatic update check for DNS Apps.");
_dnsWebService._log.Write("DNS Server has started automatic update check for DNS Apps.");
string storeAppsJsonData = await GetStoreAppsJsonData().WithTimeout(5000);
using JsonDocument jsonDocument = JsonDocument.Parse(storeAppsJsonData);
JsonElement jsonStoreAppsArray = jsonDocument.RootElement;
foreach (DnsApplication application in _dnsWebService.DnsServer.DnsApplicationManager.Applications.Values)
foreach (DnsApplication application in _dnsWebService._dnsServer.DnsApplicationManager.Applications.Values)
{
foreach (JsonElement jsonStoreApp in jsonStoreAppsArray.EnumerateArray())
{
@@ -111,7 +111,7 @@ namespace DnsServerCore
string strServerVersion = jsonVersion.GetProperty("serverVersion").GetString();
Version requiredServerVersion = new Version(strServerVersion);
if (_dnsWebService.ServerVersion < requiredServerVersion)
if (_dnsWebService._currentVersion < requiredServerVersion)
continue;
if ((lastServerVersion is not null) && (lastServerVersion > requiredServerVersion))
@@ -130,11 +130,11 @@ namespace DnsServerCore
{
await DownloadAndUpdateAppAsync(application.Name, url);
_dnsWebService.Log.Write("DNS application '" + application.Name + "' was automatically updated successfully from: " + url);
_dnsWebService._log.Write("DNS application '" + application.Name + "' was automatically updated successfully from: " + url);
}
catch (Exception ex)
{
_dnsWebService.Log.Write("Failed to automatically download and update DNS application '" + application.Name + "': " + ex.ToString());
_dnsWebService._log.Write("Failed to automatically download and update DNS application '" + application.Name + "': " + ex.ToString());
}
}
@@ -145,7 +145,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_dnsWebService.Log.Write(ex);
_dnsWebService._log.Write(ex);
}
});
@@ -167,8 +167,8 @@ namespace DnsServerCore
if ((_storeAppsJsonData == null) || (DateTime.UtcNow > _storeAppsJsonDataUpdatedOn.AddSeconds(STORE_APPS_JSON_DATA_CACHE_TIME_SECONDS)))
{
SocketsHttpHandler handler = new SocketsHttpHandler();
handler.Proxy = _dnsWebService.DnsServer.Proxy;
handler.UseProxy = _dnsWebService.DnsServer.Proxy is not null;
handler.Proxy = _dnsWebService._dnsServer.Proxy;
handler.UseProxy = _dnsWebService._dnsServer.Proxy is not null;
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
using (HttpClient http = new HttpClient(handler))
@@ -190,8 +190,8 @@ namespace DnsServerCore
{
//download to temp file
SocketsHttpHandler handler = new SocketsHttpHandler();
handler.Proxy = _dnsWebService.DnsServer.Proxy;
handler.UseProxy = _dnsWebService.DnsServer.Proxy is not null;
handler.Proxy = _dnsWebService._dnsServer.Proxy;
handler.UseProxy = _dnsWebService._dnsServer.Proxy is not null;
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
using (HttpClient http = new HttpClient(handler))
@@ -204,7 +204,7 @@ namespace DnsServerCore
//update app
fS.Position = 0;
return await _dnsWebService.DnsServer.DnsApplicationManager.UpdateApplicationAsync(applicationName, fS);
return await _dnsWebService._dnsServer.DnsApplicationManager.UpdateApplicationAsync(applicationName, fS);
}
}
finally
@@ -215,7 +215,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_dnsWebService.Log.Write(ex);
_dnsWebService._log.Write(ex);
}
}
}
@@ -245,7 +245,7 @@ namespace DnsServerCore
string strServerVersion = jsonVersion.GetProperty("serverVersion").GetString();
Version requiredServerVersion = new Version(strServerVersion);
if (_dnsWebService.ServerVersion < requiredServerVersion)
if (_dnsWebService._currentVersion < requiredServerVersion)
continue;
if ((lastServerVersion is not null) && (lastServerVersion > requiredServerVersion))
@@ -310,7 +310,7 @@ namespace DnsServerCore
public async Task ListInstalledAppsAsync(Utf8JsonWriter jsonWriter)
{
List<string> apps = new List<string>(_dnsWebService.DnsServer.DnsApplicationManager.Applications.Keys);
List<string> apps = new List<string>(_dnsWebService._dnsServer.DnsApplicationManager.Applications.Keys);
apps.Sort();
JsonDocument jsonDocument = null;
@@ -335,7 +335,7 @@ namespace DnsServerCore
foreach (string app in apps)
{
if (_dnsWebService.DnsServer.DnsApplicationManager.Applications.TryGetValue(app, out DnsApplication application))
if (_dnsWebService._dnsServer.DnsApplicationManager.Applications.TryGetValue(app, out DnsApplication application))
WriteAppAsJson(jsonWriter, application, jsonStoreAppsArray);
}
@@ -372,7 +372,7 @@ namespace DnsServerCore
string strServerVersion = jsonVersion.GetProperty("serverVersion").GetString();
Version requiredServerVersion = new Version(strServerVersion);
if (_dnsWebService.ServerVersion < requiredServerVersion)
if (_dnsWebService._currentVersion < requiredServerVersion)
continue;
if ((lastServerVersion is not null) && (lastServerVersion > requiredServerVersion))
@@ -397,7 +397,7 @@ namespace DnsServerCore
jsonWriter.WriteString("url", url);
jsonWriter.WriteString("size", size);
bool installed = _dnsWebService.DnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication installedApp);
bool installed = _dnsWebService._dnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication installedApp);
jsonWriter.WriteBoolean("installed", installed);
@@ -435,8 +435,8 @@ namespace DnsServerCore
{
//download to temp file
SocketsHttpHandler handler = new SocketsHttpHandler();
handler.Proxy = _dnsWebService.DnsServer.Proxy;
handler.UseProxy = _dnsWebService.DnsServer.Proxy is not null;
handler.Proxy = _dnsWebService._dnsServer.Proxy;
handler.UseProxy = _dnsWebService._dnsServer.Proxy is not null;
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
using (HttpClient http = new HttpClient(handler))
@@ -449,9 +449,9 @@ namespace DnsServerCore
//install app
fS.Position = 0;
DnsApplication application = await _dnsWebService.DnsServer.DnsApplicationManager.InstallApplicationAsync(name, fS);
DnsApplication application = await _dnsWebService._dnsServer.DnsApplicationManager.InstallApplicationAsync(name, fS);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was installed successfully from: " + url);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was installed successfully from: " + url);
jsonWriter.WritePropertyName("installedApp");
WriteAppAsJson(jsonWriter, application);
@@ -465,7 +465,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_dnsWebService.Log.Write(ex);
_dnsWebService._log.Write(ex);
}
}
}
@@ -487,7 +487,7 @@ namespace DnsServerCore
DnsApplication application = await DownloadAndUpdateAppAsync(name, url);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was updated successfully from: " + url);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was updated successfully from: " + url);
jsonWriter.WritePropertyName("updatedApp");
WriteAppAsJson(jsonWriter, application);
@@ -534,9 +534,9 @@ namespace DnsServerCore
//install app
fS.Position = 0;
DnsApplication application = await _dnsWebService.DnsServer.DnsApplicationManager.InstallApplicationAsync(name, fS);
DnsApplication application = await _dnsWebService._dnsServer.DnsApplicationManager.InstallApplicationAsync(name, fS);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was installed successfully.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was installed successfully.");
jsonWriter.WritePropertyName("installedApp");
WriteAppAsJson(jsonWriter, application);
@@ -550,7 +550,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_dnsWebService.Log.Write(ex);
_dnsWebService._log.Write(ex);
}
}
}
@@ -596,9 +596,9 @@ namespace DnsServerCore
//update app
fS.Position = 0;
DnsApplication application = await _dnsWebService.DnsServer.DnsApplicationManager.UpdateApplicationAsync(name, fS);
DnsApplication application = await _dnsWebService._dnsServer.DnsApplicationManager.UpdateApplicationAsync(name, fS);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was updated successfully.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was updated successfully.");
jsonWriter.WritePropertyName("updatedApp");
WriteAppAsJson(jsonWriter, application);
@@ -612,7 +612,7 @@ namespace DnsServerCore
}
catch (Exception ex)
{
_dnsWebService.Log.Write(ex);
_dnsWebService._log.Write(ex);
}
}
}
@@ -625,8 +625,8 @@ namespace DnsServerCore
name = name.Trim();
_dnsWebService.DnsServer.DnsApplicationManager.UninstallApplication(name);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was uninstalled successfully.");
_dnsWebService._dnsServer.DnsApplicationManager.UninstallApplication(name);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' was uninstalled successfully.");
}
public async Task GetAppConfigAsync(HttpListenerRequest request, Utf8JsonWriter jsonWriter)
@@ -637,7 +637,7 @@ namespace DnsServerCore
name = name.Trim();
if (!_dnsWebService.DnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
if (!_dnsWebService._dnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
throw new DnsWebServiceException("DNS application was not found: " + name);
string config = await application.GetConfigAsync();
@@ -653,7 +653,7 @@ namespace DnsServerCore
name = name.Trim();
if (!_dnsWebService.DnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
if (!_dnsWebService._dnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
throw new DnsWebServiceException("DNS application was not found: " + name);
string formRequest;
@@ -675,7 +675,7 @@ namespace DnsServerCore
await application.SetConfigAsync(config);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' app config was saved successfully.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DNS application '" + name + "' app config was saved successfully.");
return;
}
}

150
DnsServerCore/WebServiceAuthApi.cs
View File

@@ -66,8 +66,8 @@ namespace DnsServerCore
jsonWriter.WriteStartObject();
jsonWriter.WriteString("version", _dnsWebService.GetServerVersion());
jsonWriter.WriteString("dnsServerDomain", _dnsWebService.DnsServer.ServerDomain);
jsonWriter.WriteNumber("defaultRecordTtl", _dnsWebService.ZonesApi.DefaultRecordTtl);
jsonWriter.WriteString("dnsServerDomain", _dnsWebService._dnsServer.ServerDomain);
jsonWriter.WriteNumber("defaultRecordTtl", _dnsWebService._zonesApi.DefaultRecordTtl);
jsonWriter.WritePropertyName("permissions");
jsonWriter.WriteStartObject();
@@ -79,9 +79,9 @@ namespace DnsServerCore
jsonWriter.WritePropertyName(section.ToString());
jsonWriter.WriteStartObject();
jsonWriter.WriteBoolean("canView", _dnsWebService.AuthManager.IsPermitted(section, currentSession.User, PermissionFlag.View));
jsonWriter.WriteBoolean("canModify", _dnsWebService.AuthManager.IsPermitted(section, currentSession.User, PermissionFlag.Modify));
jsonWriter.WriteBoolean("canDelete", _dnsWebService.AuthManager.IsPermitted(section, currentSession.User, PermissionFlag.Delete));
jsonWriter.WriteBoolean("canView", _dnsWebService._authManager.IsPermitted(section, currentSession.User, PermissionFlag.View));
jsonWriter.WriteBoolean("canModify", _dnsWebService._authManager.IsPermitted(section, currentSession.User, PermissionFlag.Modify));
jsonWriter.WriteBoolean("canDelete", _dnsWebService._authManager.IsPermitted(section, currentSession.User, PermissionFlag.Delete));
jsonWriter.WriteEndObject();
}
@@ -125,7 +125,7 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("sessions");
jsonWriter.WriteStartArray();
List<UserSession> sessions = _dnsWebService.AuthManager.GetSessions(user);
List<UserSession> sessions = _dnsWebService._authManager.GetSessions(user);
sessions.Sort();
foreach (UserSession session in sessions)
@@ -136,7 +136,7 @@ namespace DnsServerCore
if (includeGroups)
{
List<Group> groups = new List<Group>(_dnsWebService.AuthManager.Groups);
List<Group> groups = new List<Group>(_dnsWebService._authManager.Groups);
groups.Sort();
jsonWriter.WritePropertyName("groups");
@@ -180,7 +180,7 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("members");
jsonWriter.WriteStartArray();
List<User> members = _dnsWebService.AuthManager.GetGroupMembers(group);
List<User> members = _dnsWebService._authManager.GetGroupMembers(group);
members.Sort();
foreach (User user in members)
@@ -191,7 +191,7 @@ namespace DnsServerCore
if (includeUsers)
{
List<User> users = new List<User>(_dnsWebService.AuthManager.Users);
List<User> users = new List<User>(_dnsWebService._authManager.Users);
users.Sort();
jsonWriter.WritePropertyName("users");
@@ -261,10 +261,10 @@ namespace DnsServerCore
if (includeUsersAndGroups)
{
List<User> users = new List<User>(_dnsWebService.AuthManager.Users);
List<User> users = new List<User>(_dnsWebService._authManager.Users);
users.Sort();
List<Group> groups = new List<Group>(_dnsWebService.AuthManager.Groups);
List<Group> groups = new List<Group>(_dnsWebService._authManager.Groups);
groups.Sort();
jsonWriter.WritePropertyName("users");
@@ -317,11 +317,11 @@ namespace DnsServerCore
IPEndPoint remoteEP = DnsWebService.GetRequestRemoteEndPoint(request);
UserSession session = await _dnsWebService.AuthManager.CreateSessionAsync(sessionType, strTokenName, strUsername, strPassword, remoteEP.Address, request.UserAgent);
UserSession session = await _dnsWebService._authManager.CreateSessionAsync(sessionType, strTokenName, strUsername, strPassword, remoteEP.Address, request.UserAgent);
_dnsWebService.Log.Write(remoteEP, "[" + session.User.Username + "] User logged in.");
_dnsWebService._log.Write(remoteEP, "[" + session.User.Username + "] User logged in.");
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteCurrentSessionDetails(jsonWriter, session, includeInfo);
}
@@ -332,12 +332,12 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strToken))
throw new DnsWebServiceException("Parameter 'token' missing.");
UserSession session = _dnsWebService.AuthManager.DeleteSession(strToken);
UserSession session = _dnsWebService._authManager.DeleteSession(strToken);
if (session is not null)
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User logged out.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User logged out.");
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
}
}
@@ -362,9 +362,9 @@ namespace DnsServerCore
session.User.ChangePassword(strPassword);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Password was changed successfully.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Password was changed successfully.");
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
}
public void GetProfile(HttpListenerRequest request, Utf8JsonWriter jsonWriter)
@@ -389,9 +389,9 @@ namespace DnsServerCore
if (!string.IsNullOrEmpty(strSessionTimeoutSeconds))
session.User.SessionTimeoutSeconds = int.Parse(strSessionTimeoutSeconds);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User profile was updated successfully.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User profile was updated successfully.");
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteUserDetails(jsonWriter, session.User, session, true, false);
}
@@ -403,7 +403,7 @@ namespace DnsServerCore
jsonWriter.WritePropertyName("sessions");
jsonWriter.WriteStartArray();
List<UserSession> sessions = new List<UserSession>(_dnsWebService.AuthManager.Sessions);
List<UserSession> sessions = new List<UserSession>(_dnsWebService._authManager.Sessions);
sessions.Sort();
foreach (UserSession activeSession in sessions)
@@ -427,11 +427,11 @@ namespace DnsServerCore
IPEndPoint remoteEP = DnsWebService.GetRequestRemoteEndPoint(request);
UserSession session = _dnsWebService.AuthManager.CreateApiToken(strTokenName, strUsername, remoteEP.Address, request.UserAgent);
UserSession session = _dnsWebService._authManager.CreateApiToken(strTokenName, strUsername, remoteEP.Address, request.UserAgent);
_dnsWebService.Log.Write(remoteEP, "[" + session.User.Username + "] API token [" + strTokenName + "] was created successfully for user: " + strUsername);
_dnsWebService._log.Write(remoteEP, "[" + session.User.Username + "] API token [" + strTokenName + "] was created successfully for user: " + strUsername);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
jsonWriter.WriteString("username", session.User.Username);
jsonWriter.WriteString("tokenName", session.TokenName);
@@ -451,7 +451,7 @@ namespace DnsServerCore
string token = null;
foreach (UserSession activeSession in _dnsWebService.AuthManager.Sessions)
foreach (UserSession activeSession in _dnsWebService._authManager.Sessions)
{
if (activeSession.Token.StartsWith(strPartialToken))
{
@@ -465,21 +465,21 @@ namespace DnsServerCore
if (!isAdminContext)
{
UserSession sessionToDelete = _dnsWebService.AuthManager.GetSession(token);
UserSession sessionToDelete = _dnsWebService._authManager.GetSession(token);
if (sessionToDelete.User != session.User)
throw new DnsWebServiceException("Access was denied.");
}
UserSession deletedSession = _dnsWebService.AuthManager.DeleteSession(token);
UserSession deletedSession = _dnsWebService._authManager.DeleteSession(token);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User session [" + strPartialToken + "] was deleted successfully for user: " + deletedSession.User.Username);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User session [" + strPartialToken + "] was deleted successfully for user: " + deletedSession.User.Username);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
}
public void ListUsers(Utf8JsonWriter jsonWriter)
{
List<User> users = new List<User>(_dnsWebService.AuthManager.Users);
List<User> users = new List<User>(_dnsWebService._authManager.Users);
users.Sort();
jsonWriter.WritePropertyName("users");
@@ -509,13 +509,13 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strPassword))
throw new DnsWebServiceException("Parameter 'pass' missing.");
User user = _dnsWebService.AuthManager.CreateUser(strDisplayName, strUsername, strPassword);
User user = _dnsWebService._authManager.CreateUser(strDisplayName, strUsername, strPassword);
UserSession session = _dnsWebService.GetSession(request);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account was created successfully with username: " + user.Username);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account was created successfully with username: " + user.Username);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteUserDetails(jsonWriter, user, null, false, false);
}
@@ -533,7 +533,7 @@ namespace DnsServerCore
else
includeGroups = bool.Parse(strIncludeGroups);
User user = _dnsWebService.AuthManager.GetUser(strUsername);
User user = _dnsWebService._authManager.GetUser(strUsername);
if (user is null)
throw new DnsWebServiceException("No such user exists: " + strUsername);
@@ -546,7 +546,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strUsername))
throw new DnsWebServiceException("Parameter 'user' missing.");
User user = _dnsWebService.AuthManager.GetUser(strUsername);
User user = _dnsWebService._authManager.GetUser(strUsername);
if (user is null)
throw new DnsWebServiceException("No such user exists: " + strUsername);
@@ -556,7 +556,7 @@ namespace DnsServerCore
string strNewUsername = request.QueryString["newUser"];
if (!string.IsNullOrEmpty(strNewUsername))
_dnsWebService.AuthManager.ChangeUsername(user, strNewUsername);
_dnsWebService._authManager.ChangeUsername(user, strNewUsername);
UserSession session = _dnsWebService.GetSession(request);
@@ -567,13 +567,13 @@ namespace DnsServerCore
if (user.Disabled)
{
foreach (UserSession userSession in _dnsWebService.AuthManager.Sessions)
foreach (UserSession userSession in _dnsWebService._authManager.Sessions)
{
if (userSession.Type == UserSessionType.ApiToken)
continue;
if (userSession.User == user)
_dnsWebService.AuthManager.DeleteSession(userSession.Token);
_dnsWebService._authManager.DeleteSession(userSession.Token);
}
}
}
@@ -606,7 +606,7 @@ namespace DnsServerCore
if (part.Length == 0)
continue;
Group group = _dnsWebService.AuthManager.GetGroup(part);
Group group = _dnsWebService._authManager.GetGroup(part);
if (group is null)
throw new DnsWebServiceException("No such group exists: " + part);
@@ -614,22 +614,22 @@ namespace DnsServerCore
}
//ensure user is member of everyone group
Group everyone = _dnsWebService.AuthManager.GetGroup(Group.EVERYONE);
Group everyone = _dnsWebService._authManager.GetGroup(Group.EVERYONE);
groups[everyone.Name.ToLower()] = everyone;
if (session.User == user)
{
//ensure current admin user is member of administrators group to avoid self lockout
Group admins = _dnsWebService.AuthManager.GetGroup(Group.ADMINISTRATORS);
Group admins = _dnsWebService._authManager.GetGroup(Group.ADMINISTRATORS);
groups[admins.Name.ToLower()] = admins;
}
user.SyncGroups(groups);
}
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account details were updated successfully for user: " + strUsername);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account details were updated successfully for user: " + strUsername);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteUserDetails(jsonWriter, user, null, true, false);
}
@@ -645,17 +645,17 @@ namespace DnsServerCore
if (session.User.Username.Equals(strUsername, StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException("Invalid operation: cannot delete current user.");
if (!_dnsWebService.AuthManager.DeleteUser(strUsername))
if (!_dnsWebService._authManager.DeleteUser(strUsername))
throw new DnsWebServiceException("Failed to delete user: " + strUsername);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account was deleted successfully with username: " + strUsername);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] User account was deleted successfully with username: " + strUsername);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
}
public void ListGroups(Utf8JsonWriter jsonWriter)
{
List<Group> groups = new List<Group>(_dnsWebService.AuthManager.Groups);
List<Group> groups = new List<Group>(_dnsWebService._authManager.Groups);
groups.Sort();
jsonWriter.WritePropertyName("groups");
@@ -686,13 +686,13 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strDescription))
strDescription = "";
Group group = _dnsWebService.AuthManager.CreateGroup(strGroup, strDescription);
Group group = _dnsWebService._authManager.CreateGroup(strGroup, strDescription);
UserSession session = _dnsWebService.GetSession(request);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group was created successfully with name: " + group.Name);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group was created successfully with name: " + group.Name);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteGroupDetails(jsonWriter, group, false, false);
}
@@ -710,7 +710,7 @@ namespace DnsServerCore
else
includeUsers = bool.Parse(strIncludeGroups);
Group group = _dnsWebService.AuthManager.GetGroup(strGroup);
Group group = _dnsWebService._authManager.GetGroup(strGroup);
if (group is null)
throw new DnsWebServiceException("No such group exists: " + strGroup);
@@ -723,13 +723,13 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strGroup))
throw new DnsWebServiceException("Parameter 'group' missing.");
Group group = _dnsWebService.AuthManager.GetGroup(strGroup);
Group group = _dnsWebService._authManager.GetGroup(strGroup);
if (group is null)
throw new DnsWebServiceException("No such group exists: " + strGroup);
string strNewGroup = request.QueryString["newGroup"];
if (!string.IsNullOrEmpty(strNewGroup))
_dnsWebService.AuthManager.RenameGroup(group, strNewGroup);
_dnsWebService._authManager.RenameGroup(group, strNewGroup);
string strDescription = request.QueryString["description"];
if (!string.IsNullOrEmpty(strDescription))
@@ -748,7 +748,7 @@ namespace DnsServerCore
if (part.Length == 0)
continue;
User user = _dnsWebService.AuthManager.GetUser(part);
User user = _dnsWebService._authManager.GetUser(part);
if (user is null)
throw new DnsWebServiceException("No such user exists: " + part);
@@ -758,12 +758,12 @@ namespace DnsServerCore
if (group.Name.Equals("administrators", StringComparison.OrdinalIgnoreCase))
users[session.User.Username] = session.User; //ensure current admin user is member of administrators group to avoid self lockout
_dnsWebService.AuthManager.SyncGroupMembers(group, users);
_dnsWebService._authManager.SyncGroupMembers(group, users);
}
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group details were updated successfully for group: " + strGroup);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group details were updated successfully for group: " + strGroup);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WriteGroupDetails(jsonWriter, group, true, false);
}
@@ -774,19 +774,19 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(strGroup))
throw new DnsWebServiceException("Parameter 'group' missing.");
if (!_dnsWebService.AuthManager.DeleteGroup(strGroup))
if (!_dnsWebService._authManager.DeleteGroup(strGroup))
throw new DnsWebServiceException("Failed to delete group: " + strGroup);
UserSession session = _dnsWebService.GetSession(request);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group was deleted successfully with name: " + strGroup);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Group was deleted successfully with name: " + strGroup);
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
}
public void ListPermissions(Utf8JsonWriter jsonWriter)
{
List<Permission> permissions = new List<Permission>(_dnsWebService.AuthManager.Permissions);
List<Permission> permissions = new List<Permission>(_dnsWebService._authManager.Permissions);
permissions.Sort();
jsonWriter.WritePropertyName("permissions");
@@ -844,16 +844,16 @@ namespace DnsServerCore
{
UserSession session = _dnsWebService.GetSession(request);
if (!_dnsWebService.AuthManager.IsPermitted(section, strSubItem, session.User, PermissionFlag.View))
if (!_dnsWebService._authManager.IsPermitted(section, strSubItem, session.User, PermissionFlag.View))
throw new DnsWebServiceException("Access was denied.");
}
Permission permission;
if (strSubItem is null)
permission = _dnsWebService.AuthManager.GetPermission(section);
permission = _dnsWebService._authManager.GetPermission(section);
else
permission = _dnsWebService.AuthManager.GetPermission(section, strSubItem);
permission = _dnsWebService._authManager.GetPermission(section, strSubItem);
if (permission is null)
throw new DnsWebServiceException("No permissions exists for section: " + section.ToString() + (strSubItem is null ? "" : "/" + strSubItem));
@@ -894,16 +894,16 @@ namespace DnsServerCore
if (strSubItem is not null)
{
if (!_dnsWebService.AuthManager.IsPermitted(section, strSubItem, session.User, PermissionFlag.Delete))
if (!_dnsWebService._authManager.IsPermitted(section, strSubItem, session.User, PermissionFlag.Delete))
throw new DnsWebServiceException("Access was denied.");
}
Permission permission;
if (strSubItem is null)
permission = _dnsWebService.AuthManager.GetPermission(section);
permission = _dnsWebService._authManager.GetPermission(section);
else
permission = _dnsWebService.AuthManager.GetPermission(section, strSubItem);
permission = _dnsWebService._authManager.GetPermission(section, strSubItem);
if (permission is null)
throw new DnsWebServiceException("No permissions exists for section: " + section.ToString() + (strSubItem is null ? "" : "/" + strSubItem));
@@ -919,7 +919,7 @@ namespace DnsServerCore
if (parts[i].Length == 0)
continue;
User user = _dnsWebService.AuthManager.GetUser(parts[i]);
User user = _dnsWebService._authManager.GetUser(parts[i]);
bool canView = bool.Parse(parts[i + 1]);
bool canModify = bool.Parse(parts[i + 2]);
bool canDelete = bool.Parse(parts[i + 3]);
@@ -955,7 +955,7 @@ namespace DnsServerCore
if (parts[i].Length == 0)
continue;
Group group = _dnsWebService.AuthManager.GetGroup(parts[i]);
Group group = _dnsWebService._authManager.GetGroup(parts[i]);
bool canView = bool.Parse(parts[i + 1]);
bool canModify = bool.Parse(parts[i + 2]);
bool canDelete = bool.Parse(parts[i + 3]);
@@ -978,20 +978,20 @@ namespace DnsServerCore
}
//ensure administrators group always has all permissions
Group admins = _dnsWebService.AuthManager.GetGroup(Group.ADMINISTRATORS);
Group admins = _dnsWebService._authManager.GetGroup(Group.ADMINISTRATORS);
groupPermissions[admins] = PermissionFlag.ViewModifyDelete;
switch (section)
{
case PermissionSection.Zones:
//ensure DNS administrators group always has all permissions
Group dnsAdmins = _dnsWebService.AuthManager.GetGroup(Group.DNS_ADMINISTRATORS);
Group dnsAdmins = _dnsWebService._authManager.GetGroup(Group.DNS_ADMINISTRATORS);
groupPermissions[dnsAdmins] = PermissionFlag.ViewModifyDelete;
break;
case PermissionSection.DhcpServer:
//ensure DHCP administrators group always has all permissions
Group dhcpAdmins = _dnsWebService.AuthManager.GetGroup(Group.DHCP_ADMINISTRATORS);
Group dhcpAdmins = _dnsWebService._authManager.GetGroup(Group.DHCP_ADMINISTRATORS);
groupPermissions[dhcpAdmins] = PermissionFlag.ViewModifyDelete;
break;
}
@@ -999,9 +999,9 @@ namespace DnsServerCore
permission.SyncPermissions(groupPermissions);
}
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Permissions were updated successfully for section: " + section.ToString() + (string.IsNullOrEmpty(strSubItem) ? "" : "/" + strSubItem));
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + session.User.Username + "] Permissions were updated successfully for section: " + section.ToString() + (string.IsNullOrEmpty(strSubItem) ? "" : "/" + strSubItem));
_dnsWebService.AuthManager.SaveConfigFile();
_dnsWebService._authManager.SaveConfigFile();
WritePermissionDetails(jsonWriter, permission, strSubItem, false);
}

42
DnsServerCore/WebServiceDashboardApi.cs
View File

@@ -71,7 +71,7 @@ namespace DnsServerCore
private async Task<IDictionary<string, string>> ResolvePtrTopClientsAsync(List<KeyValuePair<string, long>> topClients)
{
IDictionary<string, string> dhcpClientIpMap = _dnsWebService.DhcpServer.GetAddressHostNameMap();
IDictionary<string, string> dhcpClientIpMap = _dnsWebService._dhcpServer.GetAddressHostNameMap();
async Task<KeyValuePair<string, string>> ResolvePtrAsync(string ip)
{
@@ -83,7 +83,7 @@ namespace DnsServerCore
if (IPAddress.IsLoopback(address))
return new KeyValuePair<string, string>(ip, "localhost");
DnsDatagram ptrResponse = await _dnsWebService.DnsServer.DirectQueryAsync(new DnsQuestionRecord(address, DnsClass.IN), 500);
DnsDatagram ptrResponse = await _dnsWebService._dnsServer.DirectQueryAsync(new DnsQuestionRecord(address, DnsClass.IN), 500);
if (ptrResponse.Answer.Count > 0)
{
IReadOnlyList<string> ptrDomains = DnsClient.ParseResponsePTR(ptrResponse);
@@ -147,12 +147,12 @@ namespace DnsServerCore
switch (strType.ToLower())
{
case "lasthour":
data = _dnsWebService.DnsServer.StatsManager.GetLastHourMinuteWiseStats(utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetLastHourMinuteWiseStats(utcFormat);
labelFormat = "HH:mm";
break;
case "lastday":
data = _dnsWebService.DnsServer.StatsManager.GetLastDayHourWiseStats(utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetLastDayHourWiseStats(utcFormat);
if (isLanguageEnUs)
labelFormat = "MM/DD HH:00";
@@ -162,7 +162,7 @@ namespace DnsServerCore
break;
case "lastweek":
data = _dnsWebService.DnsServer.StatsManager.GetLastWeekDayWiseStats(utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetLastWeekDayWiseStats(utcFormat);
if (isLanguageEnUs)
labelFormat = "MM/DD";
@@ -172,7 +172,7 @@ namespace DnsServerCore
break;
case "lastmonth":
data = _dnsWebService.DnsServer.StatsManager.GetLastMonthDayWiseStats(utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetLastMonthDayWiseStats(utcFormat);
if (isLanguageEnUs)
labelFormat = "MM/DD";
@@ -183,7 +183,7 @@ namespace DnsServerCore
case "lastyear":
labelFormat = "MM/YYYY";
data = _dnsWebService.DnsServer.StatsManager.GetLastYearMonthWiseStats(utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetLastYearMonthWiseStats(utcFormat);
break;
case "custom":
@@ -206,7 +206,7 @@ namespace DnsServerCore
if ((Convert.ToInt32((endDate - startDate).TotalDays) + 1) > 7)
{
data = _dnsWebService.DnsServer.StatsManager.GetDayWiseStats(startDate, endDate, utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetDayWiseStats(startDate, endDate, utcFormat);
if (isLanguageEnUs)
labelFormat = "MM/DD";
@@ -215,7 +215,7 @@ namespace DnsServerCore
}
else
{
data = _dnsWebService.DnsServer.StatsManager.GetHourWiseStats(startDate, endDate, utcFormat);
data = _dnsWebService._dnsServer.StatsManager.GetHourWiseStats(startDate, endDate, utcFormat);
if (isLanguageEnUs)
labelFormat = "MM/DD HH:00";
@@ -239,11 +239,11 @@ namespace DnsServerCore
foreach (KeyValuePair<string, long> item in stats)
jsonWriter.WriteNumber(item.Key, item.Value);
jsonWriter.WriteNumber("zones", _dnsWebService.DnsServer.AuthZoneManager.TotalZones);
jsonWriter.WriteNumber("cachedEntries", _dnsWebService.DnsServer.CacheZoneManager.TotalEntries);
jsonWriter.WriteNumber("allowedZones", _dnsWebService.DnsServer.AllowedZoneManager.TotalZonesAllowed);
jsonWriter.WriteNumber("blockedZones", _dnsWebService.DnsServer.BlockedZoneManager.TotalZonesBlocked);
jsonWriter.WriteNumber("blockListZones", _dnsWebService.DnsServer.BlockListZoneManager.TotalZonesBlocked);
jsonWriter.WriteNumber("zones", _dnsWebService._dnsServer.AuthZoneManager.TotalZones);
jsonWriter.WriteNumber("cachedEntries", _dnsWebService._dnsServer.CacheZoneManager.TotalEntries);
jsonWriter.WriteNumber("allowedZones", _dnsWebService._dnsServer.AllowedZoneManager.TotalZonesAllowed);
jsonWriter.WriteNumber("blockedZones", _dnsWebService._dnsServer.BlockedZoneManager.TotalZonesBlocked);
jsonWriter.WriteNumber("blockListZones", _dnsWebService._dnsServer.BlockListZoneManager.TotalZonesBlocked);
jsonWriter.WriteEndObject();
}
@@ -517,23 +517,23 @@ namespace DnsServerCore
switch (strType.ToLower())
{
case "lasthour":
topStatsData = _dnsWebService.DnsServer.StatsManager.GetLastHourTopStats(statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetLastHourTopStats(statsType, limit);
break;
case "lastday":
topStatsData = _dnsWebService.DnsServer.StatsManager.GetLastDayTopStats(statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetLastDayTopStats(statsType, limit);
break;
case "lastweek":
topStatsData = _dnsWebService.DnsServer.StatsManager.GetLastWeekTopStats(statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetLastWeekTopStats(statsType, limit);
break;
case "lastmonth":
topStatsData = _dnsWebService.DnsServer.StatsManager.GetLastMonthTopStats(statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetLastMonthTopStats(statsType, limit);
break;
case "lastyear":
topStatsData = _dnsWebService.DnsServer.StatsManager.GetLastYearTopStats(statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetLastYearTopStats(statsType, limit);
break;
case "custom":
@@ -555,9 +555,9 @@ namespace DnsServerCore
throw new DnsWebServiceException("Start date must be less than or equal to end date.");
if ((Convert.ToInt32((endDate - startDate).TotalDays) + 1) > 7)
topStatsData = _dnsWebService.DnsServer.StatsManager.GetDayWiseTopStats(startDate, endDate, statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetDayWiseTopStats(startDate, endDate, statsType, limit);
else
topStatsData = _dnsWebService.DnsServer.StatsManager.GetHourWiseTopStats(startDate, endDate, statsType, limit);
topStatsData = _dnsWebService._dnsServer.StatsManager.GetHourWiseTopStats(startDate, endDate, statsType, limit);
break;

66
DnsServerCore/WebServiceDhcpApi.cs
View File

@@ -48,7 +48,7 @@ namespace DnsServerCore
public void ListDhcpLeases(Utf8JsonWriter jsonWriter)
{
IReadOnlyDictionary<string, Scope> scopes = _dnsWebService.DhcpServer.Scopes;
IReadOnlyDictionary<string, Scope> scopes = _dnsWebService._dhcpServer.Scopes;
//sort by name
List<Scope> sortedScopes = new List<Scope>(scopes.Count);
@@ -95,7 +95,7 @@ namespace DnsServerCore
public void ListDhcpScopes(Utf8JsonWriter jsonWriter)
{
IReadOnlyDictionary<string, Scope> scopes = _dnsWebService.DhcpServer.Scopes;
IReadOnlyDictionary<string, Scope> scopes = _dnsWebService._dhcpServer.Scopes;
//sort by name
List<Scope> sortedScopes = new List<Scope>(scopes.Count);
@@ -135,7 +135,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope == null)
throw new DnsWebServiceException("DHCP scope was not found: " + scopeName);
@@ -354,7 +354,7 @@ namespace DnsServerCore
string strSubnetMask = request.QueryString["subnetMask"];
bool scopeExists;
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope is null)
{
//scope does not exists; create new scope
@@ -368,7 +368,7 @@ namespace DnsServerCore
throw new DnsWebServiceException("Parameter 'subnetMask' missing.");
scopeExists = false;
scope = new Scope(scopeName, true, IPAddress.Parse(strStartingAddress), IPAddress.Parse(strEndingAddress), IPAddress.Parse(strSubnetMask), _dnsWebService.Log);
scope = new Scope(scopeName, true, IPAddress.Parse(strStartingAddress), IPAddress.Parse(strEndingAddress), IPAddress.Parse(strSubnetMask), _dnsWebService._log);
}
else
{
@@ -393,7 +393,7 @@ namespace DnsServerCore
subnetMask = IPAddress.Parse(strSubnetMask);
//validate scope address
foreach (KeyValuePair<string, Scope> entry in _dnsWebService.DhcpServer.Scopes)
foreach (KeyValuePair<string, Scope> entry in _dnsWebService._dhcpServer.Scopes)
{
Scope existingScope = entry.Value;
@@ -694,23 +694,23 @@ namespace DnsServerCore
if (scopeExists)
{
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was updated successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was updated successfully: " + scopeName);
}
else
{
await _dnsWebService.DhcpServer.AddScopeAsync(scope);
await _dnsWebService._dhcpServer.AddScopeAsync(scope);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was added successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was added successfully: " + scopeName);
}
string newName = request.QueryString["newName"];
if (!string.IsNullOrEmpty(newName) && !newName.Equals(scopeName))
{
_dnsWebService.DhcpServer.RenameScope(scopeName, newName);
_dnsWebService._dhcpServer.RenameScope(scopeName, newName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was renamed successfully: '" + scopeName + "' to '" + newName + "'");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was renamed successfully: '" + scopeName + "' to '" + newName + "'");
}
}
@@ -720,7 +720,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope is null)
throw new DnsWebServiceException("No such scope exists: " + scopeName);
@@ -741,9 +741,9 @@ namespace DnsServerCore
if (!scope.AddReservedLease(reservedLease))
throw new DnsWebServiceException("Failed to add reserved lease for scope: " + scopeName);
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope reserved lease was added successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope reserved lease was added successfully: " + scopeName);
}
public void RemoveReservedLease(HttpListenerRequest request)
@@ -752,7 +752,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope is null)
throw new DnsWebServiceException("No such scope exists: " + scopeName);
@@ -763,9 +763,9 @@ namespace DnsServerCore
if (!scope.RemoveReservedLease(hardwareAddress))
throw new DnsWebServiceException("Failed to remove reserved lease for scope: " + scopeName);
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope reserved lease was removed successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope reserved lease was removed successfully: " + scopeName);
}
public async Task EnableDhcpScopeAsync(HttpListenerRequest request)
@@ -774,9 +774,9 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
await _dnsWebService.DhcpServer.EnableScopeAsync(scopeName, true);
await _dnsWebService._dhcpServer.EnableScopeAsync(scopeName, true);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was enabled successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was enabled successfully: " + scopeName);
}
public void DisableDhcpScope(HttpListenerRequest request)
@@ -785,9 +785,9 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
_dnsWebService.DhcpServer.DisableScope(scopeName, true);
_dnsWebService._dhcpServer.DisableScope(scopeName, true);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was disabled successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was disabled successfully: " + scopeName);
}
public void DeleteDhcpScope(HttpListenerRequest request)
@@ -796,9 +796,9 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
_dnsWebService.DhcpServer.DeleteScope(scopeName);
_dnsWebService._dhcpServer.DeleteScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was deleted successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope was deleted successfully: " + scopeName);
}
public void RemoveDhcpLease(HttpListenerRequest request)
@@ -807,7 +807,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope is null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
@@ -821,9 +821,9 @@ namespace DnsServerCore
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was removed successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was removed successfully: " + scopeName);
}
public void ConvertToReservedLease(HttpListenerRequest request)
@@ -832,7 +832,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope == null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
@@ -846,9 +846,9 @@ namespace DnsServerCore
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was reserved successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was reserved successfully: " + scopeName);
}
public void ConvertToDynamicLease(HttpListenerRequest request)
@@ -857,7 +857,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(scopeName))
throw new DnsWebServiceException("Parameter 'name' missing.");
Scope scope = _dnsWebService.DhcpServer.GetScope(scopeName);
Scope scope = _dnsWebService._dhcpServer.GetScope(scopeName);
if (scope == null)
throw new DnsWebServiceException("DHCP scope does not exists: " + scopeName);
@@ -871,9 +871,9 @@ namespace DnsServerCore
else
throw new DnsWebServiceException("Parameter 'hardwareAddress' or 'clientIdentifier' missing. At least one of them must be specified.");
_dnsWebService.DhcpServer.SaveScope(scopeName);
_dnsWebService._dhcpServer.SaveScope(scopeName);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was unreserved successfully: " + scopeName);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] DHCP scope's lease was unreserved successfully: " + scopeName);
}
#endregion

18
DnsServerCore/WebServiceLogsApi.cs
View File

@@ -52,7 +52,7 @@ namespace DnsServerCore
public void ListLogs(Utf8JsonWriter jsonWriter)
{
string[] logFiles = _dnsWebService.Log.ListLogFiles();
string[] logFiles = _dnsWebService._log.ListLogFiles();
Array.Sort(logFiles);
Array.Reverse(logFiles);
@@ -86,7 +86,7 @@ namespace DnsServerCore
else
limit = int.Parse(strLimit);
return _dnsWebService.Log.DownloadLogAsync(request, response, strFileName, limit * 1024 * 1024);
return _dnsWebService._log.DownloadLogAsync(request, response, strFileName, limit * 1024 * 1024);
}
public void DeleteLog(HttpListenerRequest request)
@@ -95,23 +95,23 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(log))
throw new DnsWebServiceException("Parameter 'log' missing.");
_dnsWebService.Log.DeleteLog(log);
_dnsWebService._log.DeleteLog(log);
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Log file was deleted: " + log);
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Log file was deleted: " + log);
}
public void DeleteAllLogs(HttpListenerRequest request)
{
_dnsWebService.Log.DeleteAllLogs();
_dnsWebService._log.DeleteAllLogs();
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] All log files were deleted.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] All log files were deleted.");
}
public void DeleteAllStats(HttpListenerRequest request)
{
_dnsWebService.DnsServer.StatsManager.DeleteAllStats();
_dnsWebService._dnsServer.StatsManager.DeleteAllStats();
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] All stats files were deleted.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] All stats files were deleted.");
}
public async Task QueryLogsAsync(HttpListenerRequest request, Utf8JsonWriter jsonWriter)
@@ -124,7 +124,7 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(classPath))
throw new DnsWebServiceException("Parameter 'classPath' missing.");
if (!_dnsWebService.DnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
if (!_dnsWebService._dnsServer.DnsApplicationManager.Applications.TryGetValue(name, out DnsApplication application))
throw new DnsWebServiceException("DNS application was not found: " + name);
if (!application.DnsQueryLoggers.TryGetValue(classPath, out IDnsQueryLogger logger))

72
DnsServerCore/WebServiceOtherZonesApi.cs
View File

@@ -52,9 +52,9 @@ namespace DnsServerCore
public void FlushCache(HttpListenerRequest request)
{
_dnsWebService.DnsServer.CacheZoneManager.Flush();
_dnsWebService._dnsServer.CacheZoneManager.Flush();
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Cache was flushed.");
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Cache was flushed.");
}
public void ListCachedZones(HttpListenerRequest request, Utf8JsonWriter jsonWriter)
@@ -75,8 +75,8 @@ namespace DnsServerCore
subZones.Clear();
records.Clear();
_dnsWebService.DnsServer.CacheZoneManager.ListSubDomains(domain, subZones);
_dnsWebService.DnsServer.CacheZoneManager.ListAllRecords(domain, records);
_dnsWebService._dnsServer.CacheZoneManager.ListSubDomains(domain, subZones);
_dnsWebService._dnsServer.CacheZoneManager.ListAllRecords(domain, records);
if (records.Count > 0)
break;
@@ -129,8 +129,8 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(domain))
throw new DnsWebServiceException("Parameter 'domain' missing.");
if (_dnsWebService.DnsServer.CacheZoneManager.DeleteZone(domain))
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Cached zone was deleted: " + domain);
if (_dnsWebService._dnsServer.CacheZoneManager.DeleteZone(domain))
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Cached zone was deleted: " + domain);
}
#endregion
@@ -155,8 +155,8 @@ namespace DnsServerCore
subZones.Clear();
records.Clear();
_dnsWebService.DnsServer.AllowedZoneManager.ListSubDomains(domain, subZones);
_dnsWebService.DnsServer.AllowedZoneManager.ListAllRecords(domain, records);
_dnsWebService._dnsServer.AllowedZoneManager.ListSubDomains(domain, subZones);
_dnsWebService._dnsServer.AllowedZoneManager.ListAllRecords(domain, records);
if (records.Count > 0)
break;
@@ -226,14 +226,14 @@ namespace DnsServerCore
foreach (string allowedZone in allowedZones)
{
if (_dnsWebService.DnsServer.AllowedZoneManager.AllowZone(allowedZone))
if (_dnsWebService._dnsServer.AllowedZoneManager.AllowZone(allowedZone))
added = true;
}
if (added)
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Total " + allowedZones.Length + " zones were imported into allowed zone successfully.");
_dnsWebService.DnsServer.AllowedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Total " + allowedZones.Length + " zones were imported into allowed zone successfully.");
_dnsWebService._dnsServer.AllowedZoneManager.SaveZoneFile();
}
return;
@@ -245,7 +245,7 @@ namespace DnsServerCore
public void ExportAllowedZones(HttpListenerResponse response)
{
IReadOnlyList<AuthZoneInfo> zoneInfoList = _dnsWebService.DnsServer.AllowedZoneManager.ListZones();
IReadOnlyList<AuthZoneInfo> zoneInfoList = _dnsWebService._dnsServer.AllowedZoneManager.ListZones();
response.ContentType = "text/plain";
response.AddHeader("Content-Disposition", "attachment;filename=AllowedZones.txt");
@@ -263,19 +263,19 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(domain))
throw new DnsWebServiceException("Parameter 'domain' missing.");
if (_dnsWebService.DnsServer.AllowedZoneManager.DeleteZone(domain))
if (_dnsWebService._dnsServer.AllowedZoneManager.DeleteZone(domain))
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Allowed zone was deleted: " + domain);
_dnsWebService.DnsServer.AllowedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Allowed zone was deleted: " + domain);
_dnsWebService._dnsServer.AllowedZoneManager.SaveZoneFile();
}
}
public void FlushAllowedZone(HttpListenerRequest request)
{
_dnsWebService.DnsServer.AllowedZoneManager.Flush();
_dnsWebService._dnsServer.AllowedZoneManager.Flush();
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Allowed zone was flushed successfully.");
_dnsWebService.DnsServer.AllowedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Allowed zone was flushed successfully.");
_dnsWebService._dnsServer.AllowedZoneManager.SaveZoneFile();
}
public void AllowZone(HttpListenerRequest request)
@@ -287,10 +287,10 @@ namespace DnsServerCore
if (IPAddress.TryParse(domain, out IPAddress ipAddress))
domain = ipAddress.GetReverseDomain();
if (_dnsWebService.DnsServer.AllowedZoneManager.AllowZone(domain))
if (_dnsWebService._dnsServer.AllowedZoneManager.AllowZone(domain))
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Zone was allowed: " + domain);
_dnsWebService.DnsServer.AllowedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Zone was allowed: " + domain);
_dnsWebService._dnsServer.AllowedZoneManager.SaveZoneFile();
}
}
@@ -316,8 +316,8 @@ namespace DnsServerCore
subZones.Clear();
records.Clear();
_dnsWebService.DnsServer.BlockedZoneManager.ListSubDomains(domain, subZones);
_dnsWebService.DnsServer.BlockedZoneManager.ListAllRecords(domain, records);
_dnsWebService._dnsServer.BlockedZoneManager.ListSubDomains(domain, subZones);
_dnsWebService._dnsServer.BlockedZoneManager.ListAllRecords(domain, records);
if (records.Count > 0)
break;
@@ -387,14 +387,14 @@ namespace DnsServerCore
foreach (string blockedZone in blockedZones)
{
if (_dnsWebService.DnsServer.BlockedZoneManager.BlockZone(blockedZone))
if (_dnsWebService._dnsServer.BlockedZoneManager.BlockZone(blockedZone))
added = true;
}
if (added)
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Total " + blockedZones.Length + " zones were imported into blocked zone successfully.");
_dnsWebService.DnsServer.BlockedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Total " + blockedZones.Length + " zones were imported into blocked zone successfully.");
_dnsWebService._dnsServer.BlockedZoneManager.SaveZoneFile();
}
return;
@@ -406,7 +406,7 @@ namespace DnsServerCore
public void ExportBlockedZones(HttpListenerResponse response)
{
IReadOnlyList<AuthZoneInfo> zoneInfoList = _dnsWebService.DnsServer.BlockedZoneManager.ListZones();
IReadOnlyList<AuthZoneInfo> zoneInfoList = _dnsWebService._dnsServer.BlockedZoneManager.ListZones();
response.ContentType = "text/plain";
response.AddHeader("Content-Disposition", "attachment;filename=BlockedZones.txt");
@@ -424,19 +424,19 @@ namespace DnsServerCore
if (string.IsNullOrEmpty(domain))
throw new DnsWebServiceException("Parameter 'domain' missing.");
if (_dnsWebService.DnsServer.BlockedZoneManager.DeleteZone(domain))
if (_dnsWebService._dnsServer.BlockedZoneManager.DeleteZone(domain))
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Blocked zone was deleted: " + domain);
_dnsWebService.DnsServer.BlockedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Blocked zone was deleted: " + domain);
_dnsWebService._dnsServer.BlockedZoneManager.SaveZoneFile();
}
}
public void FlushBlockedZone(HttpListenerRequest request)
{
_dnsWebService.DnsServer.BlockedZoneManager.Flush();
_dnsWebService._dnsServer.BlockedZoneManager.Flush();
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Blocked zone was flushed successfully.");
_dnsWebService.DnsServer.BlockedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Blocked zone was flushed successfully.");
_dnsWebService._dnsServer.BlockedZoneManager.SaveZoneFile();
}
public void BlockZone(HttpListenerRequest request)
@@ -448,10 +448,10 @@ namespace DnsServerCore
if (IPAddress.TryParse(domain, out IPAddress ipAddress))
domain = ipAddress.GetReverseDomain();
if (_dnsWebService.DnsServer.BlockedZoneManager.BlockZone(domain))
if (_dnsWebService._dnsServer.BlockedZoneManager.BlockZone(domain))
{
_dnsWebService.Log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Domain was added to blocked zone: " + domain);
_dnsWebService.DnsServer.BlockedZoneManager.SaveZoneFile();
_dnsWebService._log.Write(DnsWebService.GetRequestRemoteEndPoint(request), "[" + _dnsWebService.GetSession(request).User.Username + "] Domain was added to blocked zone: " + domain);
_dnsWebService._dnsServer.BlockedZoneManager.SaveZoneFile();
}
}

422
DnsServerCore/WebServiceZonesApi.cs
View File

File diff suppressed because it is too large Load Diff