[Security] Move to GenericHost (#24282)

Kahbazi · web-flow · commit 60971450960d · 2020-07-27T13:09:15.000-07:00
diff --git a/src/Security/Authentication/Certificate/samples/Certificate.Sample/Program.cs b/src/Security/Authentication/Certificate/samples/Certificate.Sample/Program.cs
@@ -1,26 +1,30 @@
-using Microsoft.AspNetCore;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.Extensions.Hosting;
 
 namespace Certificate.Sample
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            BuildWebHost(args).Run();
-        }
-
-        public static IWebHost BuildWebHost(string[] args)
-            => WebHost.CreateDefaultBuilder(args)
-            .UseStartup<Startup>()
-            .ConfigureKestrel(options =>
-            {
-                options.ConfigureHttpsDefaults(opt =>
+            var host = Host.CreateDefaultBuilder(args)
+                .ConfigureWebHost(webHostBuilder =>
                 {
-                    opt.ClientCertificateMode = ClientCertificateMode.RequireCertificate;
-                });
-            })
-            .Build();
+                    webHostBuilder
+                        .UseStartup<Startup>()
+                        .ConfigureKestrel(options =>
+                        {
+                            options.ConfigureHttpsDefaults(opt =>
+                            {
+                                opt.ClientCertificateMode = ClientCertificateMode.RequireCertificate;
+                            });
+                        });
+                })
+                .Build();
+
+            return host.RunAsync();
+        }
     }
 }
diff --git a/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs b/src/Security/Authentication/Cookies/samples/CookieSample/Program.cs
@@ -1,26 +1,32 @@
-﻿using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace CookieSample
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = new WebHostBuilder()
+            var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseIISIntegration()
+                        .UseStartup<Startup>();
+                })
                 .ConfigureLogging(factory =>
                 {
                     factory.AddConsole();
                     factory.AddFilter("Console", level => level >= LogLevel.Information);
                 })
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }
diff --git a/src/Security/Authentication/Cookies/samples/CookieSessionSample/Program.cs b/src/Security/Authentication/Cookies/samples/CookieSessionSample/Program.cs
@@ -1,26 +1,32 @@
-﻿using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace CookieSessionSample
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = new WebHostBuilder()
+            var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseIISIntegration()
+                        .UseStartup<Startup>();
+                })
                 .ConfigureLogging(factory =>
                 {
                     factory.AddConsole();
                     factory.AddFilter("Console", level => level >= LogLevel.Information);
                 })
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }
diff --git a/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Program.cs b/src/Security/Authentication/JwtBearer/samples/JwtBearerSample/Program.cs
@@ -1,18 +1,22 @@
-using Microsoft.AspNetCore;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
 namespace JwtBearerSample
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
+            var host = Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseStartup<Startup>();
+                })
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }
diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Program.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnect.AzureAdSample/Program.cs
@@ -1,17 +1,22 @@
-using Microsoft.AspNetCore;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace OpenIdConnect.AzureAdSample
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
+            var host = Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseStartup<Startup>();
+                })
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }
diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Program.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Program.cs
@@ -1,18 +1,23 @@
 
-using Microsoft.AspNetCore;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace OpenIdConnectSample
 {
     public static class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>()
+            var host = Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseStartup<Startup>();
+                })
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }
diff --git a/src/Security/Authentication/WsFederation/samples/WsFedSample/Program.cs b/src/Security/Authentication/WsFederation/samples/WsFedSample/Program.cs
@@ -1,46 +1,46 @@
-﻿using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace WsFedSample
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = new WebHostBuilder()
+            var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel(options =>
+                        {
+                            options.Listen(IPAddress.Loopback, 44307, listenOptions =>
+                            {
+                                // Configure SSL
+                                var serverCertificate = LoadCertificate();
+                                listenOptions.UseHttps(serverCertificate);
+                            });
+                        })
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseIISIntegration()
+                        .UseStartup<Startup>();
+                })
                 .ConfigureLogging(factory =>
                 {
                     factory.AddConsole();
                     factory.AddDebug();
                     factory.AddFilter("Console", level => level >= LogLevel.Information);
                     factory.AddFilter("Debug", level => level >= LogLevel.Information);
                 })
