fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2025-12-22 09:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

code refactoring changes done.

Browse Source
This commit is contained in:
Shreyas Zare
2024-09-14 16:36:43 +05:30
parent 7ba844763c
commit 87d6dd27c3
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DnsServerCore/Auth/Group.cs
View File

@@ -108,7 +108,7 @@ namespace DnsServerCore.Auth
if (value.Length > 255)
throw new ArgumentException("Group name length cannot exceed 255 characters.", nameof(Name));
switch (_name?.ToLower())
switch (_name?.ToLowerInvariant())
{
case "everyone":
case "administrators":

16
DnsServerCore/Auth/Permission.cs
View File

@@ -1,6 +1,6 @@
/*
Technitium DNS Server
Copyright (C) 2022 Shreyas Zare (shreyas@technitium.com)
Copyright (C) 2024 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
@@ -131,7 +131,7 @@ namespace DnsServerCore.Auth
string subItemName = bR.ReadShortString();
Permission subItemPermission = new Permission(bR, authManager);
_subItemPermissions.TryAdd(subItemName.ToLower(), subItemPermission);
_subItemPermissions.TryAdd(subItemName.ToLowerInvariant(), subItemPermission);
}
}
@@ -167,7 +167,7 @@ namespace DnsServerCore.Auth
public void SetSubItemPermission(string subItemName, User user, PermissionFlag flags)
{
Permission subItemPermission = _subItemPermissions.GetOrAdd(subItemName.ToLower(), delegate (string key)
Permission subItemPermission = _subItemPermissions.GetOrAdd(subItemName.ToLowerInvariant(), delegate (string key)
{
return new Permission(_section, key);
});
@@ -196,7 +196,7 @@ namespace DnsServerCore.Auth
public void SetSubItemPermission(string subItemName, Group group, PermissionFlag flags)
{
Permission subItemPermission = _subItemPermissions.GetOrAdd(subItemName.ToLower(), delegate (string key)
Permission subItemPermission = _subItemPermissions.GetOrAdd(subItemName.ToLowerInvariant(), delegate (string key)
{
return new Permission(_section, key);
});
@@ -211,7 +211,7 @@ namespace DnsServerCore.Auth
public bool RemoveSubItemPermission(string subItemName, User user)
{
return _subItemPermissions.TryGetValue(subItemName.ToLower(), out Permission subItemPermission) && subItemPermission.RemovePermission(user);
return _subItemPermissions.TryGetValue(subItemName.ToLowerInvariant(), out Permission subItemPermission) && subItemPermission.RemovePermission(user);
}
public bool RemovePermission(Group group)
@@ -221,7 +221,7 @@ namespace DnsServerCore.Auth
public bool RemoveSubItemPermission(string subItemName, Group group)
{
return _subItemPermissions.TryGetValue(subItemName.ToLower(), out Permission subItemPermission) && subItemPermission.RemovePermission(group);
return _subItemPermissions.TryGetValue(subItemName.ToLowerInvariant(), out Permission subItemPermission) && subItemPermission.RemovePermission(group);
}
public bool RemoveAllSubItemPermissions(User user)
@@ -257,7 +257,7 @@ namespace DnsServerCore.Auth
public Permission GetSubItemPermission(string subItemName)
{
if (_subItemPermissions.TryGetValue(subItemName.ToLower(), out Permission subItemPermission))
if (_subItemPermissions.TryGetValue(subItemName.ToLowerInvariant(), out Permission subItemPermission))
return subItemPermission;
return null;
@@ -279,7 +279,7 @@ namespace DnsServerCore.Auth
public bool IsSubItemPermitted(string subItemName, User user, PermissionFlag flag)
{
return _subItemPermissions.TryGetValue(subItemName.ToLower(), out Permission subItemPermission) && subItemPermission.IsPermitted(user, flag);
return _subItemPermissions.TryGetValue(subItemName.ToLowerInvariant(), out Permission subItemPermission) && subItemPermission.IsPermitted(user, flag);
}
public void WriteTo(BinaryWriter bW)

20
DnsServerCore/Auth/User.cs
View File

@@ -102,7 +102,7 @@ namespace DnsServerCore.Auth
{
Group group = authManager.GetGroup(bR.ReadShortString());
if (group is not null)
_memberOfGroups.TryAdd(group.Name.ToLower(), group);
_memberOfGroups.TryAdd(group.Name.ToLowerInvariant(), group);
}
}
break;
@@ -118,8 +118,8 @@ namespace DnsServerCore.Auth
internal void RenameGroup(string oldName)
{
if (_memberOfGroups.TryRemove(oldName.ToLower(), out Group renamedGroup))
_memberOfGroups.TryAdd(renamedGroup.Name.ToLower(), renamedGroup);
if (_memberOfGroups.TryRemove(oldName.ToLowerInvariant(), out Group renamedGroup))
_memberOfGroups.TryAdd(renamedGroup.Name.ToLowerInvariant(), renamedGroup);
}
#endregion
@@ -133,11 +133,11 @@ namespace DnsServerCore.Auth
case UserPasswordHashType.OldScheme:
using (HMAC hmac = new HMACSHA256(Encoding.UTF8.GetBytes(password)))
{
return Convert.ToHexString(hmac.ComputeHash(Encoding.UTF8.GetBytes(_username))).ToLower();
return Convert.ToHexString(hmac.ComputeHash(Encoding.UTF8.GetBytes(_username))).ToLowerInvariant();
}
case UserPasswordHashType.PBKDF2_SHA256:
return Convert.ToHexString(Rfc2898DeriveBytes.Pbkdf2(Encoding.UTF8.GetBytes(password), _salt, _iterations, HashAlgorithmName.SHA256, 32)).ToLower();
return Convert.ToHexString(Rfc2898DeriveBytes.Pbkdf2(Encoding.UTF8.GetBytes(password), _salt, _iterations, HashAlgorithmName.SHA256, 32)).ToLowerInvariant();
default:
throw new NotSupportedException();
@@ -178,7 +178,7 @@ namespace DnsServerCore.Auth
if (_memberOfGroups.Count == 255)
throw new InvalidOperationException("Cannot add user to group: user can be member of max 255 groups.");
_memberOfGroups.TryAdd(group.Name.ToLower(), group);
_memberOfGroups.TryAdd(group.Name.ToLowerInvariant(), group);
}
public bool RemoveFromGroup(Group group)
@@ -186,7 +186,7 @@ namespace DnsServerCore.Auth
if (group.Name.Equals("everyone", StringComparison.OrdinalIgnoreCase))
throw new InvalidOperationException("Access was denied.");
return _memberOfGroups.TryRemove(group.Name.ToLower(), out _);
return _memberOfGroups.TryRemove(group.Name.ToLowerInvariant(), out _);
}
public void SyncGroups(IReadOnlyDictionary<string, Group> groups)
@@ -205,7 +205,7 @@ namespace DnsServerCore.Auth
public bool IsMemberOfGroup(Group group)
{
return _memberOfGroups.ContainsKey(group.Name.ToLower());
return _memberOfGroups.ContainsKey(group.Name.ToLowerInvariant());
}
public void WriteTo(BinaryWriter bW)
@@ -228,7 +228,7 @@ namespace DnsServerCore.Auth
bW.Write(Convert.ToByte(_memberOfGroups.Count));
foreach (KeyValuePair<string, Group> group in _memberOfGroups)
bW.WriteShortString(group.Value.Name.ToLower());
bW.WriteShortString(group.Value.Name.ToLowerInvariant());
}
public override bool Equals(object obj)
@@ -310,7 +310,7 @@ namespace DnsServerCore.Auth
throw new ArgumentException("Username can contain only alpha numeric, '-', '_', or '.' characters.", nameof(Username));
}
_username = value.ToLower();
_username = value.ToLowerInvariant();
}
}

2
DnsServerCore/Auth/UserSession.cs
View File

@@ -59,7 +59,7 @@ namespace DnsServerCore.Auth
Span<byte> tokenBytes = stackalloc byte[32];
RandomNumberGenerator.Fill(tokenBytes);
_token = Convert.ToHexString(tokenBytes).ToLower();
_token = Convert.ToHexString(tokenBytes).ToLowerInvariant();
_type = type;
_tokenName = tokenName;