Add basic role and route for server hub admins.

SS14.Auth.Shared/AuthConstants.cs

@@ -2,6 +2,20 @@
 
 public static class AuthConstants
 {
+    /// <summary>
+    /// User has any admin role.
+    /// </summary>
+    public const string PolicyAnyHubAdmin = "AnyHubAdmin";
+
+    /// <summary>
+    /// User has the ability to mess with the accounts list and OAuth clients.
+    /// </summary>
     public const string PolicySysAdmin = "SysAdmin";
     public const string RoleSysAdmin = "SysAdmin";
+
+    /// <summary>
+    /// User has the ability to mess with the game server hub.
+    /// </summary>
+    public const string PolicyServerHubAdmin = "ServerHubAdmin";
+    public const string RoleServerHubAdmin = "ServerHubAdmin";
 }

SS14.Auth.Shared/Data/SpaceUser.cs

@@ -99,6 +99,9 @@ public sealed record AccountLogRecoveryCodesGenerated(Guid Actor) : AccountLogEn
 public sealed record AccountLogAdminNotesChanged(string NewNotes, Guid Actor) : AccountLogEntry;
 public sealed record AccountLogAdminLockedChanged(bool NewLocked, Guid Actor) : AccountLogEntry;
 
+public sealed record AccountLogAuthRoleAdded(Guid Role, Guid Actor) : AccountLogEntry;
+public sealed record AccountLogAuthRoleRemoved(Guid Role, Guid Actor) : AccountLogEntry;
+
 public enum AccountLogType
 {
     Created = 0,
@@ -115,4 +118,6 @@ public enum AccountLogType
     RecoveryCodesGenerated = 11,
     AdminNotesChanged = 12,
     AdminLockedChanged = 13,
+    AuthRoleAdded = 14,
+    AuthRoleRemoved = 15
 }

SS14.Auth.Shared/Data/SpaceUserManager.cs

@@ -91,14 +91,6 @@ public void LogPasswordChanged(SpaceUser user, SpaceUser actor)
             new AccountLogPasswordChanged(actor.Id));
     }
 
