Unify picture configuration and options registration
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using System.Security.Cryptography;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.IdentityModel.JsonWebTokens;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Musify.StreamingGateway.Configuration;
|
||||
@@ -15,14 +14,14 @@ public sealed record TicketValidationResult(string Prefix, long? MaxBytes)
|
||||
|
||||
public sealed class TicketValidator : IDisposable
|
||||
{
|
||||
private readonly StreamTicketValidationOptions _options;
|
||||
private readonly StreamTicketValidationConfiguration _options;
|
||||
private readonly RSA _rsa;
|
||||
private readonly TokenValidationParameters _validationParameters;
|
||||
private readonly JsonWebTokenHandler _handler = new();
|
||||
|
||||
public TicketValidator(IOptions<StreamTicketValidationOptions> options)
|
||||
public TicketValidator(StreamTicketValidationConfiguration options)
|
||||
{
|
||||
_options = options.Value;
|
||||
_options = options;
|
||||
|
||||
_rsa = RSA.Create();
|
||||
_rsa.ImportFromPem(File.ReadAllText(_options.PublicKeyPath));
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Musify.StreamingGateway.Configuration;
|
||||
|
||||
public sealed class StreamTicketValidationOptions
|
||||
public sealed class StreamTicketValidationConfiguration
|
||||
{
|
||||
public const string SectionName = "StreamTicket";
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.Extensions.Primitives;
|
||||
using Microsoft.Net.Http.Headers;
|
||||
using Musify.StreamingGateway.Authentication;
|
||||
@@ -9,11 +8,9 @@ namespace Musify.StreamingGateway.Middleware;
|
||||
public sealed class TicketValidationMiddleware(
|
||||
RequestDelegate next,
|
||||
TicketValidator ticketValidator,
|
||||
IOptions<StreamTicketValidationOptions> options,
|
||||
StreamTicketValidationConfiguration options,
|
||||
ILogger<TicketValidationMiddleware> logger)
|
||||
{
|
||||
private readonly StreamTicketValidationOptions options = options.Value;
|
||||
|
||||
public async Task InvokeAsync(HttpContext context)
|
||||
{
|
||||
var path = context.Request.Path;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Microsoft.Extensions.Options;
|
||||
using Musify.StreamingGateway.Authentication;
|
||||
using Musify.StreamingGateway.Configuration;
|
||||
using Musify.StreamingGateway.Middleware;
|
||||
@@ -5,11 +6,14 @@ using Musify.StreamingGateway.Middleware;
|
||||
var builder = WebApplication.CreateBuilder();
|
||||
|
||||
builder.Services
|
||||
.AddOptions<StreamTicketValidationOptions>()
|
||||
.Bind(builder.Configuration.GetRequiredSection(StreamTicketValidationOptions.SectionName))
|
||||
.AddOptions<StreamTicketValidationConfiguration>()
|
||||
.Bind(builder.Configuration.GetRequiredSection(StreamTicketValidationConfiguration.SectionName))
|
||||
.ValidateDataAnnotations()
|
||||
.ValidateOnStart();
|
||||
|
||||
builder.Services.AddSingleton(serviceProvider =>
|
||||
serviceProvider.GetRequiredService<IOptions<StreamTicketValidationConfiguration>>().Value);
|
||||
|
||||
builder.Services.AddSingleton<TicketValidator>();
|
||||
|
||||
const string corsPolicy = "media-clients";
|
||||
|
||||
Reference in New Issue
Block a user