From b53763824be304fbe555dbf4ebca4812e348a62f Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 14 Jan 2024 11:58:12 +0100 Subject: [PATCH 01/12] feat: Update target framework to .NET 8.0 + Bump dependencies versions - Updated the target framework from net7.0 to net8.0 in the SocialGuard.Web.csproj file. - Updated the version of Nodsoft.MoltenObsidian.Blazor package from 0.3.16 to 0.5.18. - Updated the version of Nodsoft.MoltenObsidian.Vaults.Http package from 0.3.16 to 0.5.18. - Updated the version of Serilog.AspNetCore package from 6.1.0 to 8.0.0. - Updated the version of Serilog.Extensions.Logging package from 3.1.0 to 8.0.0. These changes ensure compatibility with newer frameworks and libraries, improving overall functionality and performance of the application. --- SocialGuard.Web/SocialGuard.Web.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SocialGuard.Web/SocialGuard.Web.csproj b/SocialGuard.Web/SocialGuard.Web.csproj index b167bcd..197781d 100644 --- a/SocialGuard.Web/SocialGuard.Web.csproj +++ b/SocialGuard.Web/SocialGuard.Web.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 @@ -10,10 +10,10 @@ - - - - + + + + From 0a61b50e301a0cc90b7974f4b2bb84212cbf9307 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 14 Jan 2024 11:59:05 +0100 Subject: [PATCH 02/12] feat: Add InteractiveAutoRenderMode to App.razor - Added `@rendermode="new InteractiveAutoRenderMode()"` to the `` component in `App.razor`. --- SocialGuard.Web/App.razor | 2 +- SocialGuard.Web/Startup.cs | 131 +++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/SocialGuard.Web/App.razor b/SocialGuard.Web/App.razor index 6f67a6e..8e86f23 100644 --- a/SocialGuard.Web/App.razor +++ b/SocialGuard.Web/App.razor @@ -1,4 +1,4 @@ - + diff --git a/SocialGuard.Web/Startup.cs b/SocialGuard.Web/Startup.cs index 49e900a..c22580b 100644 --- a/SocialGuard.Web/Startup.cs +++ b/SocialGuard.Web/Startup.cs @@ -6,94 +6,95 @@ using Microsoft.Extensions.Hosting; using SocialGuard.Web.Services; using SocialGuard.Web.Services.Logging; -using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; using Nodsoft.MoltenObsidian.Blazor; -namespace SocialGuard.Web +namespace SocialGuard.Web; + +public sealed class Startup { - public class Startup + public Startup(IConfiguration configuration) { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } + Configuration = configuration; + } - public IConfiguration Configuration { get; } + public IConfiguration Configuration { get; } - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - services.AddRazorPages(); - services.AddServerSideBlazor(); - services.AddDistributedMemoryCache(); - services.AddDirectoryBrowser(); + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + services.AddRazorPages(); + + services.AddServerSideBlazor() + .AddInteractiveServerComponents(); + + services.AddDistributedMemoryCache(); + services.AddDirectoryBrowser(); - // Add the MoltenObsidian Vault - services.AddHttpClient("Docs", client => client.BaseAddress = new(Configuration["Docs:WebRoot"])); - services.AddMoltenObsidianHttpVault(static services => services.GetRequiredService().CreateClient("Docs")); - services.AddMoltenObsidianBlazorIntegration(); + // Add the MoltenObsidian Vault + services.AddHttpClient("Docs", client => client.BaseAddress = new(Configuration["Docs:WebRoot"])); + services.AddMoltenObsidianHttpVault(static services => services.GetRequiredService().CreateClient("Docs")); + services.AddMoltenObsidianBlazorIntegration(); - services.AddCors(c => c.AddDefaultPolicy(builder => builder - .AllowAnyOrigin() - .AllowAnyHeader() - .AllowAnyMethod())); + services.AddCors(c => c.AddDefaultPolicy(builder => builder + .AllowAnyOrigin() + .AllowAnyHeader() + .AllowAnyMethod())); - services.AddSingleton(); - } + services.AddSingleton(); + } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else if (env.IsProduction()) + app.UseDeveloperExceptionPage(); + } + else if (env.IsProduction()) + { + IPAddress[] allowedProxies = Configuration.GetSection("AllowedProxies").Get()?.Select(IPAddress.Parse).ToArray() ?? []; + + // Nginx configuration step + ForwardedHeadersOptions forwardedHeadersOptions = new() { - IEnumerable allowedProxies = Configuration.GetSection("AllowedProxies")?.Get()?.Select(x => IPAddress.Parse(x)); + ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto + }; - // Nginx configuration step - ForwardedHeadersOptions forwardedHeadersOptions = new() - { - ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto - }; + if (allowedProxies is { Length: not 0 }) + { + forwardedHeadersOptions.KnownProxies.Clear(); - if (allowedProxies is not null && allowedProxies.Any()) + foreach (IPAddress address in allowedProxies) { - forwardedHeadersOptions.KnownProxies.Clear(); - - foreach (IPAddress address in allowedProxies) - { - forwardedHeadersOptions.KnownProxies.Add(address); - } + forwardedHeadersOptions.KnownProxies.Add(address); } - - app.UseExceptionHandler("/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); } + + app.UseExceptionHandler("/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } - app.UseHttpsRedirection(); + app.UseHttpsRedirection(); - app.UseMiddleware(); + app.UseMiddleware(); - app.UseStaticFiles(); - // app.UseStaticFiles("/viewer"); - // app.UseBlazorFrameworkFiles("/viewer"); + app.UseStaticFiles(); + // app.UseStaticFiles("/viewer"); + // app.UseBlazorFrameworkFiles("/viewer"); - app.UseRouting(); - app.UseCors(); + app.UseRouting(); + app.UseCors(); - app.UseEndpoints(endpoints => - { - endpoints.MapBlazorHub(); - endpoints.MapFallbackToFile("/viewer/{*path:nonfile}", "viewer/index.html"); - endpoints.MapFallbackToPage("/_Host"); - }); - } + app.UseEndpoints(endpoints => + { + endpoints.MapBlazorHub(); + endpoints.MapFallbackToFile("/viewer/{*path:nonfile}", "viewer/index.html"); + endpoints.MapFallbackToPage("/_Host"); + }); } -} +} \ No newline at end of file From cabe44e899682c10c9a822b772c759b99258bcf1 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 14 Jan 2024 12:21:23 +0100 Subject: [PATCH 03/12] feat(docs): Improve display of index note navigation - Updated the rendering of the `FoundIndexNote` component in `Docs.razor` - Added logic to conditionally display index note navigation based on the presence of a non-empty `VaultPath` - Modified the `VaultDisplayOptions` property initialization to include a trailing space for consistency --- SocialGuard.Web/Pages/Docs.razor | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/SocialGuard.Web/Pages/Docs.razor b/SocialGuard.Web/Pages/Docs.razor index 6908924..d3780be 100644 --- a/SocialGuard.Web/Pages/Docs.razor +++ b/SocialGuard.Web/Pages/Docs.razor @@ -18,7 +18,17 @@

