Started testing oauth2 handler from mooncore
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System.Text.Json;
|
||||
using MoonCore.Authentication;
|
||||
using MoonCore.Exceptions;
|
||||
using MoonCore.Extended.Abstractions;
|
||||
using MoonCore.Extended.Extensions;
|
||||
using MoonCore.Extended.Helpers;
|
||||
@@ -8,6 +9,7 @@ using MoonCore.Helpers;
|
||||
using Moonlight.ApiServer.Configuration;
|
||||
using Moonlight.ApiServer.Database.Entities;
|
||||
using Moonlight.ApiServer.Helpers;
|
||||
using Moonlight.ApiServer.Interfaces.OAuth2;
|
||||
using Moonlight.ApiServer.Interfaces.Startup;
|
||||
|
||||
namespace Moonlight.ApiServer;
|
||||
@@ -20,7 +22,7 @@ public static class Startup
|
||||
{
|
||||
// Create logging path
|
||||
Directory.CreateDirectory(PathBuilder.Dir("storage", "logs"));
|
||||
|
||||
|
||||
// Configure application logging
|
||||
builder.Logging.ClearProviders();
|
||||
|
||||
@@ -60,8 +62,9 @@ public static class Startup
|
||||
|
||||
#region Token Authentication
|
||||
|
||||
public static Task ConfigureTokenAuthentication(IHostApplicationBuilder builder, AppConfiguration config)
|
||||
public static Task ConfigureTokenAuthentication(WebApplicationBuilder builder, AppConfiguration config)
|
||||
{
|
||||
/*
|
||||
builder.Services.AddTokenAuthentication(configuration =>
|
||||
{
|
||||
configuration.AccessSecret = config.Authentication.AccessSecret;
|
||||
@@ -89,14 +92,123 @@ public static class Startup
|
||||
|
||||
return true;
|
||||
};
|
||||
});*/
|
||||
|
||||
builder.AddTokenAuthentication(authenticationConfig =>
|
||||
{
|
||||
authenticationConfig.AccessSecret = config.Authentication.AccessSecret;
|
||||
authenticationConfig.RefreshSecret = config.Authentication.RefreshSecret;
|
||||
|
||||
authenticationConfig.AccessDuration = config.Authentication.AccessDuration;
|
||||
authenticationConfig.RefreshDuration = config.Authentication.RefreshDuration;
|
||||
|
||||
authenticationConfig.ProcessAccess = (accessData, provider, httpContext) =>
|
||||
{
|
||||
if (!accessData.TryGetValue("userId", out var userIdStr) || !userIdStr.TryGetInt32(out var userId))
|
||||
return Task.FromResult(false);
|
||||
|
||||
var userRepo = provider.GetRequiredService<DatabaseRepository<User>>();
|
||||
var user = userRepo.Get().FirstOrDefault(x => x.Id == userId);
|
||||
|
||||
if (user == null)
|
||||
return Task.FromResult(false);
|
||||
|
||||
// Load permissions, handle empty values
|
||||
var permissions = JsonSerializer.Deserialize<string[]>(
|
||||
string.IsNullOrEmpty(user.PermissionsJson) ? "[]" : user.PermissionsJson
|
||||
) ?? [];
|
||||
|
||||
// Save permission state
|
||||
httpContext.User = new PermClaimsPrinciple(permissions)
|
||||
{
|
||||
IdentityModel = user
|
||||
};
|
||||
|
||||
return Task.FromResult(true);
|
||||
};
|
||||
|
||||
authenticationConfig.ProcessRefresh = (oldData, newData, serviceProvider) =>
|
||||
{
|
||||
var oauth2Providers = serviceProvider.GetRequiredService<IOAuth2Provider[]>();
|
||||
|
||||
// Find oauth2 provider
|
||||
var provider = oauth2Providers.FirstOrDefault();
|
||||
|
||||
if (provider == null)
|
||||
throw new HttpApiException("No oauth2 provider has been registered", 500);
|
||||
|
||||
// Check if the userId is present in the refresh token
|
||||
if (!oldData.TryGetValue("userId", out var userIdStr) ||
|
||||
!userIdStr.TryGetInt32(out var userId))
|
||||
{
|
||||
return Task.FromResult(false);
|
||||
}
|
||||
|
||||
// Load user from database if existent
|
||||
var userRepo = serviceProvider.GetRequiredService<DatabaseRepository<User>>();
|
||||
|
||||
var user = userRepo
|
||||
.Get()
|
||||
.FirstOrDefault(x => x.Id == userId);
|
||||
|
||||
if (user == null)
|
||||
return Task.FromResult(false);
|
||||
|
||||
// Allow plugins to intercept the refresh call
|
||||
//if (AuthInterceptors.Any(interceptor => !interceptor.AllowRefresh(user, serviceProvider)))
|
||||
// return false;
|
||||
|
||||
/*
|
||||
|
||||
// Check if it's time to resync with the oauth2 provider
|
||||
if (DateTime.UtcNow >= user.RefreshTimestamp)
|
||||
{
|
||||
try
|
||||
{
|
||||
// It's time to refresh the access to the external oauth2 provider
|
||||
var refreshData = OAuth2Service.RefreshAccess(user.RefreshToken).Result;
|
||||
|
||||
// Sync user with oauth2 provider
|
||||
var syncedUser = provider.Sync(serviceProvider, refreshData.AccessToken).Result;
|
||||
|
||||
if (syncedUser == null) // User sync has failed. No refresh allowed
|
||||
return false;
|
||||
|
||||
// Save oauth2 refresh and access tokens for later use (re-authentication etc.).
|
||||
// Fetch user model in current db context, just in case the oauth2 provider
|
||||
// uses a different db context or smth
|
||||
|
||||
var userModel = UserRepository
|
||||
.Get()
|
||||
.First(x => x.Id == syncedUser.Id);
|
||||
|
||||
userModel.AccessToken = refreshData.AccessToken;
|
||||
userModel.RefreshToken = refreshData.RefreshToken;
|
||||
userModel.RefreshTimestamp = DateTime.UtcNow.AddSeconds(refreshData.ExpiresIn);
|
||||
|
||||
UserRepository.Update(userModel);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// We are handling this error more softly, because it will occur when a user hasn't logged in a long period of time
|
||||
Logger.LogDebug("An error occured while refreshing external oauth2 access: {e}", e);
|
||||
return false;
|
||||
}
|
||||
}*/
|
||||
|
||||
// All checks have passed, allow refresh
|
||||
newData.Add("userId", user.Id);
|
||||
return Task.FromResult(true);
|
||||
};
|
||||
});
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public static Task UseTokenAuthentication(IApplicationBuilder builder)
|
||||
public static Task UseTokenAuthentication(WebApplication builder)
|
||||
{
|
||||
builder.UseTokenAuthentication();
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -140,9 +252,9 @@ public static class Startup
|
||||
|
||||
#region OAuth2
|
||||
|
||||
public static Task ConfigureOAuth2(IHostApplicationBuilder builder, ILogger logger, AppConfiguration config)
|
||||
public static Task ConfigureOAuth2(WebApplicationBuilder builder, ILogger logger, AppConfiguration config)
|
||||
{
|
||||
builder.Services.AddOAuth2Consumer(configuration =>
|
||||
builder.AddOAuth2Consumer(configuration =>
|
||||
{
|
||||
configuration.ClientId = config.Authentication.OAuth2.ClientId;
|
||||
configuration.ClientSecret = config.Authentication.OAuth2.ClientSecret;
|
||||
@@ -168,6 +280,34 @@ public static class Startup
|
||||
configuration.AuthorizationEndpoint = config.Authentication.OAuth2.AuthorizationUri!;
|
||||
}
|
||||
});
|
||||
|
||||
/*
|
||||
builder.Services.AddOAuth2Consumer(configuration =>
|
||||
{
|
||||
configuration.ClientId = config.Authentication.OAuth2.ClientId;
|
||||
configuration.ClientSecret = config.Authentication.OAuth2.ClientSecret;
|
||||
configuration.AuthorizationRedirect =
|
||||
config.Authentication.OAuth2.AuthorizationRedirect ?? $"{config.PublicUrl}/auth";
|
||||
|
||||
configuration.AccessEndpoint =
|
||||
config.Authentication.OAuth2.AccessEndpoint ?? $"{config.PublicUrl}/oauth2/access";
|
||||
configuration.RefreshEndpoint =
|
||||
config.Authentication.OAuth2.RefreshEndpoint ?? $"{config.PublicUrl}/oauth2/refresh";
|
||||
|
||||
if (config.Authentication.UseLocalOAuth2)
|
||||
{
|
||||
configuration.AuthorizationEndpoint = config.Authentication.OAuth2.AuthorizationRedirect ??
|
||||
$"{config.PublicUrl}/oauth2/authorize";
|
||||
}
|
||||
else
|
||||
{
|
||||
if (config.Authentication.OAuth2.AuthorizationUri == null)
|
||||
logger.LogWarning(
|
||||
"The 'AuthorizationUri' for the oauth2 client is not set. If you want to use an external oauth2 provider, you need to specify this url. If you want to use the local oauth2 service, set 'UseLocalOAuth2Service' to true");
|
||||
|
||||
configuration.AuthorizationEndpoint = config.Authentication.OAuth2.AuthorizationUri!;
|
||||
}
|
||||
});*/
|
||||
|
||||
if (!config.Authentication.UseLocalOAuth2) return Task.CompletedTask;
|
||||
|
||||
@@ -190,5 +330,11 @@ public static class Startup
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public static Task UseOAuth2(WebApplication application)
|
||||
{
|
||||
application.UseOAuth2Consumer();
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
Reference in New Issue
Block a user