From 95acc79ebba6d10621853c9df8d0eb2ac2fb82df Mon Sep 17 00:00:00 2001 From: Andrei <30410186+Manolachi@users.noreply.github.com> Date: Thu, 7 Apr 2022 13:37:11 +0300 Subject: [PATCH] Log swallowed HttpRequestExceptions (#1866) Co-authored-by: Hinton --- .../src/Sso/appsettings.Development.json | 2 +- src/Admin/Controllers/HomeController.cs | 28 +++++++++++++------ src/Admin/appsettings.Development.json | 2 +- src/Api/appsettings.Development.json | 2 +- src/Billing/appsettings.Development.json | 2 +- src/Events/appsettings.Development.json | 2 +- src/Identity/appsettings.Development.json | 2 +- .../appsettings.Development.json | 2 +- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/bitwarden_license/src/Sso/appsettings.Development.json b/bitwarden_license/src/Sso/appsettings.Development.json index efe36471f0..f516c57b20 100644 --- a/bitwarden_license/src/Sso/appsettings.Development.json +++ b/bitwarden_license/src/Sso/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "events": { diff --git a/src/Admin/Controllers/HomeController.cs b/src/Admin/Controllers/HomeController.cs index a1b74283e6..750c49dfd9 100644 --- a/src/Admin/Controllers/HomeController.cs +++ b/src/Admin/Controllers/HomeController.cs @@ -6,18 +6,22 @@ using System.Threading.Tasks; using Bit.Admin.Models; using Bit.Core.Settings; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; namespace Bit.Admin.Controllers { public class HomeController : Controller { private readonly GlobalSettings _globalSettings; - private HttpClient _httpClient = new HttpClient(); + private readonly HttpClient _httpClient = new HttpClient(); + private readonly ILogger _logger; - public HomeController(GlobalSettings globalSettings) + public HomeController(GlobalSettings globalSettings, ILogger logger) { _globalSettings = globalSettings; + _logger = logger; } [Authorize] @@ -40,10 +44,10 @@ namespace Bit.Admin.Controllers public async Task GetLatestDockerHubVersion(string repository, CancellationToken cancellationToken) { + var requestUri = $"https://hub.docker.com/v2/repositories/bitwarden/{repository}/tags/"; try { - var response = await _httpClient.GetAsync( - $"https://hub.docker.com/v2/repositories/bitwarden/{repository}/tags/", cancellationToken); + var response = await _httpClient.GetAsync(requestUri, cancellationToken); if (response.IsSuccessStatusCode) { using var jsonDocument = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken); @@ -60,17 +64,21 @@ namespace Bit.Admin.Controllers } } } - catch (HttpRequestException) { } + catch (HttpRequestException e) + { + _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}"); + return new JsonResult("Unable to fetch latest version") { StatusCode = StatusCodes.Status500InternalServerError }; + } return new JsonResult("-"); } public async Task GetInstalledWebVersion(CancellationToken cancellationToken) { + var requestUri = $"{_globalSettings.BaseServiceUri.InternalVault}/version.json"; try { - var response = await _httpClient.GetAsync( - $"{_globalSettings.BaseServiceUri.InternalVault}/version.json", cancellationToken); + var response = await _httpClient.GetAsync(requestUri, cancellationToken); if (response.IsSuccessStatusCode) { using var jsonDocument = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken); @@ -78,7 +86,11 @@ namespace Bit.Admin.Controllers return new JsonResult(root.GetProperty("version").GetString()); } } - catch (HttpRequestException) { } + catch (HttpRequestException e) + { + _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}"); + return new JsonResult("Unable to fetch installed version") { StatusCode = StatusCodes.Status500InternalServerError }; + } return new JsonResult("-"); } diff --git a/src/Admin/appsettings.Development.json b/src/Admin/appsettings.Development.json index f0e952d217..7f6bac5ff7 100644 --- a/src/Admin/appsettings.Development.json +++ b/src/Admin/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "mail": { diff --git a/src/Api/appsettings.Development.json b/src/Api/appsettings.Development.json index fc0a608e34..cdf5a77486 100644 --- a/src/Api/appsettings.Development.json +++ b/src/Api/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "mail": { diff --git a/src/Billing/appsettings.Development.json b/src/Billing/appsettings.Development.json index 266abab96a..7dfdd763f9 100644 --- a/src/Billing/appsettings.Development.json +++ b/src/Billing/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "mail": { diff --git a/src/Events/appsettings.Development.json b/src/Events/appsettings.Development.json index a2c1eda921..df8bd6bfab 100644 --- a/src/Events/appsettings.Development.json +++ b/src/Events/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "events": { diff --git a/src/Identity/appsettings.Development.json b/src/Identity/appsettings.Development.json index 950c728187..ac697a6b10 100644 --- a/src/Identity/appsettings.Development.json +++ b/src/Identity/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "attachment": { diff --git a/src/Notifications/appsettings.Development.json b/src/Notifications/appsettings.Development.json index 345b038762..11958effee 100644 --- a/src/Notifications/appsettings.Development.json +++ b/src/Notifications/appsettings.Development.json @@ -11,7 +11,7 @@ "internalAdmin": "http://localhost:62911", "internalIdentity": "http://localhost:33656", "internalApi": "http://localhost:4000", - "internalVault": "http://localhost:4001", + "internalVault": "https://localhost:8080", "internalSso": "http://localhost:51822" }, "notifications": {