This commit is contained in:
Kieran 2022-02-26 23:32:19 +00:00
parent b9f0c51d38
commit b1f5ca88f8
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
5 changed files with 1 additions and 28 deletions

View File

@ -1,12 +1,10 @@
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using VoidCat.Model; using VoidCat.Model;
using VoidCat.Services.Abstractions; using VoidCat.Services.Abstractions;
namespace VoidCat.Controllers.Admin; namespace VoidCat.Controllers.Admin;
[EnableCors(CorsPolicy.Auth)]
[Route("admin")] [Route("admin")]
[Authorize(Policy = Policies.RequireAdmin)] [Authorize(Policy = Policies.RequireAdmin)]
public class AdminController : Controller public class AdminController : Controller

View File

@ -10,7 +10,6 @@ using VoidCat.Services.Abstractions;
namespace VoidCat.Controllers; namespace VoidCat.Controllers;
[EnableCors(CorsPolicy.Auth)]
[Route("auth")] [Route("auth")]
public class AuthController : Controller public class AuthController : Controller
{ {

View File

@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -9,7 +8,6 @@ using VoidCat.Services.Abstractions;
namespace VoidCat.Controllers namespace VoidCat.Controllers
{ {
[EnableCors(CorsPolicy.Upload)]
[Route("upload")] [Route("upload")]
public class UploadController : Controller public class UploadController : Controller
{ {

View File

@ -9,10 +9,4 @@ public static class Roles
public static class Policies public static class Policies
{ {
public const string RequireAdmin = "RequireAdmin"; public const string RequireAdmin = "RequireAdmin";
}
public static class CorsPolicy
{
public const string Auth = "auth";
public const string Upload = "upload";
} }

View File

@ -41,22 +41,6 @@ services.AddCors(opt =>
.AllowAnyHeader() .AllowAnyHeader()
.WithOrigins(voidSettings.CorsOrigins.Select(a => a.OriginalString).ToArray()); .WithOrigins(voidSettings.CorsOrigins.Select(a => a.OriginalString).ToArray());
}); });
opt.AddPolicy(CorsPolicy.Upload, p =>
{
p.AllowCredentials()
.AllowAnyMethod()
.WithHeaders("V-Content-Type", "V-Filename", "V-Digest", "V-EditSecret", "Content-Type", "Authorization")
.WithOrigins(voidSettings.CorsOrigins.Select(a => a.OriginalString).ToArray());
});
opt.AddPolicy(CorsPolicy.Auth, p =>
{
p.AllowCredentials()
.AllowAnyMethod()
.WithHeaders("Content-Type", "Authorization")
.WithOrigins(voidSettings.CorsOrigins.Select(a => a.OriginalString).ToArray());
});
}); });
services.AddRouting(); services.AddRouting();