diff --git a/ApiDto/Common/PasswordPolicy.cs b/ApiDto/Common/PasswordPolicy.cs new file mode 100644 index 0000000..bd308e6 --- /dev/null +++ b/ApiDto/Common/PasswordPolicy.cs @@ -0,0 +1,32 @@ +namespace Mirea.Api.Dto.Common; + +/// +/// Represents the password policy settings for user authentication. +/// +public class PasswordPolicy +{ + /// + /// Gets or sets the minimum length required for a password. + /// + public int MinimumLength { get; set; } + + /// + /// Gets or sets a value indicating whether at least one letter is required in the password. + /// + public bool RequireLetter { get; set; } + + /// + /// Gets or sets a value indicating whether the password must contain both lowercase and uppercase letters. + /// + public bool RequireLettersDifferentCase { get; set; } + + /// + /// Gets or sets a value indicating whether at least one digit is required in the password. + /// + public bool RequireDigit { get; set; } + + /// + /// Gets or sets a value indicating whether at least one special character is required in the password. + /// + public bool RequireSpecialCharacter { get; set; } +} diff --git a/Endpoint/Common/MapperDto/PasswordPolicyConverter.cs b/Endpoint/Common/MapperDto/PasswordPolicyConverter.cs new file mode 100644 index 0000000..85d27d4 --- /dev/null +++ b/Endpoint/Common/MapperDto/PasswordPolicyConverter.cs @@ -0,0 +1,23 @@ +using Mirea.Api.Dto.Common; + +namespace Mirea.Api.Endpoint.Common.MapperDto; + +public static class PasswordPolicyConverter +{ + public static Security.Common.Domain.PasswordPolicy ConvertFromDto(this PasswordPolicy policy) => + new(policy.MinimumLength, + policy.RequireLetter, + policy.RequireLettersDifferentCase, + policy.RequireDigit, + policy.RequireSpecialCharacter); + + public static PasswordPolicy ConvertToDto(this Security.Common.Domain.PasswordPolicy policy) => + new() + { + MinimumLength = policy.MinimumLength, + RequireLetter = policy.RequireLetter, + RequireDigit = policy.RequireDigit, + RequireSpecialCharacter = policy.RequireSpecialCharacter, + RequireLettersDifferentCase = policy.RequireLettersDifferentCase + }; +} \ No newline at end of file diff --git a/Endpoint/Controllers/Configuration/SetupController.cs b/Endpoint/Controllers/Configuration/SetupController.cs index d0033ea..cbb449f 100644 --- a/Endpoint/Controllers/Configuration/SetupController.cs +++ b/Endpoint/Controllers/Configuration/SetupController.cs @@ -25,6 +25,7 @@ using System.Linq; using System.Net.Mail; using System.Runtime.InteropServices; using System.Security.Cryptography; +using PasswordPolicy = Mirea.Api.Dto.Common.PasswordPolicy; namespace Mirea.Api.Endpoint.Controllers.Configuration; @@ -340,6 +341,20 @@ public class SetupController( return true; } + [HttpPost("SetPasswordPolicy")] + [TokenAuthentication] + public ActionResult SetPasswordPolicy([FromBody] PasswordPolicy? policy = null) + { + GeneralConfig.PasswordPolicy = policy?.ConvertFromDto() ?? new Security.Common.Domain.PasswordPolicy(); + cache.Set("password", true); + return true; + } + + [HttpGet("PasswordPolicyConfiguration")] + [TokenAuthentication] + [ProducesResponseType(StatusCodes.Status204NoContent)] + public ActionResult PasswordPolicyConfiguration() => + cache.TryGetValue("password", out _) ? Ok(GeneralConfig.PasswordPolicy) : NoContent(); [HttpPost("Submit")] [TokenAuthentication] diff --git a/Endpoint/Controllers/V1/AuthController.cs b/Endpoint/Controllers/V1/AuthController.cs index 9b199fc..b5ef2b8 100644 --- a/Endpoint/Controllers/V1/AuthController.cs +++ b/Endpoint/Controllers/V1/AuthController.cs @@ -149,13 +149,16 @@ public class AuthController(IOptionsSnapshot user, AuthService auth, Pass [BadRequestResponse] public ActionResult RenewPassword([FromBody] string? password = null) { + var passwordPolicy = generalConfig.Value.PasswordPolicy; + var passwordPolicyService = new PasswordPolicyService(passwordPolicy); + if (string.IsNullOrEmpty(password)) password = string.Empty; - else if (!PasswordHashService.HasPasswordInPolicySecurity(password)) - throw new ControllerArgumentException("The password must be at least 8 characters long and contain at least one uppercase letter and one special character."); + else + passwordPolicyService.ValidatePasswordOrThrow(password); - while (!PasswordHashService.HasPasswordInPolicySecurity(password)) - password = GeneratorKey.GenerateAlphaNumeric(16, includes: "!@#%^"); + while (!passwordPolicyService.TryValidatePassword(password)) + password = GeneratorKey.GenerateAlphaNumeric(passwordPolicy.MinimumLength + 2, includes: "!@#%^"); var (salt, hash) = passwordService.HashPassword(password); diff --git a/Endpoint/Controllers/V1/SecurityController.cs b/Endpoint/Controllers/V1/SecurityController.cs new file mode 100644 index 0000000..165bd85 --- /dev/null +++ b/Endpoint/Controllers/V1/SecurityController.cs @@ -0,0 +1,26 @@ +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using Mirea.Api.Dto.Common; +using Mirea.Api.Endpoint.Common.Attributes; +using Mirea.Api.Endpoint.Common.MapperDto; +using Mirea.Api.Endpoint.Configuration.Model; +using QRCoder; +using System; +using System.Drawing; + +namespace Mirea.Api.Endpoint.Controllers.V1; + +[ApiVersion("1.0")] +public class SecurityController(IOptionsSnapshot generalConfig) : BaseController +{ + /// + /// Retrieves the current password policy for user authentication. + /// + /// + /// The current password policy + /// + [HttpGet("PasswordPolicy")] + public ActionResult PasswordPolicy() => + Ok(generalConfig.Value.PasswordPolicy.ConvertToDto()); +} \ No newline at end of file diff --git a/Security/Common/Domain/PasswordPolicy.cs b/Security/Common/Domain/PasswordPolicy.cs new file mode 100644 index 0000000..fd1ee57 --- /dev/null +++ b/Security/Common/Domain/PasswordPolicy.cs @@ -0,0 +1,15 @@ +namespace Mirea.Api.Security.Common.Domain; + +public class PasswordPolicy( + int minimumLength = 8, + bool requireLetter = true, + bool requireLettersDifferentCase = true, + bool requireDigit = true, + bool requireSpecialCharacter = true) +{ + public int MinimumLength { get; set; } = minimumLength; + public bool RequireLetter { get; set; } = requireLetter; + public bool RequireLettersDifferentCase { get; set; } = requireLettersDifferentCase; + public bool RequireDigit { get; set; } = requireDigit; + public bool RequireSpecialCharacter { get; set; } = requireSpecialCharacter; +} \ No newline at end of file diff --git a/Security/Services/PasswordHashService.cs b/Security/Services/PasswordHashService.cs index df16f75..8673222 100644 --- a/Security/Services/PasswordHashService.cs +++ b/Security/Services/PasswordHashService.cs @@ -1,11 +1,10 @@ using Konscious.Security.Cryptography; using System; using System.Text; -using System.Text.RegularExpressions; namespace Mirea.Api.Security.Services; -public partial class PasswordHashService +public class PasswordHashService { public int SaltSize { private get; init; } public int HashSize { private get; init; } @@ -54,15 +53,4 @@ public partial class PasswordHashService public bool VerifyPassword(string password, string saltBase64, string hashBase64) => VerifyPassword(password, Convert.FromBase64String(saltBase64), Convert.FromBase64String(hashBase64)); - - public static bool HasPasswordInPolicySecurity(string password) => - password.Length >= 8 && - PasswordExistSpecialSymbol().IsMatch(password) && - PasswordExistUpperLetter().IsMatch(password); - - [GeneratedRegex("[A-Z]+")] - private static partial Regex PasswordExistUpperLetter(); - - [GeneratedRegex("[!@#$%^&*]+")] - private static partial Regex PasswordExistSpecialSymbol(); } \ No newline at end of file diff --git a/Security/Services/PasswordPolicyService.cs b/Security/Services/PasswordPolicyService.cs new file mode 100644 index 0000000..63f421e --- /dev/null +++ b/Security/Services/PasswordPolicyService.cs @@ -0,0 +1,40 @@ +using Mirea.Api.Security.Common.Domain; +using System.Linq; +using System.Security; + +namespace Mirea.Api.Security.Services; + +public class PasswordPolicyService(PasswordPolicy policy) +{ + public void ValidatePasswordOrThrow(string password) + { + if (password.Length < policy.MinimumLength) + throw new SecurityException($"Password must be at least {policy.MinimumLength} characters long."); + + if (policy.RequireLetter && !password.Any(char.IsLetter)) + throw new SecurityException("Password must contain at least one letter."); + + if (policy.RequireLettersDifferentCase && !password.Any(char.IsLower) && !password.Any(char.IsUpper)) + throw new SecurityException("Password must contain at least one lowercase and uppercase letter."); + + if (policy.RequireDigit && !password.Any(char.IsDigit)) + throw new SecurityException("Password must contain at least one digit."); + + if (policy.RequireSpecialCharacter && password.All(char.IsLetterOrDigit)) + throw new SecurityException("Password must contain at least one special character."); + } + + public bool TryValidatePassword(string password) + { + try + { + ValidatePasswordOrThrow(password); + } + catch + { + return false; + } + + return true; + } +} \ No newline at end of file