Merge branch 'dotnet6' of https://github.com/ProfessionalCSharp/ProfessionalCSharp2021 into dotnet6

Author: christiannagel

2_Libs/Security/ASPNETCoreMVCSecurity/ASPNETCoreMVCSecurity.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

2_Libs/Security/ASPNETCoreMVCSecurity/Controllers/HomeController.cs

@@ -19,15 +19,9 @@ public HomeController(ILogger<HomeController> logger, IConfiguration configurati
         _settings = configuration;
     }
 
-    public IActionResult Index()
-    {
-        return View();
-    }
+    public IActionResult Index() => View();
 
-    public IActionResult Privacy()
-    {
-        return View();
-    }
+    public IActionResult Privacy() => View();
 
     public string Echo(string x) => x;
 

2_Libs/Security/ASPNETCoreMVCSecurity/Program.cs

@@ -1,16 +1,36 @@
-namespace ASPNETCoreMVCSecurity;
+using System.Text.Encodings.Web;
 
-public class Program
+var builder = WebApplication.CreateBuilder();
+builder.Services.AddControllersWithViews();
+var app = builder.Build();
+
+if (!app.Environment.IsDevelopment())
 {
-    public static void Main(string[] args)
-    {
-        CreateHostBuilder(args).Build().Run();
-    }
-
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
+    app.UseExceptionHandler("/Home/Error");
+    app.UseHsts();
 }
+
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthorization();
+
+app.Map("/echo", async context =>
+{
+    string data = context.Request.Query["x"];
+    await context.Response.WriteAsync(data);
+});
+
+app.Map("/echoenc", async context =>
+{
+    string data = context.Request.Query["x"];
+    await context.Response.WriteAsync(HtmlEncoder.Default.Encode(data));
+});
+
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller=Home}/{action=Index}/{id?}");
+
+app.Run();

2_Libs/Security/ASPNETCoreMVCSecurity/Startup.cs

@@ -1,19 +1,12 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+var builder = WebApplication.CreateBuilder();
+var app = builder.Build();
 
-namespace HackingSite;
+app.UseStaticFiles();
 
-public class Program
+app.Map("/", async context =>
 {
-    public static void Main(string[] args)
-    {
-        CreateHostBuilder(args).Build().Run();
-    }
+    await context.Response.WriteAsync("Invoke the static pages from this site while the site to be hacked is active");
 
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
-}
+});
+
+app.Run();

2_Libs/Security/HackingSite/Program.cs

@@ -1,9 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-using System.Security.Cryptography;
-using System.Text;
-
-class AliceRunner : IDisposable
+sealed class AliceRunner : IDisposable
 {
     private readonly ILogger _logger;
     private ECDiffieHellman _algorithm;

2_Libs/Security/HackingSite/Startup.cs

@@ -1,9 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-using System.Security.Cryptography;
-using System.Text;
-
-class BobRunner
+sealed class BobRunner
 {
     private readonly ILogger _logger;
     private ECDiffieHellman _algorithm;

2_Libs/Security/SecureTransfer/AliceRunner.cs

@@ -0,0 +1,4 @@
+global using Microsoft.Extensions.Logging;
+
+global using System.Security.Cryptography;
+global using System.Text;

2_Libs/Security/SecureTransfer/BobRunner.cs

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
   </ItemGroup>
 
 </Project>