tudor.stanciu
/
network-resurrector
mirror of https://dev.azure.com/tstanciu94/NetworkResurrector/_git/NetworkResurrector
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Integration with inhouse identity server

master
Tudor Stanciu 2020-12-21 01:21:21 +02:00
parent e3ce6fc694
commit c89e07d146
13 changed files with 28 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NetworkResurrector.Api/Authentication/BasicAuthenticationHandler.cs
View File

@ -1,8 +1,8 @@
using Microsoft.AspNetCore.Authentication;
using IdentityServer.PublishedLanguage.Dto;
using IdentityServer.Wrapper.Services;
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NetworkResurrector.Application.Services;
using NetworkResurrector.Domain.Entities;
using System.Net.Http.Headers;
using System.Security.Claims;
using System.Text.Encodings.Web;
@ -12,12 +12,12 @@ namespace NetworkResurrector.Api.Authentication
{
public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
{
private readonly IUserService _userService;
private readonly IIdentityService _identityService;
public BasicAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IUserService userService)
public BasicAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IIdentityService identityService)
: base(options, logger, encoder, clock)
{
_userService = userService;
_identityService = identityService;
}
protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
@ -30,7 +30,7 @@ namespace NetworkResurrector.Api.Authentication
{
var authorizationHeader = AuthenticationHeaderValue.Parse(Request.Headers["Authorization"]);
var token = authorizationHeader.Parameter;
user = await _userService.Authenticate(token);
user = await _identityService.Authorize(token);
}
catch
{

15
NetworkResurrector.Api/Controllers/ResurrectorController.cs
View File

@ -2,7 +2,6 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NetworkResurrector.Application.Commands;
using NetworkResurrector.Application.Queries;
using System.Threading.Tasks;
namespace NetworkResurrector.Api.Controllers
@ -19,20 +18,6 @@ namespace NetworkResurrector.Api.Controllers
_mediator = mediator;
}
[AllowAnonymous]
[HttpGet("token/{userName}/{password}")]
public async Task<IActionResult> GetToken([FromRoute] GetToken.Query query)
{
var result = await _mediator.Send(query);
return Ok(result);
}
[HttpGet("validate-token")]
public IActionResult ValidateToken()
{
return Ok("Valid");
}
[HttpPost("wake")]
public async Task<IActionResult> WakeMachine([FromBody] WakeMachine wakeMachine)
{

3
NetworkResurrector.Api/NetworkResurrector.Api.csproj
View File

@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IdentityServer.Wrapper" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsPackageVersion)" />

6
NetworkResurrector.Api/Startup.cs
View File

@ -1,4 +1,5 @@
using AutoMapper;
using IdentityServer.Wrapper;
using MediatR;
using MediatR.Pipeline;
using Microsoft.AspNetCore.Authentication;
@ -44,6 +45,9 @@ namespace NetworkResurrector.Api
services.AddAutoMapper(
typeof(Application.Mappings.MappingProfile).Assembly);
// Identity server
services.UseIdentityServices(_configuration.GetSection("IdentityServer")["BaseAddress"]);
// Swagger
services.AddSwagger("NetworkResurrector API");
@ -80,7 +84,7 @@ namespace NetworkResurrector.Api
private Assembly[] GetMediatRAssemblies()
{
var assembly = typeof(Application.Queries.GetToken).Assembly;
var assembly = typeof(Application.Commands.WakeMachine).Assembly;
return new Assembly[] { assembly };
}
}

14
NetworkResurrector.Api/appsettings.json
View File

@ -11,20 +11,14 @@
}
},
"AllowedHosts": "*",
"Users": [
{
"UserId": 1,
"UserName": "***REMOVED***",
"Password": "***REMOVED***"
}
],
"IdentityServer": {
"BaseAddress": "http://localhost:5063/"
},
"WakeOnLan": {
"Provider": {
"Use": "Inhouse",
"Options": [ "Inhouse", "Nikeee" ]
}
},
"Shutdown": {
}
"Shutdown": { }
}

1
NetworkResurrector.Application/DependencyInjectionExtensions.cs
View File

