Use IHttpClientFactory in more places

Author: justindbaur

src/Admin/Controllers/HomeController.cs

@@ -11,13 +11,17 @@ namespace Bit.Admin.Controllers;
 public class HomeController : Controller
 {
     private readonly GlobalSettings _globalSettings;
-    private readonly HttpClient _httpClient = new HttpClient();
+    private readonly HttpClient _httpClient;
     private readonly ILogger<HomeController> _logger;
 
-    public HomeController(GlobalSettings globalSettings, ILogger<HomeController> logger)
+    public HomeController(
+        GlobalSettings globalSettings,
+        ILogger<HomeController> logger,
+        IHttpClientFactory httpClientFactory)
     {
         _globalSettings = globalSettings;
         _logger = logger;
+        _httpClient = httpClientFactory.CreateClient();
     }
 
     [Authorize]

src/Admin/Jobs/AliveJob.cs

@@ -8,14 +8,16 @@ namespace Bit.Admin.Jobs;
 public class AliveJob : BaseJob
 {
     private readonly GlobalSettings _globalSettings;
-    private HttpClient _httpClient = new HttpClient();
+    private readonly HttpClient _httpClient;
 
     public AliveJob(
         GlobalSettings globalSettings,
-        ILogger<AliveJob> logger)
+        ILogger<AliveJob> logger,
+        IHttpClientFactory httpClientFactory)
         : base(logger)
     {
         _globalSettings = globalSettings;
+        _httpClient = httpClientFactory.CreateClient();
     }
 
     protected async override Task ExecuteJobAsync(IJobExecutionContext context)

src/Api/Tools/Controllers/HibpController.cs

@@ -16,27 +16,24 @@ public class HibpController : Controller
 {
     private const string HibpBreachApi = "https://haveibeenpwned.com/api/v3/breachedaccount/{0}" +
         "?truncateResponse=false&includeUnverified=false";
-    private static HttpClient _httpClient;
+    private readonly HttpClient _httpClient;
 
     private readonly IUserService _userService;
     private readonly ICurrentContext _currentContext;
     private readonly GlobalSettings _globalSettings;
     private readonly string _userAgent;
 
-    static HibpController()
-    {
-        _httpClient = new HttpClient();
-    }
-
     public HibpController(
         IUserService userService,
         ICurrentContext currentContext,
-        GlobalSettings globalSettings)
+        GlobalSettings globalSettings,
+        IHttpClientFactory httpClientFactory)
     {
         _userService = userService;
         _currentContext = currentContext;
         _globalSettings = globalSettings;
         _userAgent = _globalSettings.SelfHosted ? "Bitwarden Self-Hosted" : "Bitwarden";
+        _httpClient = httpClientFactory.CreateClient();
     }
 
     [HttpGet("breach")]

src/Billing/Controllers/FreshsalesController.cs

@@ -25,23 +25,16 @@ public FreshsalesController(IUserRepository userRepository,
         IOrganizationRepository organizationRepository,
         IOptions<BillingSettings> billingSettings,
         ILogger<FreshsalesController> logger,
-        GlobalSettings globalSettings)
+        GlobalSettings globalSettings,
+        IHttpClientFactory httpClientFactory)
     {
         _userRepository = userRepository;
         _organizationRepository = organizationRepository;
         _logger = logger;
         _globalSettings = globalSettings;
-
-        _httpClient = new HttpClient
-        {
-            BaseAddress = new Uri("https://bitwarden.freshsales.io/api/")
-        };
+        _httpClient = httpClientFactory.CreateClient("Freshsales");
 
         _freshsalesApiKey = billingSettings.Value.FreshsalesApiKey;
-
-        _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
-            "Token",
-            $"token={_freshsalesApiKey}");
     }
 
 

src/Billing/Startup.cs

@@ -9,7 +9,9 @@
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.SharedWeb.Utilities;
+using HandlebarsDotNet;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using Quartz;
 using Stripe;
 
@@ -102,6 +104,15 @@ public void ConfigureServices(IServiceCollection services)
         {
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", billingSettings.Onyx.ApiKey);
         });
+        services.AddHttpClient("Freshsales", (sp, client) =>
+        {
+            var billingSettings = sp.GetRequiredService<IOptions<BillingSettings>>().Value;
+            client.BaseAddress = new Uri("https://bitwarden.freshsales.io/api/");
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+                "Token",
+                $"token={billingSettings.FreshsalesApiKey}"
+            );
+        });
 
         services.AddScoped<IStripeFacade, StripeFacade>();
         services.AddScoped<IStripeEventService, StripeEventService>();

test/Billing.Test/Controllers/FreshsalesControllerTests.cs

@@ -31,12 +31,18 @@ private static (FreshsalesController, IUserRepository, IOrganizationRepository)
         var globalSettings = new GlobalSettings();
         globalSettings.BaseServiceUri.Admin = "https://test.com";
 
+        var httpClientFactory = Substitute.For<IHttpClientFactory>();
+        httpClientFactory
+            .CreateClient("Freshsales")
+            .Returns(new HttpClient());
+
         var sut = new FreshsalesController(
             userRepository,
             organizationRepository,
             billingSettings,
             Substitute.For<ILogger<FreshsalesController>>(),
-            globalSettings
+            globalSettings,
+            httpClientFactory
         );
 
         return (sut, userRepository, organizationRepository);

util/Setup/Program.cs

@@ -2,6 +2,7 @@
 using System.Net.Http.Json;
 using Bit.Migrator;
 using Bit.Setup.Enums;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Setup;
 
@@ -66,6 +67,8 @@ public static void Main(string[] args)
         }
     }
 
+
+
     private static void Install()
     {
         if (_context.Parameters.ContainsKey("letsencrypt"))
@@ -285,7 +288,14 @@ private static bool ValidateInstallation()
                 url = $"{installationUrl}/installations/";
             }
 
-            var response = new HttpClient().GetAsync(url + _context.Install.InstallationId).GetAwaiter().GetResult();
+            // We need to get an HttpClient that has been configured with custom trust certificates.
+            var httpClient = new ServiceCollection()
+                .AddX509ChainCustomization()
+                .BuildServiceProvider()
+                .GetRequiredService<IHttpClientFactory>()
+                .CreateClient();
+
+            var response = httpClient.GetAsync(url + _context.Install.InstallationId).GetAwaiter().GetResult();
 
             if (!response.IsSuccessStatusCode)
             {