-                .UseKestrel(options =>
-                {
-                    options.Listen(IPAddress.Loopback, 44307, listenOptions =>
-                    {
-                        // Configure SSL
-                        var serverCertificate = LoadCertificate();
-                        listenOptions.UseHttps(serverCertificate);
-                    });
-                })
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseIISIntegration()
-                .UseStartup<Startup>()
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
 
         private static X509Certificate2 LoadCertificate()
diff --git a/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectConfigurationTests.cs b/src/Security/Authentication/test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
@@ -437,7 +437,22 @@ public async Task SpecificForwardWinsOverSelectorAndDefault()
         [Fact]
         public async Task MetadataAddressIsGeneratedFromAuthorityWhenMissing()
         {
-            var builder = new WebHostBuilder()
+            using var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .Configure(app =>
+                        {
+                            app.UseAuthentication();
+                            app.Run(async context =>
+                            {
+                                var resolver = context.RequestServices.GetRequiredService<IAuthenticationHandlerProvider>();
+                                var handler = await resolver.GetHandlerAsync(context, OpenIdConnectDefaults.AuthenticationScheme) as OpenIdConnectHandler;
+                                Assert.Equal($"{TestServerBuilder.DefaultAuthority}/.well-known/openid-configuration", handler.Options.MetadataAddress);
+                            });
+                        })
+                        .UseTestServer();
+                })
                 .ConfigureServices(services =>
                 {
                     services.AddAuthentication()
@@ -449,17 +464,11 @@ public async Task MetadataAddressIsGeneratedFromAuthorityWhenMissing()
                         o.SignInScheme = Guid.NewGuid().ToString();
                     });
                 })
-                .Configure(app =>
-                {
-                    app.UseAuthentication();
-                    app.Run(async context =>
-                    {
-                        var resolver = context.RequestServices.GetRequiredService<IAuthenticationHandlerProvider>();
-                        var handler = await resolver.GetHandlerAsync(context, OpenIdConnectDefaults.AuthenticationScheme) as OpenIdConnectHandler;
-                        Assert.Equal($"{TestServerBuilder.DefaultAuthority}/.well-known/openid-configuration", handler.Options.MetadataAddress);
-                    });
-                });
-            var server = new TestServer(builder);
+                .Build();
+
+            var server = host.GetTestServer();
+
+            await host.StartAsync();
             var transaction = await server.SendAsync(@"https://example.com");
             Assert.Equal(HttpStatusCode.OK, transaction.Response.StatusCode);
         }
