From 8c9e2f20c043bbafaa322af7c57285ca50d53d7a Mon Sep 17 00:00:00 2001
From: Y4er <45418382@qq.com>
Date: Wed, 17 Dec 2025 12:05:40 +0800
Subject: [PATCH] update to dotnet 9

---
 .../Grunts/GruntTaskAssignForm.razor          |  4 +-
 .../HostedFiles/HostedFileForm.razor          |  2 +-
 .../Listeners/HttpListenerForm.razor          |  2 +-
 Covenant/Core/Utilities.cs                    |  3 +-
 Covenant/Covenant.csproj                      | 52 +++++++++----------
 .../Data/Grunt/GruntHTTP/GruntHTTPStager.cs   |  4 +-
 Covenant/Dockerfile                           |  4 +-
 Covenant/Startup.cs                           |  9 ++--
 8 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/Covenant/Components/Grunts/GruntTaskAssignForm.razor b/Covenant/Components/Grunts/GruntTaskAssignForm.razor
index a7ab3543..476d1632 100644
--- a/Covenant/Components/Grunts/GruntTaskAssignForm.razor
+++ b/Covenant/Components/Grunts/GruntTaskAssignForm.razor
@@ -40,7 +40,7 @@ else
                 {
                     <div class="form-group col-md-12">
                         <label for="@GruntTask.Options[number].Name">@GruntTask.Options[number].Name</label><br />
-                        <InputFile @ref="InputFile" id="@GruntTask.Options[number].Name" OnChange="OnUpload" />
+                        <BlazorInputFile.InputFile @ref="InputFile" id="@GruntTask.Options[number].Name" OnChange="OnUpload" />
                         @if (this.UploadInProgress)
                         {
                             <span class="fe fe-loader spin"></span>
@@ -77,7 +77,7 @@ else
     [Parameter]
     public EventCallback<GruntTask> OnSubmit { get; set; }
 
-    public InputFile InputFile { get; set; }
+    public BlazorInputFile.InputFile InputFile { get; set; }
     private SemaphoreSlim UploadSemaphore { get; set; } = new SemaphoreSlim(1, 1);
     private bool UploadInProgress { get; set; } = false;
 
diff --git a/Covenant/Components/HostedFiles/HostedFileForm.razor b/Covenant/Components/HostedFiles/HostedFileForm.razor
index 05947b2b..47e1be21 100644
--- a/Covenant/Components/HostedFiles/HostedFileForm.razor
+++ b/Covenant/Components/HostedFiles/HostedFileForm.razor
@@ -17,7 +17,7 @@
     <div class="form-row">
         <div class="form-group col-md-4">
             <label for="Content">Content</label>
-            <InputFile id="Content" name="Content" class="form-control-file" OnChange="FileUpload" />
+            <BlazorInputFile.InputFile id="Content" name="Content" class="form-control-file" OnChange="FileUpload" />
         </div>
     </div>
     <button type="button" class="btn btn-primary" @onclick="(e => OnSubmit.InvokeAsync(HostedFile))">
diff --git a/Covenant/Components/Listeners/HttpListenerForm.razor b/Covenant/Components/Listeners/HttpListenerForm.razor
index b6b5d392..9461c538 100644
--- a/Covenant/Components/Listeners/HttpListenerForm.razor
+++ b/Covenant/Components/Listeners/HttpListenerForm.razor
@@ -81,7 +81,7 @@
 
         <div class="form-group col-md-3 cert-div" hidden="@(!Listener.UseSSL)">
             <label for="SSLCertificateFile">SSLCertificate</label>
-            <InputFile id="SSLCertificateFile" name="SSLCertificateFile" class="form-control-file"
+            <BlazorInputFile.InputFile id="SSLCertificateFile" name="SSLCertificateFile" class="form-control-file"
                         disabled="@Disabled"
                         OnChange="FileUpload" />
         </div>
diff --git a/Covenant/Core/Utilities.cs b/Covenant/Core/Utilities.cs
index dab46754..e7828e54 100644
--- a/Covenant/Core/Utilities.cs
+++ b/Covenant/Core/Utilities.cs
@@ -42,7 +42,8 @@ public static string GenerateJwtToken(string UserName, string UserId, string[] R
 			{
 				new Claim(JwtRegisteredClaimNames.Sub, UserName),
 				new Claim(JwtRegisteredClaimNames.Jti, CreateSecureGuid().ToString()),
-				new Claim(ClaimTypes.NameIdentifier, UserId)
+				//new Claim(ClaimTypes.NameIdentifier, UserId),
+				new Claim("uid", UserId)
 			};
             foreach (string role in Roles)
 			{
diff --git a/Covenant/Covenant.csproj b/Covenant/Covenant.csproj
index 62d31161..f6377834 100644
--- a/Covenant/Covenant.csproj
+++ b/Covenant/Covenant.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
     <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,30 +29,30 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorInputFile" Version="0.1.0-preview-00002" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
+    <PackageReference Include="BlazorInputFile" Version="0.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview2.19528.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.3.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.3.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.3.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.4" />
-    <PackageReference Include="YamlDotNet" Version="8.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.3" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.4" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.4" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.11" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="6.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.6" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.6" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.11" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.11" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
index 63a8d10f..e5e10c8f 100644
--- a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
+++ b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
@@ -203,7 +203,9 @@ public void ExecuteStager()
                 SessionKey.IV = Convert.FromBase64String(iv64str);
                 byte[] DecryptedAssembly = SessionKey.CreateDecryptor().TransformFinalBlock(messageBytes, 0, messageBytes.Length);
                 Assembly gruntAssembly = Assembly.Load(DecryptedAssembly);
-                gruntAssembly.GetTypes()[0].GetMethods()[0].Invoke(null, new Object[] { CovenantURI, CovenantCertHash, GUID, SessionKey });
+                Type t = gruntAssembly.GetType("GruntExecutor.Grunt");
+                MethodInfo m = t.GetMethod("Execute");
+                m.Invoke(null, new Object[] { CovenantURI, CovenantCertHash, GUID, SessionKey });
             }
             catch (Exception e) { Console.Error.WriteLine(e.Message + Environment.NewLine + e.StackTrace); }
         }
diff --git a/Covenant/Dockerfile b/Covenant/Dockerfile
index 877ffd34..4f230e65 100644
--- a/Covenant/Dockerfile
+++ b/Covenant/Dockerfile
@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:9.0 AS build
 WORKDIR /app
 
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS runtime
+FROM mcr.microsoft.com/dotnet/core/sdk:9.0 AS runtime
 WORKDIR /app
 COPY --from=build /app/out .
 COPY ./Data ./Data
diff --git a/Covenant/Startup.cs b/Covenant/Startup.cs
index 93fa12f0..6e07ae2a 100644
--- a/Covenant/Startup.cs
+++ b/Covenant/Startup.cs
@@ -48,7 +48,10 @@ public void ConfigureServices(IServiceCollection services)
                 options.EnableSensitiveDataLogging(true);
             }, ServiceLifetime.Transient);
 
-            services.AddIdentity<CovenantUser, IdentityRole>()
+            services.AddIdentity<CovenantUser, IdentityRole>(op =>
+            {
+                op.ClaimsIdentity.UserIdClaimType = "uid";
+            })
                 .AddEntityFrameworkStores<CovenantContext>()
                 .AddDefaultTokenProviders();
 
@@ -143,7 +146,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
                 options.SerializerSettings.Converters.Add(new StringEnumConverter(new CamelCaseNamingStrategy()));
-            }).SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_3_0);
+            });
             services.AddServerSideBlazor();
 
             services.AddRouting(options => options.LowercaseUrls = true);
@@ -206,7 +209,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
                 app.UseSwagger(c =>
                 {
-                    c.SerializeAsV2 = true;
+                    //c.SerializeAsV2 = true;
                 });
                 app.UseSwaggerUI(c =>
                 {