tests fixes
This commit is contained in:
@@ -54,7 +54,7 @@ internal static class KevMapper
|
||||
|
||||
var aliases = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { cveId };
|
||||
|
||||
var references = BuildReferences(entry, sourceName, mappingProvenance, feedUri, cveId).ToArray();
|
||||
var references = BuildReferences(entry, sourceName, fetchProvenance, feedUri, cveId).ToArray();
|
||||
|
||||
var affectedPackages = BuildAffectedPackages(
|
||||
entry,
|
||||
@@ -94,12 +94,13 @@ internal static class KevMapper
|
||||
private static IEnumerable<AdvisoryReference> BuildReferences(
|
||||
KevVulnerabilityDto entry,
|
||||
string sourceName,
|
||||
AdvisoryProvenance mappingProvenance,
|
||||
AdvisoryProvenance fetchProvenance,
|
||||
Uri feedUri,
|
||||
string cveId)
|
||||
{
|
||||
var references = new List<AdvisoryReference>();
|
||||
var provenance = new AdvisoryProvenance(sourceName, "reference", cveId, mappingProvenance.RecordedAt);
|
||||
// Use the document provenance for references (matches the feed document source)
|
||||
var provenance = fetchProvenance;
|
||||
|
||||
var catalogUrl = BuildCatalogSearchUrl(cveId);
|
||||
if (catalogUrl is not null)
|
||||
|
||||
@@ -320,10 +320,10 @@ public sealed class ConcelierAuthorizationFactory : ConcelierApplicationFactory
|
||||
|
||||
builder.ConfigureServices(services =>
|
||||
{
|
||||
// Replace the ConcelierOptions singleton to include Authority settings
|
||||
// so the Testing path in Program.Main resolves them before AddAuthorization runs.
|
||||
services.RemoveAll<ConcelierOptions>();
|
||||
services.AddSingleton(new ConcelierOptions
|
||||
// Replace the ConcelierOptions singleton and IOptions<ConcelierOptions>
|
||||
// to include Authority settings. The application uses Options.Create(concelierOptions)
|
||||
// directly, so we need to replace both registrations.
|
||||
var authOptions = new ConcelierOptions
|
||||
{
|
||||
PostgresStorage = new ConcelierOptions.PostgresStorageOptions
|
||||
{
|
||||
@@ -344,23 +344,29 @@ public sealed class ConcelierAuthorizationFactory : ConcelierApplicationFactory
|
||||
RequiredScopes = new List<string> { StellaOpsScopes.ConcelierJobsTrigger },
|
||||
ClientScopes = new List<string> { StellaOpsScopes.ConcelierJobsTrigger }
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
services.PostConfigure<ConcelierOptions>(options =>
|
||||
{
|
||||
options.Authority ??= new ConcelierOptions.AuthorityOptions();
|
||||
options.Authority.Enabled = true;
|
||||
options.Authority.AllowAnonymousFallback = false;
|
||||
options.Authority.Issuer = TestIssuer;
|
||||
options.Authority.RequireHttpsMetadata = false;
|
||||
options.Authority.TestSigningSecret = TestSigningSecret;
|
||||
services.RemoveAll<ConcelierOptions>();
|
||||
services.RemoveAll<Microsoft.Extensions.Options.IOptions<ConcelierOptions>>();
|
||||
services.AddSingleton(authOptions);
|
||||
services.AddSingleton<Microsoft.Extensions.Options.IOptions<ConcelierOptions>>(
|
||||
_ => Microsoft.Extensions.Options.Options.Create(authOptions));
|
||||
|
||||
options.Authority.RequiredScopes.Clear();
|
||||
options.Authority.RequiredScopes.Add(StellaOpsScopes.ConcelierJobsTrigger);
|
||||
|
||||
options.Authority.ClientScopes.Clear();
|
||||
options.Authority.ClientScopes.Add(StellaOpsScopes.ConcelierJobsTrigger);
|
||||
});
|
||||
// Add authentication services for testing
|
||||
services.AddAuthentication()
|
||||
.AddJwtBearer(options =>
|
||||
{
|
||||
options.Authority = TestIssuer;
|
||||
options.RequireHttpsMetadata = false;
|
||||
options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters
|
||||
{
|
||||
ValidateIssuer = false,
|
||||
ValidateAudience = false,
|
||||
ValidateLifetime = false,
|
||||
ValidateIssuerSigningKey = false
|
||||
};
|
||||
});
|
||||
services.AddAuthorization();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user