Not Found

- @FoundNote.Render(context.Item1) + + @FoundIndexNote.Render(context with + { + DisplayOptions = context.DisplayOptions with + { + DisplayIndexNoteNavigation = VaultPath is not (null or "") + } + }) + + + @@ -31,7 +41,7 @@ [Parameter] public string VaultPath { get; set; } - public static ObsidianVaultDisplayOptions VaultDisplayOptions { get; } = new() { }; + public static ObsidianVaultDisplayOptions VaultDisplayOptions { get; } = new() { }; /// /// Builds a Bootstrap breadcrumb using a slash-separated path string. From 253f7a3c86c893262abd3a83e3fa91e90bbfc59b Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 Feb 2024 11:20:21 +0100 Subject: [PATCH 04/12] refactor: Various refactors --- .../Authentication/AuthenticationService.cs | 4 +- SocialGuard.Api/Startup.cs | 371 +++++++++--------- SocialGuard.Common/Data/Models/Emitter.cs | 2 +- SocialGuard.Web/Program.cs | 40 +- .../Shared/Docs/VaultSidebar.razor | 10 +- 5 files changed, 207 insertions(+), 220 deletions(-) diff --git a/SocialGuard.Api/Services/Authentication/AuthenticationService.cs b/SocialGuard.Api/Services/Authentication/AuthenticationService.cs index 033392e..4e2350f 100644 --- a/SocialGuard.Api/Services/Authentication/AuthenticationService.cs +++ b/SocialGuard.Api/Services/Authentication/AuthenticationService.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity; using Microsoft.IdentityModel.Tokens; using SocialGuard.Common.Data.Models.Authentication; using System.IdentityModel.Tokens.Jwt; @@ -141,4 +141,4 @@ public record AuthServiceResponse public Response Response { get; init; } } -public record AuthServiceResponse : AuthServiceResponse; \ No newline at end of file +public sealed record AuthServiceResponse : AuthServiceResponse; \ No newline at end of file diff --git a/SocialGuard.Api/Startup.cs b/SocialGuard.Api/Startup.cs index d6120b0..8bfd76a 100644 --- a/SocialGuard.Api/Startup.cs +++ b/SocialGuard.Api/Startup.cs @@ -22,247 +22,246 @@ using SocialGuard.Api.Services.Admin; -namespace SocialGuard.Api +namespace SocialGuard.Api; + +public class Startup { - public class Startup + public Startup(IConfiguration configuration) { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } + Configuration = configuration; + } - public IConfiguration Configuration { get; } - public static string Version { get; } = typeof(Startup).Assembly.GetCustomAttribute()?.InformationalVersion; + public IConfiguration Configuration { get; } + public static string Version { get; } = typeof(Startup).Assembly.GetCustomAttribute()?.InformationalVersion; - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddControllers(config => { config.ModelBinderProviders.Insert(0, new CommaSeparatedArrayModelBinderProvider()); }); + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers(config => { config.ModelBinderProviders.Insert(0, new CommaSeparatedArrayModelBinderProvider()); }); - services.AddApiVersioning(config => - { - config.DefaultApiVersion = new(3, 1, "rc1"); - config.AssumeDefaultVersionWhenUnspecified = true; - config.ReportApiVersions = true; - } - ); + services.AddApiVersioning(config => + { + config.DefaultApiVersion = new(3, 1, "rc1"); + config.AssumeDefaultVersionWhenUnspecified = true; + config.ReportApiVersions = true; + } + ); - services.AddVersionedApiExplorer(options => - { - // add the versioned api explorer, which also adds IApiVersionDescriptionProvider service - // note: the specified format code will format the version as "'v'major[.minor][-status]" - options.GroupNameFormat = "'v'VVV"; + services.AddVersionedApiExplorer(options => + { + // add the versioned api explorer, which also adds IApiVersionDescriptionProvider service + // note: the specified format code will format the version as "'v'major[.minor][-status]" + options.GroupNameFormat = "'v'VVV"; - // note: this option is only necessary when versioning by url segment. the SubstitutionFormat - // can also be used to control the format of the API version in route templates - options.SubstituteApiVersionInUrl = true; - } - ); + // note: this option is only necessary when versioning by url segment. the SubstitutionFormat + // can also be used to control the format of the API version in route templates + options.SubstituteApiVersionInUrl = true; + } + ); - string dbConnectionString = Configuration.GetConnectionString("Database"); + string dbConnectionString = Configuration.GetConnectionString("Database"); - services.AddDbContextPool(o => - o.UseNpgsql(dbConnectionString, p => - p.EnableRetryOnFailure() - ) - .UseSnakeCaseNamingConvention() - ); + services.AddDbContextPool(o => + o.UseNpgsql(dbConnectionString, p => + p.EnableRetryOnFailure() + ) + .UseSnakeCaseNamingConvention() + ); - services.AddDbContextPool(o => - o.UseNpgsql(dbConnectionString, p => - p.EnableRetryOnFailure() - ) - .UseSnakeCaseNamingConvention() - ); + services.AddDbContextPool(o => + o.UseNpgsql(dbConnectionString, p => + p.EnableRetryOnFailure() + ) + .UseSnakeCaseNamingConvention() + ); + + services.AddTransient, ConfigureSwaggerOptions>(); - services.AddTransient, ConfigureSwaggerOptions>(); + services.AddSwaggerGen(options => + { + options.OperationFilter(); + + // Set the comments path for the Swagger JSON and UI. + string xmlFile = $"{typeof(Startup).Assembly.GetName().Name}.xml"; + string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); + options.IncludeXmlComments(xmlPath); + + // Bearer token authentication + options.AddSecurityDefinition("jwt_auth", new() + { + Name = "bearer", + BearerFormat = "JWT", + Scheme = "bearer", + Description = "Specify the authorization token.", + In = ParameterLocation.Header, + Type = SecuritySchemeType.Http, + } + ); - services.AddSwaggerGen(options => + // Make sure swagger UI requires a Bearer token specified + OpenApiSecurityScheme securityScheme = new() { - options.OperationFilter(); - - // Set the comments path for the Swagger JSON and UI. - string xmlFile = $"{typeof(Startup).Assembly.GetName().Name}.xml"; - string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); - options.IncludeXmlComments(xmlPath); - - // Bearer token authentication - options.AddSecurityDefinition("jwt_auth", new() - { - Name = "bearer", - BearerFormat = "JWT", - Scheme = "bearer", - Description = "Specify the authorization token.", - In = ParameterLocation.Header, - Type = SecuritySchemeType.Http, - } - ); - - // Make sure swagger UI requires a Bearer token specified - OpenApiSecurityScheme securityScheme = new() + Reference = new() { - Reference = new() - { - Id = "jwt_auth", - Type = ReferenceType.SecurityScheme - } - }; + Id = "jwt_auth", + Type = ReferenceType.SecurityScheme + } + }; - options.AddSecurityRequirement(new() - { - { securityScheme, Array.Empty() } - } - ); - } - ); + options.AddSecurityRequirement(new() + { + { securityScheme, Array.Empty() } + } + ); + } + ); - services.AddSignalR(config => config.EnableDetailedErrors = true) - .AddMessagePackProtocol(); + services.AddSignalR(config => config.EnableDetailedErrors = true) + .AddMessagePackProtocol(); - /* - services.AddIdentityMongoDbProvider( - options => { }, - mongo => - { - IConfigurationSection config = Configuration.GetSection("Auth"); - mongo.ConnectionString = config["ConnectionString"]; - mongo.MigrationCollection = config["Tables:Migration"]; - mongo.RolesCollection = config["Tables:Role"]; - mongo.UsersCollection = config["Tables:User"]; - }); - */ + /* + services.AddIdentityMongoDbProvider( + options => { }, + mongo => + { + IConfigurationSection config = Configuration.GetSection("Auth"); + mongo.ConnectionString = config["ConnectionString"]; + mongo.MigrationCollection = config["Tables:Migration"]; + mongo.RolesCollection = config["Tables:Role"]; + mongo.UsersCollection = config["Tables:User"]; + }); + */ - // Add Identity - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); + // Add Identity + services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); - services.AddAuthentication(options => - { - options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; - } - ) + services.AddAuthentication(options => + { + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; + } + ) - // Adding Jwt Bearer - .AddJwtBearer(options => + // Adding Jwt Bearer + .AddJwtBearer(options => + { + options.SaveToken = true; + options.RequireHttpsMetadata = false; + options.TokenValidationParameters = new() { - options.SaveToken = true; - options.RequireHttpsMetadata = false; - options.TokenValidationParameters = new() - { - ValidateIssuer = true, - ValidateAudience = true, - ValidAudience = Configuration["JWT:ValidAudience"], - ValidIssuer = Configuration["JWT:ValidIssuer"], - IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(Configuration["JWT:Secret"])) - }; - } - ); - - services.AddCors(c => c.AddDefaultPolicy(builder => builder - .AllowAnyOrigin() - .AllowAnyHeader() - .AllowAnyMethod() - ) + ValidateIssuer = true, + ValidateAudience = true, + ValidAudience = Configuration["JWT:ValidAudience"], + ValidIssuer = Configuration["JWT:ValidIssuer"], + IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(Configuration["JWT:Secret"])) + }; + } ); + services.AddCors(c => c.AddDefaultPolicy(builder => builder + .AllowAnyOrigin() + .AllowAnyHeader() + .AllowAnyMethod() + ) + ); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); - services.AddSingleton(s => new MongoClient(Configuration["MongoDatabase:ConnectionString"]).GetDatabase(Configuration["MongoDatabase:DatabaseName"])); + services.AddTransient(); - services.AddScoped() - .AddScoped(); + services.AddSingleton(s => new MongoClient(Configuration["MongoDatabase:ConnectionString"]).GetDatabase(Configuration["MongoDatabase:DatabaseName"])); - services.AddTransient(); + services.AddScoped() + .AddScoped(); - services.AddApplicationInsightsTelemetry(options => - { + services.AddTransient(); + + services.AddApplicationInsightsTelemetry(options => + { #if DEBUG - options.DeveloperMode = true; + options.DeveloperMode = true; #endif - } - ); + } + ); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVersionDescriptionProvider provider) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVersionDescriptionProvider provider) + List allowedProxies = Configuration.GetSection("AllowedProxies")?.Get()?.Select(IPAddress.Parse).ToList(); + + // Nginx configuration step + ForwardedHeadersOptions forwardedHeadersOptions = new() { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } + ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto + }; - List allowedProxies = Configuration.GetSection("AllowedProxies")?.Get()?.Select(IPAddress.Parse).ToList(); + if (allowedProxies is { Count: > 0 }) + { + forwardedHeadersOptions.KnownProxies.Clear(); - // Nginx configuration step - ForwardedHeadersOptions forwardedHeadersOptions = new() + foreach (IPAddress address in allowedProxies) { - ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto - }; + forwardedHeadersOptions.KnownProxies.Add(address); + } + } + + app.UseStaticFiles(); - if (allowedProxies is { Count: > 0 }) + app.UseSwagger(options => { options.RouteTemplate = "swagger/{documentName}/swagger.json"; }); + app.UseSwaggerUI(options => { - forwardedHeadersOptions.KnownProxies.Clear(); + options.RoutePrefix = "swagger"; - foreach (IPAddress address in allowedProxies) + foreach (ApiVersionDescription description in provider.ApiVersionDescriptions.OrderByDescending(x => x.ApiVersion)) { - forwardedHeadersOptions.KnownProxies.Add(address); + options.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json", description.GroupName.ToLowerInvariant()); } } + ); - app.UseStaticFiles(); - - app.UseSwagger(options => { options.RouteTemplate = "swagger/{documentName}/swagger.json"; }); - app.UseSwaggerUI(options => - { - options.RoutePrefix = "swagger"; - - foreach (ApiVersionDescription description in provider.ApiVersionDescriptions.OrderByDescending(x => x.ApiVersion)) - { - options.SwaggerEndpoint($"/swagger/{description.GroupName}/swagger.json", description.GroupName.ToLowerInvariant()); - } - } - ); - - app.UseHttpsRedirection(); + app.UseHttpsRedirection(); - app.UseRouting(); - app.UseCors(); + app.UseRouting(); + app.UseCors(); - app.UseForwardedHeaders(forwardedHeadersOptions); + app.UseForwardedHeaders(forwardedHeadersOptions); - app.UseAuthentication(); - app.UseAuthorization(); + app.UseAuthentication(); + app.UseAuthorization(); - app.UseMiddleware(); + app.UseMiddleware(); - app.UseEndpoints(endpoints => - { - /* - * Remove once proper website is built. - */ - endpoints.MapGet("/", context => - { - context.Response.Redirect("/swagger/index.html"); + app.UseEndpoints(endpoints => + { + /* + * Remove once proper website is built. + */ + endpoints.MapGet("/", context => + { + context.Response.Redirect("/swagger/index.html"); - return Task.CompletedTask; - } - ); + return Task.CompletedTask; + } + ); - endpoints.MapControllers(); + endpoints.MapControllers(); - endpoints.MapHub("/hubs/trustlist"); - } - ); - } + endpoints.MapHub("/hubs/trustlist"); + } + ); } } \ No newline at end of file diff --git a/SocialGuard.Common/Data/Models/Emitter.cs b/SocialGuard.Common/Data/Models/Emitter.cs index f943309..176d90b 100644 --- a/SocialGuard.Common/Data/Models/Emitter.cs +++ b/SocialGuard.Common/Data/Models/Emitter.cs @@ -13,6 +13,6 @@ public record Emitter public ulong Snowflake { get; init; } - [Required, DisallowNull] + [Required] public string DisplayName { get; init; } = string.Empty; } diff --git a/SocialGuard.Web/Program.cs b/SocialGuard.Web/Program.cs index eebfa4b..2b198b6 100644 --- a/SocialGuard.Web/Program.cs +++ b/SocialGuard.Web/Program.cs @@ -9,35 +9,31 @@ -namespace SocialGuard.Web +namespace SocialGuard.Web; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - IHost host = CreateHostBuilder(args).Build(); + IHost host = CreateHostBuilder(args).Build(); - Log.Logger = new LoggerConfiguration() - #if DEBUG - .MinimumLevel.Debug() + Log.Logger = new LoggerConfiguration() +#if DEBUG + .MinimumLevel.Debug() #else .MinimumLevel.Information() .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information) #endif - .Enrich.FromLogContext() - .WriteTo.Console() - .CreateLogger(); - - await host.RunAsync(); - } + .Enrich.FromLogContext() + .WriteTo.Console() + .CreateLogger(); - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - webBuilder.UseSerilog(); - }); + await host.RunAsync(); } -} + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup()) + .UseSerilog(); +} \ No newline at end of file diff --git a/SocialGuard.Web/Shared/Docs/VaultSidebar.razor b/SocialGuard.Web/Shared/Docs/VaultSidebar.razor index 9214317..404e6b8 100644 --- a/SocialGuard.Web/Shared/Docs/VaultSidebar.razor +++ b/SocialGuard.Web/Shared/Docs/VaultSidebar.razor @@ -1,12 +1,4 @@ -
- @*
*@ - @*
*@ - @*
*@ - @* @Vault.Name *@ - @*
*@ - @*
*@ - @*
*@ - +
From 61b4544fa6b2607fc4d4a3e84c8e6d02e4c06c87 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 Feb 2024 11:21:46 +0100 Subject: [PATCH 05/12] feat(Utilities): Update trustlist level colors and display strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Changed the bootstrap color for trustlist levels greater than 3 to "nuclear" - Updated the display string for trustlist levels greater than 3 to "☢️ Nuclear ☢️" - Added keyframes for flashing nuclear color and border - Created mixins for applying the nuclear flashing animation to text and borders --- SocialGuard.Web.Viewer/Utilities.cs | 6 ++- .../wwwroot/css/blazor.scss | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/SocialGuard.Web.Viewer/Utilities.cs b/SocialGuard.Web.Viewer/Utilities.cs index b9e0f66..2f2a7e4 100644 --- a/SocialGuard.Web.Viewer/Utilities.cs +++ b/SocialGuard.Web.Viewer/Utilities.cs @@ -6,7 +6,8 @@ public static class Utilities { public static string GetTrustlistLevelBootstrapColor(this TrustlistEntry entry) => entry.EscalationLevel switch { - >= 3 => "danger", + > 3 => "nuclear", + 3 => "danger", 2 => "warning", 1 => "info", _ => "success" @@ -14,7 +15,8 @@ public static class Utilities public static string GetTrustlistLevelDisplayString(this TrustlistEntry entry) => entry.EscalationLevel switch { - >= 3 => "Dangerous", + > 3 => "☢️ Nuclear ☢️", + 3 => "Dangerous", 2 => "Untrusted", 1 => "Suspicious", _ => "Clean" diff --git a/SocialGuard.Web.Viewer/wwwroot/css/blazor.scss b/SocialGuard.Web.Viewer/wwwroot/css/blazor.scss index 9718b97..8a46824 100644 --- a/SocialGuard.Web.Viewer/wwwroot/css/blazor.scss +++ b/SocialGuard.Web.Viewer/wwwroot/css/blazor.scss @@ -85,6 +85,52 @@ h1:focus { } } +@keyframes flash-nuclear-color { + 0% { + color: red; + } + 50% { + color: yellow; + } + 100% { + color: red; + } +} + +@keyframes flash-nuclear-border { + 0% { + border-color: red; + } + 50% { + border-color: yellow; + } + 100% { + border-color: red; + } +} + +%color-nuclear { + // Flash colors from red to yellow and back + animation: flash-nuclear-color 1s linear infinite; +} + +%border-nuclear { + // Flash colors from red to yellow and back + animation: flash-nuclear-border 1s linear infinite; +} + +.text { + &-nuclear { + @extend %color-nuclear; + } +} + +.border { + &-nuclear { + @extend %border-nuclear; + } +} + @keyframes lds-dual-ring { 0% { transform: rotate(0deg); From 7eb894a3c464cbd6e32c1083936647bfe8ad1a9d Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 Feb 2024 11:52:41 +0100 Subject: [PATCH 06/12] feat: Update target frameworks to .NET 8.0 + package versions - Updated the target framework of `SocialGuard.Api.DbMigrator.csproj` to `net8.0` - Updated the target framework of `SocialGuard.Api.csproj` to `net8.0` - Updated the target framework of `SocialGuard.Web.Viewer.csproj` to `net8.0` - Updated various package references in all projects to their latest versions --- .../SocialGuard.Api.DbMigrator.csproj | 2 +- SocialGuard.Api/SocialGuard.Api.csproj | 37 +++++++++---------- .../SocialGuard.Web.Viewer.csproj | 3 +- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj b/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj index 11f129b..5087c6c 100644 --- a/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj +++ b/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable dotnet-SocialGuard.Api.DbMigrator-3AA5545F-89A5-43BD-81AE-EEB10C452C57 diff --git a/SocialGuard.Api/SocialGuard.Api.csproj b/SocialGuard.Api/SocialGuard.Api.csproj index e56703c..c5676f9 100644 --- a/SocialGuard.Api/SocialGuard.Api.csproj +++ b/SocialGuard.Api/SocialGuard.Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 328b09f5-4635-4228-b9af-a4f5bab47844 true @@ -16,28 +16,25 @@ - - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + + + + + + + diff --git a/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj b/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj index f948a93..1d293fe 100644 --- a/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj +++ b/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj @@ -1,11 +1,10 @@  - net7.0 + net8.0 enable enable service-worker-assets.js - viewer From ea67624a766c79927c8f615019f02619db1a6603 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 Feb 2024 11:53:18 +0100 Subject: [PATCH 07/12] feat(config): Update Serilog configuration - Updated the Serilog configuration in both appsettings.Development.json and appsettings.json files. - Added "Serilog" section with "Using", "MinimumLevel", "Enrich", and "WriteTo" properties. - Modified the Program.cs file to use the updated Serilog configuration. --- SocialGuard.Api/Program.cs | 2 +- SocialGuard.Api/appsettings.Development.json | 26 +++++++++++++++----- SocialGuard.Api/appsettings.json | 25 +++++++++++++++---- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/SocialGuard.Api/Program.cs b/SocialGuard.Api/Program.cs index c06e443..e03a5ee 100644 --- a/SocialGuard.Api/Program.cs +++ b/SocialGuard.Api/Program.cs @@ -50,6 +50,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup()) - .UseSerilog(); + .UseSerilog((hostingCtx, config) => config.ReadFrom.Configuration(hostingCtx.Configuration)); } } diff --git a/SocialGuard.Api/appsettings.Development.json b/SocialGuard.Api/appsettings.Development.json index 7d5732e..fa32807 100644 --- a/SocialGuard.Api/appsettings.Development.json +++ b/SocialGuard.Api/appsettings.Development.json @@ -1,10 +1,24 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } + "Serilog": { + "Using": [ + "Serilog.Sinks.Console" + ], + "MinimumLevel": { + "Default": "Debug", + "Override": { + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "Enrich": [ + "FromLogContext", + "WithAssemblyName" + ], + "WriteTo": [ + { + "Name": "Console" + } + ] }, "MongoDatabase": { diff --git a/SocialGuard.Api/appsettings.json b/SocialGuard.Api/appsettings.json index c3ec507..29b5352 100644 --- a/SocialGuard.Api/appsettings.json +++ b/SocialGuard.Api/appsettings.json @@ -1,11 +1,26 @@ { - "Logging": { - "LogLevel": { + "Serilog": { + "Using": [ + "Serilog.Sinks.Console" + ], + "MinimumLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } + "Override": { + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "Enrich": [ + "FromLogContext", + "WithAssemblyName" + ], + "WriteTo": [ + { + "Name": "Console" + } + ] }, + "AllowedHosts": "*", "MongoDatabase": { From 2ac286db163d4dc79fc880da166313867811cda0 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Fri, 12 Apr 2024 10:24:50 +0200 Subject: [PATCH 08/12] feat(docs): Update MoltenObsidian dependencies & add elements styling - Updated the package references for `Nodsoft.MoltenObsidian.Blazor` and `Nodsoft.MoltenObsidian.Vaults.Http` to version 1.0.4-beta. - Added a new SCSS file `_docs.scss` with styles for code blocks, markdown alerts, and JSON syntax highlighting. - Imported `_docs.scss` in the `site.scss` file under the `article.docs` section. - Added a new SCSS file `json.scss` with styles for JSON syntax highlighting. The changes include updating package references and adding new SCSS files for tags, code styling and JSON syntax highlighting. --- SocialGuard.Web/SocialGuard.Web.csproj | 4 +- SocialGuard.Web/wwwroot/css/_docs.scss | 83 ++++++++++++++++++++ SocialGuard.Web/wwwroot/css/site.scss | 4 + SocialGuard.Web/wwwroot/css/syntax/json.scss | 11 +++ 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 SocialGuard.Web/wwwroot/css/_docs.scss create mode 100644 SocialGuard.Web/wwwroot/css/syntax/json.scss diff --git a/SocialGuard.Web/SocialGuard.Web.csproj b/SocialGuard.Web/SocialGuard.Web.csproj index 197781d..6262476 100644 --- a/SocialGuard.Web/SocialGuard.Web.csproj +++ b/SocialGuard.Web/SocialGuard.Web.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/SocialGuard.Web/wwwroot/css/_docs.scss b/SocialGuard.Web/wwwroot/css/_docs.scss new file mode 100644 index 0000000..95a0d0e --- /dev/null +++ b/SocialGuard.Web/wwwroot/css/_docs.scss @@ -0,0 +1,83 @@ +@mixin code-font() { + font-family: monospace; + font-size: 90%; +} + +pre { + @include code-font(); + padding: 1em; + background-color: rgba(white, 0.05); + border-radius: 0.5em; + white-space: pre-wrap; +} + +:not(pre) code { + @include code-font(); + + color: #e83e8c; + text-decoration-color: #e83e8c; + background-color: rgba(white, 0.03); + padding: 0.25em 0.5em; + border-radius: 0.3em; +} + +.markdown-alert { + @mixin callout-color($name, $color) { + background-color: rgba($color, 0.1); + + &-title { + color: $color; + + svg { + fill: $color; + } + } + } + + background-color: rgba(white, 0.025); + background-blend-mode: lighten; + padding: 1.5em; + border-radius: 0.5em; + margin: 1em 0; + + &-title { + display: flex; + align-items: center; + gap: 0.5em; + font-weight: bold; + } + + p:first-child { + margin-block-start: 0; + } + + p:last-child { + margin-block-end: 0; + } + + // Colors + @include callout-color("info", rgb(0, 122, 255)); +} + +@mixin code-block-syntax($lang) { + .lang-#{$lang} .#{$lang} pre { + @content; + } +} + +@include code-block-syntax("json") { + @import "syntax/json"; +} + +.moltenobsidian-tag { + background-color: rgba(0, 173, 181, 0.1); + padding-inline: .75em; + padding-block: .25em; + border-radius: 1em; + + &::before { + content: "#"; + padding-inline-end: 0.25em; + color: var(--bs-primary); + } +} \ No newline at end of file diff --git a/SocialGuard.Web/wwwroot/css/site.scss b/SocialGuard.Web/wwwroot/css/site.scss index 2068604..21f05fd 100644 --- a/SocialGuard.Web/wwwroot/css/site.scss +++ b/SocialGuard.Web/wwwroot/css/site.scss @@ -125,4 +125,8 @@ body { -webkit-backdrop-filter: blur(50px); backdrop-filter: blur(50px); +} + +article.docs { + @import "docs"; } \ No newline at end of file diff --git a/SocialGuard.Web/wwwroot/css/syntax/json.scss b/SocialGuard.Web/wwwroot/css/syntax/json.scss new file mode 100644 index 0000000..6ee7297 --- /dev/null +++ b/SocialGuard.Web/wwwroot/css/syntax/json.scss @@ -0,0 +1,11 @@ +$symbols-color: ( + "jsonKey": #D7BA7D, + "jsonString": #D69D85, + "jsonNumber": #B5CEA8, +); + +@each $symbol, $color in $symbols-color { + .#{$symbol} { + color: $color; + } +} \ No newline at end of file From 3e590c688809a0853faa824a1f3a2e49ca92d8a5 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 May 2025 22:00:04 +0200 Subject: [PATCH 09/12] feat: Update target frameworks to net8.0 Switches project dependencies to .NET 8.0 for improved features and future readiness. --- SocialGuard.Client.Http/SocialGuard.Client.Http.csproj | 2 +- SocialGuard.Common/SocialGuard.Common.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj b/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj index d2fc3a5..b359d0a 100644 --- a/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj +++ b/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/SocialGuard.Common/SocialGuard.Common.csproj b/SocialGuard.Common/SocialGuard.Common.csproj index 42a52ca..fcaf434 100644 --- a/SocialGuard.Common/SocialGuard.Common.csproj +++ b/SocialGuard.Common/SocialGuard.Common.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 enable Common assets for NSYS SocialGuard. From 1452199441e2ed22faca14c0e42b4d7fd53891a8 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 May 2025 22:00:26 +0200 Subject: [PATCH 10/12] build: update version suffix to rc5 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7d1c136..5154ce7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ latest 3.1 - rc4 + rc5 Sakura Akeno Isayeki Nodsoft Systems From 863e894b1b768f9bf9cbd5c38920d166f31711f1 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 May 2025 22:01:46 +0200 Subject: [PATCH 11/12] chore: Update .NET versions in workflows to 8.0 Bumps the .NET SDK version from 7.0.x to 8.0 in build and publish workflows for compatibility with newer runtime features and improvements. --- .github/workflows/dotnet.yml | 7 +++++-- .github/workflows/publish-nuget.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d5da2d7..ee1e6b0 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -23,11 +23,14 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '7.0.x' - include-prerelease: true + dotnet-version: '8.0' +# include-prerelease: true + - name: Restore dependencies run: dotnet restore *.sln + - name: Build run: dotnet build --no-restore *.sln + - name: Test run: dotnet test --no-build --verbosity normal *.sln diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index 5483a08..53537ab 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -34,7 +34,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.x + dotnet-version: '8.0' # Publish - name: Build, Pack & Publish ${{ matrix.project.name }} to ${{ matrix.nuget.name }} From 86dc7b065dec6c5940f8a374150fc59c9e3d1aba Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sat, 10 May 2025 22:18:05 +0200 Subject: [PATCH 12/12] build: update package references for dependency improvements Updates various package versions across multiple projects to enhance stability, security, and feature sets. Includes version bumps for libraries related to database operations, authentication, logging, and frontend tooling. --- .../SocialGuard.Api.DbMigrator.csproj | 4 ++-- SocialGuard.Api/SocialGuard.Api.csproj | 22 +++++++++---------- .../SocialGuard.Client.Http.csproj | 3 +-- SocialGuard.Common/SocialGuard.Common.csproj | 2 +- .../SocialGuard.Web.Viewer.csproj | 13 +++++------ SocialGuard.Web/SocialGuard.Web.csproj | 8 +++---- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj b/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj index 5087c6c..4a2902f 100644 --- a/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj +++ b/SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/SocialGuard.Api/SocialGuard.Api.csproj b/SocialGuard.Api/SocialGuard.Api.csproj index c5676f9..74a8595 100644 --- a/SocialGuard.Api/SocialGuard.Api.csproj +++ b/SocialGuard.Api/SocialGuard.Api.csproj @@ -17,24 +17,24 @@ - - - - + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - - + + - + diff --git a/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj b/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj index b359d0a..678bd5f 100644 --- a/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj +++ b/SocialGuard.Client.Http/SocialGuard.Client.Http.csproj @@ -21,8 +21,7 @@ - - + diff --git a/SocialGuard.Common/SocialGuard.Common.csproj b/SocialGuard.Common/SocialGuard.Common.csproj index fcaf434..4593d70 100644 --- a/SocialGuard.Common/SocialGuard.Common.csproj +++ b/SocialGuard.Common/SocialGuard.Common.csproj @@ -15,7 +15,7 @@ - + diff --git a/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj b/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj index 1d293fe..a9a2784 100644 --- a/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj +++ b/SocialGuard.Web.Viewer/SocialGuard.Web.Viewer.csproj @@ -12,16 +12,15 @@ - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/SocialGuard.Web/SocialGuard.Web.csproj b/SocialGuard.Web/SocialGuard.Web.csproj index 6262476..3917953 100644 --- a/SocialGuard.Web/SocialGuard.Web.csproj +++ b/SocialGuard.Web/SocialGuard.Web.csproj @@ -9,10 +9,10 @@ - - - - + + + +