From ee12c4fcf2205cf046769e97c045967bd6b3990d Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Thu, 12 Apr 2018 09:25:44 -0700 Subject: [PATCH] Downgrade HTTPs handshake failures to debug #1853 --- .../Internal/HttpsConnectionAdapter.cs | 4 +-- test/Kestrel.FunctionalTests/HttpsTests.cs | 30 +++++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/Kestrel.Core/Internal/HttpsConnectionAdapter.cs b/src/Kestrel.Core/Internal/HttpsConnectionAdapter.cs index cab926bb63..301c9c7a23 100644 --- a/src/Kestrel.Core/Internal/HttpsConnectionAdapter.cs +++ b/src/Kestrel.Core/Internal/HttpsConnectionAdapter.cs @@ -182,13 +182,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal } catch (OperationCanceledException) { - _logger?.LogInformation(2, CoreStrings.AuthenticationTimedOut); + _logger?.LogDebug(2, CoreStrings.AuthenticationTimedOut); sslStream.Dispose(); return _closedAdaptedConnection; } catch (IOException ex) { - _logger?.LogInformation(1, ex, CoreStrings.AuthenticationFailed); + _logger?.LogDebug(1, ex, CoreStrings.AuthenticationFailed); sslStream.Dispose(); return _closedAdaptedConnection; } diff --git a/test/Kestrel.FunctionalTests/HttpsTests.cs b/test/Kestrel.FunctionalTests/HttpsTests.cs index 29a598dee1..051d11ab8d 100644 --- a/test/Kestrel.FunctionalTests/HttpsTests.cs +++ b/test/Kestrel.FunctionalTests/HttpsTests.cs @@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } [Fact] - public async Task EmptyRequestLoggedAsInformation() + public async Task EmptyRequestLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); @@ -126,7 +126,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) - .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) + .ConfigureLogging(builder => + { + builder.AddProvider(loggerProvider); + builder.SetMinimumLevel(LogLevel.Debug); + }) .Configure(app => { }); using (var host = hostBuilder.Build()) @@ -142,13 +146,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } Assert.Equal(1, loggerProvider.FilterLogger.LastEventId.Id); - Assert.Equal(LogLevel.Information, loggerProvider.FilterLogger.LastLogLevel); + Assert.Equal(LogLevel.Debug, loggerProvider.FilterLogger.LastLogLevel); Assert.True(loggerProvider.ErrorLogger.TotalErrorsLogged == 0, userMessage: string.Join(Environment.NewLine, loggerProvider.ErrorLogger.ErrorMessages)); } [Fact] - public async Task ClientHandshakeFailureLoggedAsInformation() + public async Task ClientHandshakeFailureLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); @@ -160,7 +164,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) - .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) + .ConfigureLogging(builder => + { + builder.AddProvider(loggerProvider); + builder.SetMinimumLevel(LogLevel.Debug); + }) .Configure(app => { }); using (var host = hostBuilder.Build()) @@ -178,7 +186,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } Assert.Equal(1, loggerProvider.FilterLogger.LastEventId.Id); - Assert.Equal(LogLevel.Information, loggerProvider.FilterLogger.LastLogLevel); + Assert.Equal(LogLevel.Debug, loggerProvider.FilterLogger.LastLogLevel); Assert.True(loggerProvider.ErrorLogger.TotalErrorsLogged == 0, userMessage: string.Join(Environment.NewLine, loggerProvider.ErrorLogger.ErrorMessages)); } @@ -349,7 +357,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } [Fact] - public async Task HandshakeTimesOutAndIsLoggedAsInformation() + public async Task HandshakeTimesOutAndIsLoggedAsDebug() { var loggerProvider = new HandshakeErrorLoggerProvider(); var hostBuilder = TransportSelector.GetWebHostBuilder() @@ -364,7 +372,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }); }); }) - .ConfigureLogging(builder => builder.AddProvider(loggerProvider)) + .ConfigureLogging(builder => + { + builder.AddProvider(loggerProvider); + builder.SetMinimumLevel(LogLevel.Debug); + }) .Configure(app => app.Run(httpContext => Task.CompletedTask)); using (var host = hostBuilder.Build()) @@ -381,7 +393,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests await loggerProvider.FilterLogger.LogTcs.Task.TimeoutAfter(TestConstants.DefaultTimeout); Assert.Equal(2, loggerProvider.FilterLogger.LastEventId); - Assert.Equal(LogLevel.Information, loggerProvider.FilterLogger.LastLogLevel); + Assert.Equal(LogLevel.Debug, loggerProvider.FilterLogger.LastLogLevel); } private class HandshakeErrorLoggerProvider : ILoggerProvider