diff --git a/src/Security/Authentication/test/PolicyTests.cs b/src/Security/Authentication/test/PolicyTests.cs
diff --git a/src/Security/CookiePolicy/samples/CookiePolicySample/Program.cs b/src/Security/CookiePolicy/samples/CookiePolicySample/Program.cs
diff --git a/src/Security/CookiePolicy/test/CookieConsentTests.cs b/src/Security/CookiePolicy/test/CookieConsentTests.cs
diff --git a/src/Security/CookiePolicy/test/CookiePolicyTests.cs b/src/Security/CookiePolicy/test/CookiePolicyTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,32 @@`
`1`		`-using System.IO;`
	`1`	`+using System.IO;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`	`using Microsoft.AspNetCore.Hosting;`
	`4`	`+using Microsoft.Extensions.Hosting;`
`3`	`5`	`using Microsoft.Extensions.Logging;`
`4`	`6`
`5`	`7`	`namespace CookieSample`
`6`	`8`	`{`
`7`	`9`	`public static class Program`
`8`	`10`	`{`
`9`		`- public static void Main(string[] args)`
	`11`	`+ public static Task Main(string[] args)`
`10`	`12`	`{`
`11`		`- var host = new WebHostBuilder()`
	`13`	`+ var host = new HostBuilder()`
	`14`	`+ .ConfigureWebHost(webHostBuilder =>`
	`15`	`+ {`
	`16`	`+ webHostBuilder`
	`17`	`+ .UseKestrel()`
	`18`	`+ .UseContentRoot(Directory.GetCurrentDirectory())`
	`19`	`+ .UseIISIntegration()`
	`20`	`+ .UseStartup<Startup>();`
	`21`	`+ })`
`12`	`22`	`.ConfigureLogging(factory =>`
`13`	`23`	`{`
`14`	`24`	`factory.AddConsole();`
`15`	`25`	`factory.AddFilter("Console", level => level >= LogLevel.Information);`
`16`	`26`	`})`
`17`		`- .UseKestrel()`
`18`		`- .UseContentRoot(Directory.GetCurrentDirectory())`
`19`		`- .UseIISIntegration()`
`20`		`- .UseStartup<Startup>()`
`21`	`27`	`.Build();`
`22`	`28`
`23`		`- host.Run();`
	`29`	`+ return host.RunAsync();`
`24`	`30`	`}`
`25`	`31`	`}`
`26`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,22 @@`
`1`		`-using Microsoft.AspNetCore;`
	`1`	`+using System.Threading.Tasks;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
`3`	`3`	`using Microsoft.Extensions.Hosting;`
`4`	`4`
`5`	`5`	`namespace JwtBearerSample`
`6`	`6`	`{`
`7`	`7`	`public static class Program`
`8`	`8`	`{`
`9`		`- public static void Main(string[] args)`
	`9`	`+ public static Task Main(string[] args)`
`10`	`10`	`{`
`11`		`- var host = WebHost.CreateDefaultBuilder(args)`
`12`		`- .UseStartup<Startup>()`
	`11`	`+ var host = Host.CreateDefaultBuilder(args)`
	`12`	`+ .ConfigureWebHostDefaults(webHostBuilder =>`
	`13`	`+ {`
	`14`	`+ webHostBuilder`
	`15`	`+ .UseStartup<Startup>();`
	`16`	`+ })`
`13`	`17`	`.Build();`
`14`	`18`
`15`		`- host.Run();`
	`19`	`+ return host.RunAsync();`
`16`	`20`	`}`
`17`	`21`	`}`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,22 @@`
`1`		`-using Microsoft.AspNetCore;`
	`1`	`+using System.Threading.Tasks;`
`2`	`2`	`using Microsoft.AspNetCore.Hosting;`
	`3`	`+using Microsoft.Extensions.Hosting;`
`3`	`4`
`4`	`5`	`namespace OpenIdConnect.AzureAdSample`
`5`	`6`	`{`
`6`	`7`	`public static class Program`
`7`	`8`	`{`
`8`		`- public static void Main(string[] args)`
	`9`	`+ public static Task Main(string[] args)`
`9`	`10`	`{`
`10`		`- var host = WebHost.CreateDefaultBuilder(args)`
`11`		`- .UseStartup<Startup>()`
	`11`	`+ var host = Host.CreateDefaultBuilder(args)`
	`12`	`+ .ConfigureWebHostDefaults(webHostBuilder =>`
	`13`	`+ {`
	`14`	`+ webHostBuilder`
	`15`	`+ .UseStartup<Startup>();`
	`16`	`+ })`
`12`	`17`	`.Build();`
`13`	`18`
`14`		`- host.Run();`
	`19`	`+ return host.RunAsync();`
`15`	`20`	`}`
`16`	`21`	`}`
`17`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,23 @@`
`1`	`1`
`2`		`-using Microsoft.AspNetCore;`
	`2`	`+using System.Threading.Tasks;`
`3`	`3`	`using Microsoft.AspNetCore.Hosting;`
	`4`	`+using Microsoft.Extensions.Hosting;`
`4`	`5`
`5`	`6`	`namespace OpenIdConnectSample`
`6`	`7`	`{`
`7`	`8`	`public static class Program`
`8`	`9`	`{`
`9`		`- public static void Main(string[] args)`
	`10`	`+ public static Task Main(string[] args)`
`10`	`11`	`{`
`11`		`- var host = WebHost.CreateDefaultBuilder(args)`
`12`		`- .UseStartup<Startup>()`
	`12`	`+ var host = Host.CreateDefaultBuilder(args)`
	`13`	`+ .ConfigureWebHostDefaults(webHostBuilder =>`
	`14`	`+ {`
	`15`	`+ webHostBuilder`
	`16`	`+ .UseStartup<Startup>();`
	`17`	`+ })`
`13`	`18`	`.Build();`
`14`	`19`
`15`		`- host.Run();`
	`20`	`+ return host.RunAsync();`
`16`	`21`	`}`
`17`	`22`	`}`
`18`	`23`	`}`