Compare commits
93
Commits
1.85.0
...
31254932ae
| Author | SHA1 | Date | |
|---|---|---|---|
 khwezi
|
31254932ae | ||
 Khwezi Mngoma
|
c53434a578 | ||
|
khwezi
|
5a0aae8182 | ||
|
Khwezi Mngoma
|
3f3e0dbe88 | ||
|
khwezi
|
8d8ebffabf | ||
|
Khwezi Mngoma
|
dc4addb43a | ||
|
khwezi
|
e2d29261da | ||
|
Khwezi Mngoma
|
5d5b59d610 | ||
|
khwezi
|
f001b02633 | ||
|
Khwezi Mngoma
|
90a11dc65e | ||
|
khwezi
|
de955a96a8 | ||
|
Khwezi Mngoma
|
cdf5cfb5cd | ||
|
khwezi
|
c4d3bb4cdf | ||
|
Khwezi Mngoma
|
65f102f18a | ||
|
khwezi
|
cdc80db214 | ||
|
khwezi
|
3847927ace | ||
|
khwezi
|
c27aba1954 | ||
|
khwezi
|
1c946dab26 | ||
|
khwezi
|
9977cf27b9 | ||
|
khwezi
|
8e9ac1e1ad | ||
|
khwezi
|
16dae7c9fb | ||
|
khwezi
|
f8153e86b4 | ||
|
khwezi
|
84d33d3607 | ||
|
khwezi
|
f51cc03327 | ||
|
khwezi
|
aff6fcabf4 | ||
|
khwezi
|
8140b5fe65 | ||
|
khwezi
|
9285cedfa9 | ||
|
khwezi
|
343874551a | ||
|
khwezi
|
0eac9d533f | ||
|
khwezi
|
24ba609e0c | ||
|
khwezi
|
29f6d66c44 | ||
|
khwezi
|
bcfc9ef962 | ||
|
khwezi
|
b4e967acc9 | ||
|
khwezi
|
205bbb9f3f | ||
|
khwezi
|
73ef4b04a9 | ||
|
khwezi
|
780415b6d4 | ||
|
khwezi
|
879094073a | ||
|
khwezi
|
b369dad452 | ||
|
khwezi
|
c938bfec09 | ||
|
khwezi
|
adc14038db | ||
|
khwezi
|
61cb6c2228 | ||
|
khwezi
|
e7a798b5e9 | ||
|
khwezi
|
41b6b71b31 | ||
|
khwezi
|
ee6beef603 | ||
|
khwezi
|
1c3f3eaf0d | ||
|
khwezi
|
2e77666d9e | ||
|
khwezi
|
1977b6b301 | ||
|
khwezi
|
0ab14d8b63 | ||
|
khwezi
|
466458e230 | ||
|
khwezi
|
141d32f591 | ||
|
khwezi
|
d9e7f225ae | ||
|
khwezi
|
6ae63e2ad1 | ||
|
khwezi
|
f5efdde37c | ||
|
khwezi
|
1592d5dc8f | ||
|
khwezi
|
50a8a59d92 | ||
|
khwezi
|
b70d9559b0 | ||
|
khwezi
|
81d5e8f07c | ||
|
khwezi
|
20a53942b5 | ||
|
khwezi
|
9edb2aa4aa | ||
|
khwezi
|
6ed023f2cf | ||
|
khwezi
|
2c9f5a846c | ||
|
khwezi
|
41f7c05be3 | ||
|
khwezi
|
1a03355e84 | ||
|
khwezi
|
7743c3178e | ||
|
khwezi
|
ab3d8e6e9a | ||
|
khwezi
|
db4c348288 | ||
|
khwezi
|
6683234642 | ||
|
khwezi
|
6ddbb9479a | ||
|
khwezi
|
6c7349a0f8 | ||
|
khwezi
|
e97fd6cd3f | ||
|
khwezi
|
184c7c252a | ||
|
khwezi
|
bfe8c458d6 | ||
|
khwezi
|
e6e0475db1 | ||
|
khwezi
|
5090c60797 | ||
|
khwezi
|
9432252e15 | ||
|
khwezi
|
47111a1a3a | ||
|
khwezi
|
6eb3d50375 | ||
|
khwezi
|
4deb732804 | ||
|
khwezi
|
20d9387d0b | ||
|
khwezi
|
9f6d0ccaa0 | ||
|
khwezi
|
1acbc4d213 | ||
|
khwezi
|
8c99668fac | ||
|
khwezi
|
ad44f46204 | ||
|
khwezi
|
49d999c1e3 | ||
|
khwezi
|
9ed4777a18 | ||
|
khwezi
|
0cf44f68cc | ||
|
khwezi
|
41ed5a4288 | ||
|
khwezi
|
bbcba5e06c | ||
|
khwezi
|
502cc326dd | ||
|
khwezi
|
4675d4c5fc | ||
|
khwezi
|
f80bb2fff9 | ||
|
khwezi
|
6767906b0d | ||
|
khwezi
|
a344af4498 |
@@ -11,7 +11,7 @@
|
||||
<!-- Quartz Scheduler-->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Bogus" Version="35.6.5" />
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
@@ -116,8 +116,8 @@
|
||||
|
||||
<!-- Amazon S3 SDK -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24" />
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
|
||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||
|
||||
<!-- global Usings -->
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<!-- Quartz Scheduler-->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Humanizer" Version="3.0.10" />
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
@@ -136,8 +136,8 @@
|
||||
|
||||
<!-- Amazon S3 SDK -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24" />
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
|
||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||
|
||||
<!-- global Usings -->
|
||||
|
||||
@@ -136,8 +136,8 @@
|
||||
|
||||
<!-- Amazon S3 SDK -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24" />
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
|
||||
<ProjectReference Include="..\LiteCharms.Features\LiteCharms.Features.csproj" />
|
||||
|
||||
<!-- global Usings -->
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
### Authentik Token Request (Service Account Explicit)
|
||||
POST {{authority}}
|
||||
POST {{authority}}/connect/token
|
||||
Content-Type: application/x-www-form-urlencoded
|
||||
Accept-Encoding: identity
|
||||
|
||||
grant_type={{grantType}}&client_id={{clientId}}&username={{username}}&password={{password}}&scope={{scope}}
|
||||
grant_type={{grantType}}&client_id={{clientId}}&client_secret={{clientSecret}}&scope={{scope}}
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"uat": {
|
||||
"authority": "https://sts.security.khongisa.co.za",
|
||||
"grantType": "client_credentials",
|
||||
"clientId": "midrandbooks-api-scaler-uat",
|
||||
"clientSecret": "secret_0a8dc1f99061590a52b1272db3a1871d2761c79fbd058b2a968911029e4b208a",
|
||||
"scope": "midrandbooks-api"
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
namespace LiteCharms.Features.Api.Configuration;
|
||||
|
||||
public sealed class AuthentikSettings
|
||||
{
|
||||
public string? Authority { get; set; }
|
||||
|
||||
public string? IntrospectionEndpoint { get; set; }
|
||||
|
||||
public string? MetadataEndpoint { get; set; }
|
||||
|
||||
public string? RevokationEndpoint { get; set; }
|
||||
|
||||
public string? ClientId { get; set; }
|
||||
|
||||
public string? ClientSecret { get; set; }
|
||||
|
||||
public string? RequiredClaimName { get; set; }
|
||||
|
||||
public string? RequiredClaimNameValue { get; set; }
|
||||
|
||||
public bool RequireHttpsMetadata { get; set; }
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
namespace LiteCharms.Features.Api.Configuration;
|
||||
|
||||
public sealed class LiteCharmsSettings
|
||||
{
|
||||
public string? Authority { get; set; }
|
||||
|
||||
public string? ClientId { get; set; }
|
||||
|
||||
public string? ClientSecret { get; set; }
|
||||
|
||||
public string? Audience { get; set; }
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using LiteCharms.Features.Abstractions;
|
||||
using LiteCharms.Features.Api;
|
||||
using LiteCharms.Features.Api.Configuration;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
|
||||
namespace LiteCharms.Features.Extensions;
|
||||
|
||||
@@ -9,14 +10,14 @@ public static class Api
|
||||
public const string Books = nameof(Books);
|
||||
public const string Payments = nameof(Payments);
|
||||
|
||||
public static IServiceCollection AddAuthentikUiSecurity(this IServiceCollection services, IConfiguration configuration)
|
||||
public static IServiceCollection AddLiteCharmsUiSecurity(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
var configSection = configuration.GetSection(nameof(AuthentikSettings));
|
||||
var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
|
||||
|
||||
var authOptions = new AuthentikSettings();
|
||||
var authOptions = new LiteCharmsSettings();
|
||||
configSection.Bind(authOptions);
|
||||
|
||||
services.Configure<AuthentikSettings>(configSection);
|
||||
services.Configure<LiteCharmsSettings>(configSection);
|
||||
|
||||
services.AddAuthentication(options =>
|
||||
{
|
||||
@@ -27,7 +28,6 @@ public static class Api
|
||||
.AddOpenIdConnect(OpenIdConnectDefaults.AuthenticationScheme, options =>
|
||||
{
|
||||
options.Authority = authOptions.Authority;
|
||||
options.MetadataAddress = authOptions.MetadataEndpoint;
|
||||
|
||||
options.ClientId = authOptions.ClientId;
|
||||
options.ClientSecret = authOptions.ClientSecret;
|
||||
@@ -42,59 +42,40 @@ public static class Api
|
||||
options.Scope.Add("profile");
|
||||
options.Scope.Add("email");
|
||||
|
||||
options.Events = new OpenIdConnectEvents
|
||||
{
|
||||
OnRedirectToIdentityProvider = context =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(context.ProtocolMessage.RedirectUri) && context.ProtocolMessage.RedirectUri.StartsWith("http://", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var uriBuilder = new UriBuilder(context.ProtocolMessage.RedirectUri)
|
||||
{
|
||||
Scheme = "https",
|
||||
Port = -1,
|
||||
};
|
||||
options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.Always;
|
||||
options.CorrelationCookie.SameSite = SameSiteMode.None;
|
||||
options.CorrelationCookie.HttpOnly = true;
|
||||
|
||||
context.ProtocolMessage.RedirectUri = uriBuilder.Uri.ToString();
|
||||
}
|
||||
|
||||
return Task.CompletedTask;
|
||||
},
|
||||
};
|
||||
options.NonceCookie.SecurePolicy = CookieSecurePolicy.Always;
|
||||
options.NonceCookie.SameSite = SameSiteMode.None;
|
||||
options.NonceCookie.HttpOnly = true;
|
||||
});
|
||||
|
||||
return services;
|
||||
}
|
||||
|
||||
public static IServiceCollection AddAuthentikApiSecurity(this IServiceCollection services, IConfiguration configuration)
|
||||
public static IServiceCollection AddLiteCharmsApiSecurity(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
var configSection = configuration.GetSection(nameof(AuthentikSettings));
|
||||
var configSection = configuration.GetSection(nameof(LiteCharmsSettings));
|
||||
|
||||
var authOptions = new AuthentikSettings();
|
||||
var authOptions = new LiteCharmsSettings();
|
||||
configSection.Bind(authOptions);
|
||||
|
||||
services.Configure<AuthentikSettings>(configSection);
|
||||
services.Configure<LiteCharmsSettings>(configSection);
|
||||
|
||||
services.AddAuthentication(OAuth2IntrospectionDefaults.AuthenticationScheme)
|
||||
.AddOAuth2Introspection(OAuth2IntrospectionDefaults.AuthenticationScheme, options =>
|
||||
services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
|
||||
.AddJwtBearer(options =>
|
||||
{
|
||||
options.Authority = authOptions.Authority;
|
||||
options.IntrospectionEndpoint = authOptions.IntrospectionEndpoint;
|
||||
options.ClientId = authOptions.ClientId;
|
||||
options.ClientSecret = authOptions.ClientSecret;
|
||||
|
||||
options.NameClaimType = "sub";
|
||||
options.DiscoveryPolicy.RequireHttps = authOptions.RequireHttpsMetadata;
|
||||
options.DiscoveryPolicy.ValidateEndpoints = false;
|
||||
options.EnableCaching = false;
|
||||
options.Audience = authOptions.Audience;
|
||||
options.TokenValidationParameters = new TokenValidationParameters
|
||||
{
|
||||
ValidIssuer = authOptions.Authority,
|
||||
ValidateAudience = true,
|
||||
ValidateIssuer = true,
|
||||
};
|
||||
});
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(authOptions.RequiredClaimName) && !string.IsNullOrWhiteSpace(authOptions.RequiredClaimNameValue))
|
||||
{
|
||||
services.AddAuthorizationBuilder()
|
||||
.AddPolicy("RequiredScope", policy =>
|
||||
policy.RequireClaim(authOptions.RequiredClaimName, authOptions.RequiredClaimNameValue));
|
||||
}
|
||||
else
|
||||
services.AddAuthorization();
|
||||
|
||||
return services;
|
||||
@@ -110,7 +91,7 @@ public static class Api
|
||||
});
|
||||
});
|
||||
|
||||
app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<AuthentikSettings> settings) =>
|
||||
app.MapGet("/logout", async (HttpContext context, IHttpClientFactory httpClientFactory, IOptions<LiteCharmsSettings> settings) =>
|
||||
{
|
||||
await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
<!-- Quartz Scheduler-->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Hashids.net" Version="1.7.0" />
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.98">
|
||||
<PackageReference Include="Meziantou.Analyzer" Version="3.0.101">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
@@ -171,8 +171,8 @@
|
||||
|
||||
<!-- Amazon S3 SDK -->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.3" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24" />
|
||||
<PackageReference Include="AWSSDK.Extensions.NetCore.Setup" Version="4.0.4.4" />
|
||||
<PackageReference Include="AWSSDK.S3" Version="4.0.24.1" />
|
||||
|
||||
<!-- global Usings -->
|
||||
<Using Include="Amazon.S3" />
|
||||
|
||||
Reference in New Issue
Block a user