From 4477e186a3fb138049c28f771304eb45b6ff18cb Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Wed, 3 Aug 2022 21:51:54 +0200
Subject: [PATCH] remove anonymous

---
 .../SecretKeyAuthenticationHandler.cs               | 13 +------------
 .../MareSynchronosServer/Hubs/MareHub.cs            |  8 +-------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs b/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs
index 0d7c1c5..b69baf4 100644
--- a/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Authentication/SecretKeyAuthenticationHandler.cs
@@ -7,8 +7,6 @@ using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using MareSynchronosServer.Data;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -22,13 +20,8 @@ namespace MareSynchronosServer.Authentication
 
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
-            var endpoint = Context.GetEndpoint();
-            var endpointMetaData = endpoint?.Metadata?.GetMetadata<IAllowAnonymous>();
-
-            if (!Request.Headers.ContainsKey("Authorization") && endpointMetaData == null)
+            if (!Request.Headers.ContainsKey("Authorization"))
                 return AuthenticateResult.Fail("Failed Authorization");
-            else if (!Request.Headers.ContainsKey("Authorization") && endpointMetaData != null)
-                return AuthenticateResult.NoResult();
 
             var authHeader = Request.Headers["Authorization"].ToString();
 
@@ -44,10 +37,6 @@ namespace MareSynchronosServer.Authentication
             {
                 return AuthenticateResult.Fail("Failed Authorization");
             }
-            else if (endpointMetaData != null && uid == null)
-            {
-                return AuthenticateResult.NoResult();
-            }
 
             var claims = new List<Claim> {
                 new Claim(ClaimTypes.NameIdentifier, uid)
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index d520d41..73064d3 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -9,7 +9,6 @@ using MareSynchronosServer.Data;
 using MareSynchronosServer.Metrics;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -34,6 +33,7 @@ namespace MareSynchronosServer.Hubs
         }
 
         [HubMethodName(Api.InvokeHeartbeat)]
+        [Authorize(AuthenticationSchemes = SecretKeyAuthenticationHandler.AuthScheme)]
         public async Task<ConnectionDto> Heartbeat(string characterIdentification)
         {
             MareMetrics.InitializedConnections.Inc();
@@ -79,12 +79,6 @@ namespace MareSynchronosServer.Hubs
             };
         }
 
-        [HubMethodName(Api.InvokeGetSystemInfo)]
-        public async Task<SystemInfoDto> GetSystemInfo()
-        {
-            return _systemInfoService.SystemInfoDto;
-        }
-
         public override Task OnConnectedAsync()
         {
             var feature = Context.Features.Get<IHttpContextAccessor>();