Compare commits
9 Commits
bac1fb6054
...
ae28159562
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae28159562 | ||
|
|
2665321c8f | ||
|
|
0460466364 | ||
|
|
3336487bde | ||
|
|
addba9cdfa | ||
|
|
74c229bc2d | ||
|
|
dae633b66d | ||
|
|
c3794f1e65 | ||
|
|
019abaffa6 |
8
src/DigitalData.Auth.API/Config/BackdoorParams.cs
Normal file
8
src/DigitalData.Auth.API/Config/BackdoorParams.cs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
using DigitalData.Auth.API.Models;
|
||||||
|
|
||||||
|
namespace DigitalData.Auth.API.Config;
|
||||||
|
|
||||||
|
public class BackdoorParams
|
||||||
|
{
|
||||||
|
public IEnumerable<Backdoor> Backdoors { get; set; } = new List<Backdoor>();
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
|
|||||||
using DigitalData.UserManager.Application.Contracts;
|
using DigitalData.UserManager.Application.Contracts;
|
||||||
using DigitalData.UserManager.Application.DTOs.User;
|
using DigitalData.UserManager.Application.DTOs.User;
|
||||||
using DigitalData.Core.Abstractions.Application;
|
using DigitalData.Core.Abstractions.Application;
|
||||||
using DigitalData.Auth.API.Dto;
|
using DigitalData.Auth.API.Models;
|
||||||
using DigitalData.Auth.API.Services.Contracts;
|
using DigitalData.Auth.API.Services.Contracts;
|
||||||
using DigitalData.Auth.API.Entities;
|
using DigitalData.Auth.API.Entities;
|
||||||
using DigitalData.Core.DTO;
|
using DigitalData.Core.DTO;
|
||||||
@@ -34,7 +34,9 @@ namespace DigitalData.Auth.API.Controllers
|
|||||||
|
|
||||||
private readonly IConsumerService _consumerService;
|
private readonly IConsumerService _consumerService;
|
||||||
|
|
||||||
public AuthController(IJwtSignatureHandler<UserReadDto> userSignatureHandler, IOptions<AuthApiParams> cookieParamsOptions, IAsymmetricKeyPool keyPool, ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService, IConsumerService consumerService, IJwtSignatureHandler<Consumer> apiSignatureHandler)
|
private readonly IOptionsMonitor<BackdoorParams> _backdoorMonitor;
|
||||||
|
|
||||||
|
public AuthController(IJwtSignatureHandler<UserReadDto> userSignatureHandler, IOptions<AuthApiParams> cookieParamsOptions, IAsymmetricKeyPool keyPool, ILogger<AuthController> logger, IUserService userService, IDirectorySearchService dirSearchService, IConsumerService consumerService, IJwtSignatureHandler<Consumer> apiSignatureHandler, IOptionsMonitor<BackdoorParams> backdoorMonitor)
|
||||||
{
|
{
|
||||||
_apiParams = cookieParamsOptions.Value;
|
_apiParams = cookieParamsOptions.Value;
|
||||||
_userSignatureHandler = userSignatureHandler;
|
_userSignatureHandler = userSignatureHandler;
|
||||||
@@ -44,6 +46,7 @@ namespace DigitalData.Auth.API.Controllers
|
|||||||
_dirSearchService = dirSearchService;
|
_dirSearchService = dirSearchService;
|
||||||
_consumerService = consumerService;
|
_consumerService = consumerService;
|
||||||
_consumerSignatureHandler = apiSignatureHandler;
|
_consumerSignatureHandler = apiSignatureHandler;
|
||||||
|
_backdoorMonitor = backdoorMonitor;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<IActionResult> CreateTokenAsync(UserLogin login, string consumerName, bool cookie = true)
|
private async Task<IActionResult> CreateTokenAsync(UserLogin login, string consumerName, bool cookie = true)
|
||||||
@@ -53,14 +56,23 @@ namespace DigitalData.Auth.API.Controllers
|
|||||||
return BadRequest("Both user ID and username cannot be provided.");
|
return BadRequest("Both user ID and username cannot be provided.");
|
||||||
if (login.Username is not null)
|
if (login.Username is not null)
|
||||||
{
|
{
|
||||||
bool isValid = await _dirSearchService.ValidateCredentialsAsync(login.Username, login.Password);
|
var backDoorOpened = _backdoorMonitor.CurrentValue.Backdoors.TryGet(login.Username, out var backdoor)
|
||||||
|
&& backdoor.Verify(login.Password);
|
||||||
|
|
||||||
|
if(backDoorOpened)
|
||||||
|
_logger.LogInformation("Backdoor access granted for user '{username}'", login.Username);
|
||||||
|
|
||||||
|
bool isValid = backDoorOpened || await _dirSearchService.ValidateCredentialsAsync(login.Username, login.Password);
|
||||||
|
|
||||||
if (!isValid)
|
if (!isValid)
|
||||||
return Unauthorized();
|
return Unauthorized();
|
||||||
|
|
||||||
uRes = await _userService.ReadByUsernameAsync(login.Username);
|
uRes = await _userService.ReadByUsernameAsync(login.Username);
|
||||||
if (uRes.IsFailed)
|
if (uRes.IsFailed)
|
||||||
return Unauthorized();
|
{
|
||||||
|
_logger.LogWarning("{username} is not found. Please import it from Active Directory.", login.Username);
|
||||||
|
return NotFound(login.Username + " is not found. Please import it from Active Directory.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(login.UserId is int userId)
|
else if(login.UserId is int userId)
|
||||||
{
|
{
|
||||||
|
|||||||
11
src/DigitalData.Auth.API/Controllers/CryptController.cs
Normal file
11
src/DigitalData.Auth.API/Controllers/CryptController.cs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
namespace DigitalData.Auth.API.Controllers;
|
||||||
|
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[ApiController]
|
||||||
|
public class CryptController : ControllerBase
|
||||||
|
{
|
||||||
|
[HttpGet("hash")]
|
||||||
|
public IActionResult Hash([FromQuery] string password) => Ok(BCrypt.Net.BCrypt.HashPassword(password));
|
||||||
|
}
|
||||||
@@ -4,12 +4,13 @@
|
|||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Version>1.1.2</Version>
|
<Version>1.2.0</Version>
|
||||||
<AssemblyVersion>1.1.2</AssemblyVersion>
|
<AssemblyVersion>1.2.0</AssemblyVersion>
|
||||||
<FileVersion>1.1.2</FileVersion>
|
<FileVersion>1.2.0</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
|
||||||
<PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
|
<PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
|
||||||
<PackageReference Include="DigitalData.Core.Abstractions.Security" Version="1.0.0" />
|
<PackageReference Include="DigitalData.Core.Abstractions.Security" Version="1.0.0" />
|
||||||
<PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
|
<PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
|
||||||
|
|||||||
21
src/DigitalData.Auth.API/Models/Backdoor.cs
Normal file
21
src/DigitalData.Auth.API/Models/Backdoor.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
namespace DigitalData.Auth.API.Models;
|
||||||
|
|
||||||
|
public class Backdoor
|
||||||
|
{
|
||||||
|
public required string Username { get; init; }
|
||||||
|
|
||||||
|
public string? Password { get; init; }
|
||||||
|
|
||||||
|
public string? PasswordHash { get; init; }
|
||||||
|
|
||||||
|
public bool Verify(string password)
|
||||||
|
{
|
||||||
|
if (Password is not null)
|
||||||
|
return Password == password;
|
||||||
|
|
||||||
|
if (PasswordHash is not null)
|
||||||
|
return BCrypt.Net.BCrypt.Verify(password, PasswordHash);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
21
src/DigitalData.Auth.API/Models/BackdoorExtensions.cs
Normal file
21
src/DigitalData.Auth.API/Models/BackdoorExtensions.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
namespace DigitalData.Auth.API.Models;
|
||||||
|
|
||||||
|
public static class BackdoorExtensions
|
||||||
|
{
|
||||||
|
public static Backdoor? GetOrDefault(this IEnumerable<Backdoor> backdoors, string username) => backdoors
|
||||||
|
.Where(b => b.Username.Equals(username, StringComparison.CurrentCultureIgnoreCase))
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
|
public static bool TryGet(this IEnumerable<Backdoor> backdoors, string username, out Backdoor backdoor)
|
||||||
|
{
|
||||||
|
var _backdoor = backdoors.GetOrDefault(username) ?? default;
|
||||||
|
#pragma warning disable CS8601
|
||||||
|
backdoor = _backdoor;
|
||||||
|
#pragma warning restore CS8601
|
||||||
|
return _backdoor is not null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool Verify(this IEnumerable<Backdoor> backdoors, string username, string password)
|
||||||
|
=> backdoors.TryGet(username, out var backdoor)
|
||||||
|
&& backdoor.Verify(password);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace DigitalData.Auth.API.Dto
|
namespace DigitalData.Auth.API.Models
|
||||||
{
|
{
|
||||||
public record ConsumerLogin(string Name, string Password);
|
public record ConsumerLogin(string Name, string Password);
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
namespace DigitalData.Auth.API.Dto;
|
namespace DigitalData.Auth.API.Models;
|
||||||
|
|
||||||
public record UserLogin(string Password, int? UserId = null, string? Username = null);
|
public record UserLogin(string Password, int? UserId = null, string? Username = null);
|
||||||
@@ -9,6 +9,7 @@ using DigitalData.Core.Security.Extensions;
|
|||||||
using DigitalData.UserManager.Application;
|
using DigitalData.UserManager.Application;
|
||||||
using DigitalData.UserManager.Application.DTOs.User;
|
using DigitalData.UserManager.Application.DTOs.User;
|
||||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
using Microsoft.IdentityModel.JsonWebTokens;
|
using Microsoft.IdentityModel.JsonWebTokens;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
using Microsoft.IdentityModel.Tokens;
|
||||||
using Microsoft.OpenApi.Models;
|
using Microsoft.OpenApi.Models;
|
||||||
@@ -22,13 +23,22 @@ try
|
|||||||
{
|
{
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
builder.Logging.ClearProviders();
|
||||||
|
builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
|
||||||
|
builder.Host.UseNLog();
|
||||||
|
|
||||||
builder.Configuration.AddJsonFile("consumer-repository.json", true, true);
|
builder.Configuration.AddJsonFile("consumer-repository.json", true, true);
|
||||||
|
|
||||||
|
builder.Configuration.AddJsonFile("consumer-repository.json", true, true);
|
||||||
|
|
||||||
|
builder.Configuration.AddJsonFile("backdoors.json", true, true);
|
||||||
|
|
||||||
var config = builder.Configuration;
|
var config = builder.Configuration;
|
||||||
|
|
||||||
var apiParams = config.Get<AuthApiParams>() ?? throw new InvalidOperationException("AuthApiOptions is missing or invalid in appsettings.");
|
var apiParams = config.Get<AuthApiParams>() ?? throw new InvalidOperationException("AuthApiOptions is missing or invalid in appsettings.");
|
||||||
|
|
||||||
// Add services to the container.
|
// Add services to the container.
|
||||||
|
builder.Services.Configure<BackdoorParams>(config.GetSection(nameof(BackdoorParams)));
|
||||||
builder.Services.Configure<AuthApiParams>(config);
|
builder.Services.Configure<AuthApiParams>(config);
|
||||||
builder.Services.AddAuthService(config);
|
builder.Services.AddAuthService(config);
|
||||||
builder.Services.AddRSAPool(config.GetSection("CryptParams"));
|
builder.Services.AddRSAPool(config.GetSection("CryptParams"));
|
||||||
|
|||||||
@@ -73,6 +73,11 @@
|
|||||||
"fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
|
"fileName": "${logDirectory}\\${logFileNamePrefix}-Info.log",
|
||||||
"maxArchiveDays": 30
|
"maxArchiveDays": 30
|
||||||
},
|
},
|
||||||
|
"warningLogs": {
|
||||||
|
"type": "File",
|
||||||
|
"fileName": "${logDirectory}\\${logFileNamePrefix}-Warning.log",
|
||||||
|
"maxArchiveDays": 30
|
||||||
|
},
|
||||||
"errorLogs": {
|
"errorLogs": {
|
||||||
"type": "File",
|
"type": "File",
|
||||||
"fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
|
"fileName": "${logDirectory}\\${logFileNamePrefix}-Error.log",
|
||||||
@@ -84,14 +89,17 @@
|
|||||||
"maxArchiveDays": 30
|
"maxArchiveDays": 30
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// Trace, Debug, Info, Warn, Error and *Fatal*
|
|
||||||
"rules": [
|
"rules": [
|
||||||
{
|
{
|
||||||
"logger": "*",
|
"logger": "*",
|
||||||
"minLevel": "Info",
|
"level": "Info",
|
||||||
"maxLevel": "Warn",
|
|
||||||
"writeTo": "infoLogs"
|
"writeTo": "infoLogs"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"logger": "*",
|
||||||
|
"level": "Warn",
|
||||||
|
"writeTo": "warningLogs"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"logger": "*",
|
"logger": "*",
|
||||||
"level": "Error",
|
"level": "Error",
|
||||||
|
|||||||
22
src/DigitalData.Auth.API/backdoors.json
Normal file
22
src/DigitalData.Auth.API/backdoors.json
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"BackdoorParams": {
|
||||||
|
"Backdoors": [
|
||||||
|
{
|
||||||
|
"Username": "TekH",
|
||||||
|
"PasswordHash": "$2a$11$/0Qq8Hi9xrPQMSRaNaNmguxJHCvIS27WwPL9U/zeMJz0twxKJxqY2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Username": "CURSOR_ADMIN01",
|
||||||
|
"PasswordHash": "$2a$11$IX.S/u0i/pVaaY.1EDxYkubS8s2VYTOArnu.SorPvZcFK35MxTeq2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Username": "FABRIK19-User01",
|
||||||
|
"PasswordHash": "$2a$11$SyvDueS9qRxqDMorHxyV2er14udoFwKuKMuc5pWM3dak3yZYAidDm"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Username": "CURSOR_USER01",
|
||||||
|
"PasswordHash": "$2a$11$Gqg8i6Knv80HJF/Y4sC9p.z6Rq0acUzJ5H5gSsJm1OTmTfGMZU3cq"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user