nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-12 23:22:18 -05:00
Code

Revert "Use IHttpMessageHandlerFactory For HTTP Communication"

Browse Source 
This reverts commit c93be6d52b12599040d3c3d8a7b3bc854c6c6802.
This commit is contained in:
Justin Baur 2025-05-07 16:51:51 -04:00
parent b1efa88c6d
commit 5909f6ef8e
No known key found for this signature in database
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
View File

@ -35,7 +35,6 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
private readonly Dictionary<string, DynamicAuthenticationScheme> _cachedHandlerSchemes; private readonly Dictionary<string, DynamicAuthenticationScheme> _cachedHandlerSchemes;
private readonly SemaphoreSlim _semaphore; private readonly SemaphoreSlim _semaphore;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
private readonly IHttpMessageHandlerFactory _httpMessageHandlerFactory;
private DateTime? _lastSchemeLoad; private DateTime? _lastSchemeLoad;
private IEnumerable<DynamicAuthenticationScheme> _schemesCopy = Array.Empty<DynamicAuthenticationScheme>(); private IEnumerable<DynamicAuthenticationScheme> _schemesCopy = Array.Empty<DynamicAuthenticationScheme>();
private IEnumerable<DynamicAuthenticationScheme> _handlerSchemesCopy = Array.Empty<DynamicAuthenticationScheme>(); private IEnumerable<DynamicAuthenticationScheme> _handlerSchemesCopy = Array.Empty<DynamicAuthenticationScheme>();

23
src/SharedWeb/Utilities/ServiceCollectionExtensions.cs
View File

@ -1,5 +1,4 @@
using System.Diagnostics; using System.Net;
using System.Net;
using System.Reflection; using System.Reflection;
using System.Security.Claims; using System.Security.Claims;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
@ -493,8 +492,6 @@ public static class ServiceCollectionExtensions
Action<AuthorizationOptions> addAuthorization) Action<AuthorizationOptions> addAuthorization)
{ {
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
// If we ever use the overload here with a different authentication scheme name then
// we need to change the AddOptions call below.
.AddJwtBearer(options => .AddJwtBearer(options =>
{ {
options.MapInboundClaims = false; options.MapInboundClaims = false;
@ -514,24 +511,6 @@ public static class ServiceCollectionExtensions
}; };
}); });
// This is done through a Configure method instead of above so that we can avoid
// an early creation of services but still use a service that should centrally control how HttpMessageHandlers
// are created.
services.AddOptions<JwtBearerOptions>(JwtBearerDefaults.AuthenticationScheme)
.Configure<IHttpMessageHandlerFactory>((options, httpMessageHandlerFactory) =>
{
// Since we don't manually set the Backchannel and the Post stage configuration shouldn't have
// ran yet we don't expect this option to be set. If it is set, it was likely set with a
// handler already and won't respect the BackchannelHttpHandler we are about to set.
Debug.Assert(options.Backchannel is null);
// Do a few debug checks to make sure we are customizing the expected options configured above.
Debug.Assert(!options.TokenValidationParameters.ValidateAudience);
Debug.Assert(options.TokenValidationParameters.ValidTypes.Single() == "at+jwt");
Debug.Assert(options.TokenValidationParameters.NameClaimType == ClaimTypes.Email);
options.BackchannelHttpHandler = httpMessageHandlerFactory.CreateHandler();
});
if (addAuthorization != null) if (addAuthorization != null)
{ {
services.AddAuthorization(config => services.AddAuthorization(config =>