-    public void LogHubAdminChanged(SpaceUser user, bool newHubAdmin, SpaceUser actor)
-    {
-        AccountLog(
-            user, 
-            AccountLogType.HubAdminChanged,
-            new AccountLogHubAdminChanged(newHubAdmin, actor.Id));
-    }
-
     public void LogEmailConfirmedChanged(SpaceUser user, bool newEmailConfirmed, SpaceUser actor)
     {
         AccountLog(
@@ -139,6 +131,22 @@ public void LogAdminLockedChanged(SpaceUser user, bool newLocked, SpaceUser acto
             new AccountLogAdminLockedChanged(newLocked, actor.Id));
     }
 
+    public void LogAuthRoleAdded(SpaceUser user, Guid role, SpaceUser actor)
+    {
+        AccountLog(
+            user, 
+            AccountLogType.AuthRoleAdded,
+            new AccountLogAuthRoleAdded(role, actor.Id));
+    }
+
+    public void LogAuthRoleRemoved(SpaceUser user, Guid role, SpaceUser actor)
+    {
+        AccountLog(
+            user, 
+            AccountLogType.AuthRoleRemoved,
+            new AccountLogAuthRoleRemoved(role, actor.Id));
+    }
+
     public void AccountLog(SpaceUser user, AccountLogType type, AccountLogEntry entry)
     {
         _dbContext.AccountLogs.Add(new AccountLog

SS14.Auth/Services/EnsureRolesService.cs

@@ -17,7 +17,8 @@ namespace SS14.Auth.Services;
 public sealed class EnsureRolesService : IHostedService
 {
     private static readonly string[] RolesToEnsure = {
-        AuthConstants.RoleSysAdmin
+        AuthConstants.RoleSysAdmin,
+        AuthConstants.RoleServerHubAdmin
     };
 
     private readonly IServiceProvider _serviceProvider;
@@ -40,14 +41,14 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
         foreach (var roleName in RolesToEnsure)
         {
-            if (await roleManager.FindByNameAsync(AuthConstants.RoleSysAdmin) != null)
+            if (await roleManager.FindByNameAsync(roleName) != null)
                 continue;
 
             _logger.LogInformation("Creating role {Role} because it does not exist in the database yet", roleName);
 
             await roleManager.CreateAsync(new SpaceRole
             {
-                Name = AuthConstants.RoleSysAdmin
+                Name = roleName
             });
         }
 

SS14.Web/Areas/Admin/Pages/Index.cshtml

@@ -1,5 +1,9 @@
 @page
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@using SS14.Auth.Shared
 @model SS14.Web.Areas.Admin.Pages.Index
+@inject IAuthorizationService AuthorizationService
 
 @{
     ViewData["Title"] = "Hub Admin";
@@ -11,5 +15,13 @@
   </ol>
 </nav>
 
-<a asp-page="Users/Index" class="btn btn-primary">Users</a>
-<a asp-page="Clients/Index" class="btn btn-primary">OAuth Clients</a>
+@if ((await AuthorizationService.AuthorizeAsync(User, AuthConstants.PolicySysAdmin)).Succeeded)
+{
+    <a asp-page="Users/Index" class="btn btn-primary">Users</a>
+    <a asp-page="Clients/Index" class="btn btn-primary">OAuth Clients</a>
+}
+
+@if ((await AuthorizationService.AuthorizeAsync(User, AuthConstants.PolicyServerHubAdmin)).Succeeded)
+{
+    <a asp-page="Servers/Index" class="btn btn-primary">Servers</a>
+}

SS14.Web/Areas/Admin/Pages/Servers/Index.cshtml

@@ -0,0 +1,14 @@
+@page
+@model SS14.Web.Areas.Admin.Pages.Servers.Index
+
+@{
+    ViewData["Title"] = "Servers home";
+}
+
+<nav aria-label="breadcrumb">
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item"><a asp-page="../Index">Hub Admin</a></li>
+        <li class="breadcrumb-item active" aria-current="page">Servers</li>
+    </ol>
+</nav>
+

SS14.Web/Areas/Admin/Pages/Servers/Index.cshtml.cs

@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace SS14.Web.Areas.Admin.Pages.Servers;
+
+public class Index : PageModel
+{
+    public void OnGet()
+    {
+
+    }
+}

SS14.Web/Areas/Admin/Pages/Users/ViewUser.cshtml

@@ -60,6 +60,16 @@
         </div>
     </fieldset>
 
+    <fieldset class="form-group row">
+        <legend class="col-form-label col-sm-2 float-sm-left pt-0">Permissions</legend>
+        <div class="col-sm-10">
+            <div class="form-check">
+                <input asp-for="Input.ServerHubAdmin" class="form-check-input"/>
+                <label asp-for="Input.ServerHubAdmin" class="form-check-label"></label>
+            </div>
+        </div>
+    </fieldset>
+
     <div class="form-group row">
         <label for="patron" class="col-sm-2 col-form-label">Patron tier</label>
         <input disabled id="patron" class="form-control col-sm-10" value="@(Model.PatronTier)"/>

SS14.Web/Areas/Admin/Pages/Users/ViewUser.cshtml.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
@@ -19,6 +20,7 @@ public class ViewUser : PageModel
     private readonly SessionManager _sessionManager;
     private readonly PatreonDataManager _patreonDataManager;
     private readonly ApplicationDbContext _dbContext;
+    private readonly RoleManager<SpaceRole> _roleManager;
 
     public SpaceUser SpaceUser { get; set; }
 
@@ -38,7 +40,8 @@ public class InputModel
 
         [Display(Name = "Email Confirmed?")] public bool EmailConfirmed { get; set; }
 
-        [Display(Name = "Is Hub Admin?")] public bool HubAdmin { get; set; }
+        [Display(Name = "Is Auth Hub Admin?")] public bool HubAdmin { get; set; }
+        [Display(Name = "Is Server Hub Admin?")] public bool ServerHubAdmin { get; set; }
 
         [Display(Name = "2FA enabled?")] public bool TfaEnabled { get; set; }
 
@@ -54,13 +57,15 @@ public ViewUser(
         IEmailSender emailSender,
         SessionManager sessionManager,
         PatreonDataManager patreonDataManager,
-        ApplicationDbContext dbContext)
+        ApplicationDbContext dbContext,
+        RoleManager<SpaceRole> roleManager)
     {
         _userManager = userManager;
         _emailSender = emailSender;
         _sessionManager = sessionManager;
         _patreonDataManager = patreonDataManager;
         _dbContext = dbContext;
+        _roleManager = roleManager;
     }
 
     public async Task<IActionResult> OnGetAsync(Guid id)
@@ -128,21 +133,8 @@ public async Task<IActionResult> OnPostSaveAsync(Guid id)
             SpaceUser.AdminLocked = Input.AdminLocked;
         }
 
-        if (Input.HubAdmin != await _userManager.IsInRoleAsync(SpaceUser, AuthConstants.RoleSysAdmin))
-        {
-            _userManager.LogHubAdminChanged(SpaceUser, Input.HubAdmin, actor);
-
-            if (Input.HubAdmin)
-            {
-                await _userManager.AddToRoleAsync(SpaceUser, AuthConstants.RoleSysAdmin);
-            }
-            else
-            {
-                await _userManager.RemoveFromRoleAsync(SpaceUser, AuthConstants.RoleSysAdmin);
-            }
-
-            await _userManager.UpdateSecurityStampAsync(SpaceUser);
-        }
+        await CheckRole(Input.HubAdmin, AuthConstants.RoleSysAdmin);
+        await CheckRole(Input.ServerHubAdmin, AuthConstants.RoleServerHubAdmin);
 
         await _userManager.UpdateAsync(SpaceUser);
 
@@ -151,6 +143,28 @@ public async Task<IActionResult> OnPostSaveAsync(Guid id)
         StatusMessage = "Changes saved";
 
         return RedirectToPage(new {id});
+
+        async Task CheckRole(bool set, string roleName)
+        {
+            if (set != await _userManager.IsInRoleAsync(SpaceUser, roleName))
+            {
+                var role = await _roleManager.FindByNameAsync(roleName);
+                var roleGuid = Guid.Parse(await _roleManager.GetRoleIdAsync(role));
+
+                if (set)
+                {
+                    await _userManager.AddToRoleAsync(SpaceUser, roleName);
+                    _userManager.LogAuthRoleAdded(SpaceUser, roleGuid, actor);
+                }
+                else
+                {
+                    await _userManager.RemoveFromRoleAsync(SpaceUser, roleName);
+                    _userManager.LogAuthRoleRemoved(SpaceUser, roleGuid, actor);
+                }
+
+                await _userManager.UpdateSecurityStampAsync(SpaceUser);
+            }
+        }
     }
 
     public async Task<IActionResult> OnPostResendConfirmationAsync(Guid id)
@@ -209,6 +223,7 @@ private async Task LoadAsync()
             EmailConfirmed = SpaceUser.EmailConfirmed,
             Username = SpaceUser.UserName,
             HubAdmin = await _userManager.IsInRoleAsync(SpaceUser, AuthConstants.RoleSysAdmin),
+            ServerHubAdmin = await _userManager.IsInRoleAsync(SpaceUser, AuthConstants.RoleServerHubAdmin),
             TfaEnabled = SpaceUser.TwoFactorEnabled,
             AdminLocked = SpaceUser.AdminLocked,
             AdminNotes = SpaceUser.AdminNotes

SS14.Web/Startup.cs

@@ -42,16 +42,31 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddAuthorization(options =>
         {
-            options.AddPolicy(AuthConstants.PolicySysAdmin,
-                policy => policy.RequireRole(AuthConstants.RoleSysAdmin));
+            options.AddPolicy(
+                AuthConstants.PolicyAnyHubAdmin, 
+                policy => policy.RequireRole(AuthConstants.RoleSysAdmin, AuthConstants.RoleServerHubAdmin)
+            );
+            
+            options.AddPolicy(
+                AuthConstants.PolicySysAdmin,
+                policy => policy.RequireRole(AuthConstants.RoleSysAdmin)
+            );
+            
+            options.AddPolicy(
+                AuthConstants.PolicyServerHubAdmin,
+                policy => policy.RequireRole(AuthConstants.RoleServerHubAdmin)
+            );
         });
 
         services.AddMvc()
             .AddRazorPagesOptions(options =>
             {
                 options.Conventions.AuthorizeAreaFolder("Identity", "/Account/Manage");
                 options.Conventions.AuthorizeAreaPage("Identity", "/Account/Logout");
-                options.Conventions.AuthorizeAreaFolder("Admin", "/", AuthConstants.PolicySysAdmin);
+                options.Conventions.AuthorizeAreaFolder("Admin", "/", AuthConstants.PolicyAnyHubAdmin);
+                options.Conventions.AuthorizeAreaFolder("Admin", "/Clients", AuthConstants.PolicySysAdmin);
+                options.Conventions.AuthorizeAreaFolder("Admin", "/Users", AuthConstants.PolicySysAdmin);
+                options.Conventions.AuthorizeAreaFolder("Admin", "/Servers", AuthConstants.PolicyServerHubAdmin);
             });
 
         services.ConfigureApplicationCookie(options =>

SS14.Web/Views/Shared/_Layout.cshtml

@@ -1,4 +1,6 @@
 @using SS14.Auth.Shared
+@using Microsoft.AspNetCore.Authorization
+@inject IAuthorizationService AuthorizationService
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -25,7 +27,7 @@
                     <li class="nav-item">
                         <a class="nav-link" asp-area="" asp-controller="Home" asp-action="MainWebsite">Main Website</a>
                     </li>
-                    @if (User.IsInRole(AuthConstants.RoleSysAdmin))
+                    @if ((await AuthorizationService.AuthorizeAsync(User, AuthConstants.PolicyAnyHubAdmin)).Succeeded)
                     {
                         <li class="nav-item">
                             <a class="nav-link" asp-area="Admin" asp-page="/Index">Hub Admin</a>