@ -10,7 +10,6 @@ namespace NetworkResurrector.Application
public static void AddApplicationServices(this IServiceCollection services)
{
services.AddSingleton<IParamProvider, ParamProvider>();
services.AddScoped<IUserService, UserService>();
services.AddStores();
services.AddSingleton<IValidationService, ValidationService>();
services.AddSingleton<IPingService, PingService>();

4
NetworkResurrector.Application/Mappings/MappingProfile.cs
View File

@ -1,6 +1,4 @@
using AutoMapper;
using NetworkResurrector.Application.Queries;
using NetworkResurrector.Domain.Models;
namespace NetworkResurrector.Application.Mappings
{
@ -8,7 +6,7 @@ namespace NetworkResurrector.Application.Mappings
{
public MappingProfile()
{
CreateMap<SecurityToken, GetToken.Model>();
// Add mappings here
}
}
}

7
NetworkResurrector.Application/Queries/GetServiceVersion.cs Normal file
View File

@ -0,0 +1,7 @@
namespace NetworkResurrector.Application.Queries
{
class GetServiceVersion
{
//TO DO
}
}

48
NetworkResurrector.Application/Queries/GetToken.cs
View File

@ -1,48 +0,0 @@
using AutoMapper;
using MediatR;
using NDB.Application.DataContracts;
using NetworkResurrector.Application.Services;
using System;
using System.Threading;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.Queries
{
public class GetToken
{
public class Query : Query<Model>
{
public string UserName { get; set; }
public string Password { get; set; }
public Query() { }
}
public class Model
{
public string Token { get; set; }
public DateTime ValidUntil { get; set; }
}
public class QueryHandler : IRequestHandler<Query, Model>
{
private readonly IUserService _userService;
private readonly IMapper _mapper;
public QueryHandler(IUserService userService, IMapper mapper)
{
_userService = userService;
_mapper = mapper;
}
public async Task<Model> Handle(Query request, CancellationToken cancellationToken)
{
var securityToken = await _userService.Login(request.UserName, request.Password);
if (securityToken == null)
return null;
var result = _mapper.Map<Model>(securityToken);
return result;
}
}
}
}

3
NetworkResurrector.Application/Services/ParamProvider.cs
View File

@ -1,5 +1,4 @@
using Microsoft.Extensions.Configuration;
using NetworkResurrector.Domain.Entities;
using NetworkResurrector.Domain.Services;
namespace NetworkResurrector.Application.Services
@ -13,6 +12,6 @@ namespace NetworkResurrector.Application.Services
_configuration = configuration;
}
public User[] Users => _configuration.GetSection("Users").Get<User[]>();
// public User[] Users => _configuration.GetSection("Users").Get<User[]>();
}
}

54
NetworkResurrector.Application/Services/UserService.cs
View File

@ -1,54 +0,0 @@
using NetworkResurrector.Application.Stores;
using NetworkResurrector.Domain.Entities;
using NetworkResurrector.Domain.Models;
using NetworkResurrector.Domain.Services;
using System;
using System.Linq;
using System.Threading.Tasks;
namespace NetworkResurrector.Application.Services
{
public interface IUserService
{
Task<SecurityToken> Login(string userName, string password);
Task<User> Authenticate(string token);
}
public class UserService : IUserService
{
private readonly IParamProvider _paramProvider;
private readonly ISecurityStore _securityStore;
public UserService(IParamProvider paramProvider, ISecurityStore securityStore)
{
_paramProvider = paramProvider;
_securityStore = securityStore;
}
public async Task<SecurityToken> Login(string userName, string password)
{
var user = _paramProvider.Users.FirstOrDefault(z => z.UserName == userName && z.Password == password);
if (user == null)
return null;
var token = $"{Guid.NewGuid()}-{Guid.NewGuid()}-{user.UserId}";
await Task.Run(() =>_securityStore.SetToken(token, user.UserId));
var securityToken = new SecurityToken() { UserId = user.UserId, Token = token };
return securityToken;
}
public async Task<User> Authenticate(string token)
{
var tokenValidation = await Task.Run(() => _securityStore.ValidateToken(token));
if (tokenValidation.Success)
{
var user = _paramProvider.Users.FirstOrDefault(z => z.UserId == tokenValidation.UserId);
if (user != null)
return user;
}
return null;
}
}
}

9
NetworkResurrector.Domain/Entities/User.cs
View File

@ -1,9 +0,0 @@
namespace NetworkResurrector.Domain.Entities
{
public class User
{
public int UserId { get; set; }
public string UserName { get; set; }
public string Password { get; set; }
}
}

5
NetworkResurrector.Domain/Services/IParamProvider.cs
View File

@ -1,9 +1,6 @@
using NetworkResurrector.Domain.Entities;
namespace NetworkResurrector.Domain.Services
namespace NetworkResurrector.Domain.Services
{
public interface IParamProvider
{
User[] Users { get; }
}
}