Standardize '/version' endpoint on all services (bitwarden#1755)

TNP-Ltd · Dec 9, 2021 · 2ec10cf · 2ec10cf
1 parent d3673cd
commit 2ec10cf
Show file tree

Hide file tree

Showing 18 changed files with 201 additions and 130 deletions.
diff --git a/bitwarden_license/src/Sso/Controllers/HomeController.cs b/bitwarden_license/src/Sso/Controllers/HomeController.cs
@@ -18,14 +18,6 @@ public HomeController(IIdentityServerInteractionService interaction)
             _interaction = interaction;
         }
 
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        [AllowAnonymous]
-        public DateTime GetAlive()
-        {
-            return DateTime.UtcNow;
-        }
-
         [Route("~/Error")]
         [Route("~/Home/Error")]
         [AllowAnonymous]

diff --git a/bitwarden_license/src/Sso/Controllers/InfoController.cs b/bitwarden_license/src/Sso/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Sso.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Bit.Admin.Models;
 using Microsoft.AspNetCore.Authorization;
@@ -29,13 +28,6 @@ public IActionResult Index()
                 CurrentVersion = Core.Utilities.CoreHelpers.GetVersion()
             });
         }
-
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        public DateTime Get()
-        {
-            return DateTime.UtcNow;
-        }
 
         public IActionResult Error()
         {

diff --git a/src/Admin/Controllers/InfoController.cs b/src/Admin/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Admin.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/Api/Controllers/InfoController.cs b/src/Api/Controllers/InfoController.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Api.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+
+        [HttpGet("~/ip")]
+        public JsonResult Ip()
+        {
+            var headerSet = new HashSet<string> { "x-forwarded-for", "cf-connecting-ip", "client-ip" };
+            var headers = HttpContext.Request?.Headers
+                .Where(h => headerSet.Contains(h.Key.ToLower()))
+                .ToDictionary(h => h.Key);
+            return new JsonResult(new
+            {
+                Ip = HttpContext.Connection?.RemoteIpAddress?.ToString(),
+                Headers = headers,
+            });
+        }
+    }
+}
diff --git a/src/Api/Controllers/MiscController.cs b/src/Api/Controllers/MiscController.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Models.Api;
 using System.Threading.Tasks;
 using Bit.Core.Utilities;
@@ -24,33 +23,6 @@ public MiscController(
             _globalSettings = globalSettings;
         }
 
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        public DateTime Get()
-        {
-            return DateTime.UtcNow;
-        }
-
-        [HttpGet("~/version")]
-        public VersionResponseModel Version()
-        {
-            return new VersionResponseModel();
-        }
-
-        [HttpGet("~/ip")]
-        public JsonResult Ip()
-        {
-            var headerSet = new HashSet<string> { "x-forwarded-for", "cf-connecting-ip", "client-ip" };
-            var headers = HttpContext.Request?.Headers
-                .Where(h => headerSet.Contains(h.Key.ToLower()))
-                .ToDictionary(h => h.Key);
-            return new JsonResult(new
-            {
-                Ip = HttpContext.Connection?.RemoteIpAddress?.ToString(),
-                Headers = headers,
-            });
-        }
-
         [Authorize("Application")]
         [HttpPost("~/bitpay-invoice")]
         [SelfHosted(NotSelfHostedOnly = true)]

diff --git a/src/Billing/Controllers/HomeController.cs b/src/Billing/Controllers/HomeController.cs
diff --git a/src/Billing/Controllers/InfoController.cs b/src/Billing/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Billing.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/Core/Models/Api/Response/VersionResponseModel.cs b/src/Core/Models/Api/Response/VersionResponseModel.cs
diff --git a/src/Events/Controllers/CollectController.cs b/src/Events/Controllers/CollectController.cs
@@ -32,14 +32,6 @@ public CollectController(
             _cipherRepository = cipherRepository;
         }
 
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        [AllowAnonymous]
-        public DateTime GetAlive()
-        {
-            return DateTime.UtcNow;
-        }
-
         [HttpPost]
         public async Task<IActionResult> Post([FromBody]IEnumerable<EventModel> model)
         {

diff --git a/src/Events/Controllers/InfoController.cs b/src/Events/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Events.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/EventsProcessor/Startup.cs b/src/EventsProcessor/Startup.cs
@@ -49,7 +49,12 @@ public void Configure(
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapGet("/alive", 
-                    async context => await context.Response.WriteAsync(System.DateTime.UtcNow.ToString()));
+                    async context => await context.Response.WriteAsJsonAsync(System.DateTime.UtcNow));
+                endpoints.MapGet("/now",
+                    async context => await context.Response.WriteAsJsonAsync(System.DateTime.UtcNow));
+                endpoints.MapGet("/version",
+                    async context => await context.Response.WriteAsJsonAsync(CoreHelpers.GetVersion()));
+
             });
         }
     }

diff --git a/src/Icons/Controllers/IconsController.cs b/src/Icons/Controllers/IconsController.cs
@@ -39,13 +39,6 @@ public IconsController(
             _iconsSettings = iconsSettings;
         }
 
-        [HttpGet("~/alive")]
-        [HttpGet("~/now")]
-        public DateTime GetAlive()
-        {
-            return DateTime.UtcNow;
-        }
-
         [HttpGet("~/config")]
         public IActionResult GetConfig()
         {

diff --git a/src/Icons/Controllers/InfoController.cs b/src/Icons/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Icons.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/Identity/Controllers/InfoController.cs b/src/Identity/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Identity.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}
diff --git a/src/Identity/Controllers/MiscController.cs b/src/Identity/Controllers/MiscController.cs
diff --git a/src/Notifications/Controllers/InfoController.cs b/src/Notifications/Controllers/InfoController.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Utilities;
+
+namespace Bit.Notifications.Controllers
+{
+    public class InfoController : Controller
+    {
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
+
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
+    }
+}