Fix logic for blocking endpoints on server.

PraxisMapper · Jun 21, 2022 · 6b626a7 · 6b626a7
1 parent add48b8
commit 6b626a7
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/PraxisMapper/Controllers/DataController.cs b/PraxisMapper/Controllers/DataController.cs
@@ -1,5 +1,6 @@
 using Google.OpenLocationCode;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
@@ -30,7 +31,12 @@ public DataController(IConfiguration configuration, IMemoryCache memoryCacheSing
         {
             Configuration = configuration;
             cache = memoryCacheSingleton;
-            if (Configuration.GetValue<bool>("enableDataEndpoints") == false) HttpContext.Abort();
+        }
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            base.OnActionExecuting(context);
+            if (Configuration.GetValue<bool>("enableDataEndpoints") == false)
+                HttpContext.Abort();
         }
 
         [HttpPut]

diff --git a/PraxisMapper/Controllers/MapTileController.cs b/PraxisMapper/Controllers/MapTileController.cs
@@ -11,6 +11,7 @@
 using static PraxisCore.DbTables;
 using static PraxisCore.Place;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace PraxisMapper.Controllers
 {
@@ -27,7 +28,13 @@ public MapTileController(IConfiguration configuration, IMemoryCache memoryCacheS
             Configuration = configuration;
             cache = memoryCacheSingleton;
             MapTiles = mapTile;
-            if (Configuration.GetValue<bool>("enableMapTileEndpoints") == false) HttpContext.Abort();
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            base.OnActionExecuting(context);
+            if (Configuration.GetValue<bool>("enableMapTileEndpoints") == false)
+                HttpContext.Abort();
         }
 
         private bool SaveMapTiles()

diff --git a/PraxisMapper/Controllers/SecureDataController.cs b/PraxisMapper/Controllers/SecureDataController.cs
@@ -1,6 +1,7 @@
 using CryptSharp;
 using Google.OpenLocationCode;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using NetTopologySuite.Geometries.Prepared;
@@ -23,7 +24,13 @@ public SecureDataController(IConfiguration config, IMemoryCache memoryCacheSingl
         {
             Configuration = config;
             cache = memoryCacheSingleton;
-            if (Configuration.GetValue<bool>("enableDataEndpoints") == false) HttpContext.Abort();
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            base.OnActionExecuting(context);
+            if (Configuration.GetValue<bool>("enableDataEndpoints") == false)
+                HttpContext.Abort();
         }
 
         [HttpPut]

diff --git a/PraxisMapper/Controllers/StyleDataController.cs b/PraxisMapper/Controllers/StyleDataController.cs
@@ -1,5 +1,6 @@
 using Google.OpenLocationCode;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using PraxisCore;
@@ -14,10 +15,18 @@ namespace PraxisMapper.Controllers
     public class StyleDataController : Controller
     {
         //some of these will take JSON strings up, parse and reapply them rather than having a ton of parameters
+        IConfiguration Configuration;
 
-        public StyleDataController(IConfiguration Configuration)
+        public StyleDataController(IConfiguration configuration)
         {
-            if (Configuration.GetValue<bool>("enableStyleDataEndpoints") == false) HttpContext.Abort();
+            Configuration = configuration;
+        }
+
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            base.OnActionExecuting(context);
+            if (Configuration.GetValue<bool>("enableStyleDataEndpoints") == false)
+                HttpContext.Abort();
         }