Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new MAA test endpoint confinfermaaeus2test #8

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions governance/jwt/set_jwt_maa_validation_policy_proposal.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{
"name": "set_jwt_issuer",
"args": {
"issuer": "https://accnosecurebootmaa.eus2.attest.azure.net",
"issuer": "https://confinfermaaeus2test.eus2.test.attest.azure.net",
"key_filter": "all",
"ca_cert_bundle_name": "jwt_maa",
"auto_refresh": true
Expand All @@ -55,27 +55,9 @@
{
"name": "set_jwt_validation_policy",
"args": {
"issuer": "https://accnosecurebootmaa.eus2.attest.azure.net",
"issuer": "https://confinfermaaeus2test.eus2.test.attest.azure.net",
"validation_policy": {
"iss": "https://accnosecurebootmaa.eus2.attest.azure.net"
}
}
},
{
"name": "set_jwt_issuer",
"args": {
"issuer": "https://accnosecurebootmaawesteu.weu.attest.azure.net",
"key_filter": "all",
"ca_cert_bundle_name": "jwt_maa",
"auto_refresh": true
}
},
{
"name": "set_jwt_validation_policy",
"args": {
"issuer": "https://accnosecurebootmaawesteu.weu.attest.azure.net",
"validation_policy": {
"iss": "https://accnosecurebootmaawesteu.weu.attest.azure.net"
"iss": "https://confinfermaaeus2test.eus2.test.attest.azure.net"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/authorization/jwt/JwtIdentityProviderEnum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export enum JwtIdentityProviderEnum {
Demo = "http://Demo-jwt-issuer",
MAA_deus2 = "https://sharedeus2.eus2.attest.azure.net",
MAA_NoSecureBootTyFu = "https://maanosecureboottestyfu.eus.attest.azure.net",
MAA_NoSecureBootWeu = "https://accnosecurebootmaawesteu.weu.attest.azure.net",
MAA_NoSecureBootEus = "https://accnosecurebootmaa.eus2.attest.azure.net",
MAA_ConfInferenceTestEus2 = "https://confinfermaaeus2test.eus2.test.attest.azure.net",
// MAA_NoSecureBootWeu = "https://accnosecurebootmaawesteu.weu.attest.azure.net",
// MAA_NoSecureBootEus = "https://accnosecurebootmaa.eus2.attest.azure.net",
}
33 changes: 21 additions & 12 deletions src/authorization/jwt/JwtValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,32 @@ export class JwtValidator implements IValidatorService {
this.logContext
);
this.identityProviders.set(
JwtIdentityProviderEnum.MAA_NoSecureBootWeu,
JwtIdentityProviderEnum.MAA_ConfInferenceTestEus2,
new MsJwtProvider("JwtMaaProvider", this.logContext),
);
Logger.debug(
"JwtIdentityProviderEnum.MAA_NoSecureBootWeu",
JwtIdentityProviderEnum.MAA_NoSecureBootWeu,
this.logContext
);
this.identityProviders.set(
JwtIdentityProviderEnum.MAA_NoSecureBootEus,
new MsJwtProvider("JwtMaaProvider", this.logContext),
);
Logger.debug(
"JwtIdentityProviderEnum.MAA_NoSecureBootEus",
JwtIdentityProviderEnum.MAA_NoSecureBootEus,
"JwtIdentityProviderEnum.MAA_ConfInferenceTestEus2",
JwtIdentityProviderEnum.MAA_ConfInferenceTestEus2,
this.logContext
);
// this.identityProviders.set(
// JwtIdentityProviderEnum.MAA_NoSecureBootWeu,
// new MsJwtProvider("JwtMaaProvider", this.logContext),
// );
// Logger.debug(
// "JwtIdentityProviderEnum.MAA_NoSecureBootWeu",
// JwtIdentityProviderEnum.MAA_NoSecureBootWeu,
// this.logContext
// );
// this.identityProviders.set(
// JwtIdentityProviderEnum.MAA_NoSecureBootEus,
// new MsJwtProvider("JwtMaaProvider", this.logContext),
// );
// Logger.debug(
// "JwtIdentityProviderEnum.MAA_NoSecureBootEus",
// JwtIdentityProviderEnum.MAA_NoSecureBootEus,
// this.logContext
// );
this.identityProviders.set(
JwtIdentityProviderEnum.MS_AAD,
new MsJwtProvider("JwtProvider", this.logContext),
Expand Down