Skip to content

Require attestation for operator config #277

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.

Sign up for GitHub

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

Merged
mcollins-ttd merged 3 commits into from
Apr 10, 2025
Merged

Require attestation for operator config #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b87547f
Require attestation for operator config
mcollins-ttd Apr 10, 2025
68c2faf
Fix name of cloud_encryption_keys_metadata_path
mcollins-ttd Apr 10, 2025
14544c9
Update operator config to new format
mcollins-ttd Apr 10, 2025
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
2 changes: 1 addition & 1 deletion conf/local-e2e-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"core_public_url": "http://localhost:8088",
"optout_url": "http://localhost:8081",
"s3_keys_metadata_path": "s3encryption_keys/metadata.json",
"cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
"encryption_support_version": "6.0.0"
}
11 changes: 7 additions & 4 deletions conf/operator/operator-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
"version": 1,
"runtime_config": {
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"sharing_token_expiry_seconds": 2592000
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/uid2/core/vertx/CoreVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private Router createRoutesSetup() {
router.get(Endpoints.OPERATORS_REFRESH.toString()).handler(auth.handle(attestationMiddleware.handle(this::handleOperatorRefresh), Role.OPTOUT_SERVICE));
router.get(Endpoints.PARTNERS_REFRESH.toString()).handler(auth.handle(attestationMiddleware.handle(this::handlePartnerRefresh), Role.OPTOUT_SERVICE));
router.get(Endpoints.OPS_HEALTHCHECK.toString()).handler(this::handleHealthCheck);
router.get(Endpoints.OPERATOR_CONFIG.toString()).handler(auth.handle(this::handleGetConfig, Role.OPERATOR));
router.get(Endpoints.OPERATOR_CONFIG.toString()).handler(auth.handle(attestationMiddleware.handle(this::handleGetConfig), Role.OPERATOR));

if (Optional.ofNullable(ConfigStore.Global.getBoolean("enable_test_endpoints")).orElse(false)) {
router.route(Endpoints.ATTEST_GET_TOKEN.toString()).handler(auth.handle(this::handleTestGetAttestationToken, Role.OPERATOR));
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/uid2/core/vertx/CoreVerticleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,10 +894,11 @@ void keysRefreshSuccessNoHeaderVersion(Vertx vertx, VertxTestContext testContext
}

@Test
@Tag("dontForceJwt")
void getConfigSuccess(Vertx vertx, VertxTestContext testContext) {
JsonObject expectedConfig = new JsonObject(operatorConfig);

fakeAuth(Role.OPERATOR);
fakeAuth(attestationProtocolPublic, "PUBLIC", Role.OPERATOR);

// Make HTTP Get request to operator config endpoint
this.get(vertx, Endpoints.OPERATOR_CONFIG.toString(), testContext.succeeding(response -> testContext.verify(() -> {
Expand All @@ -911,10 +912,11 @@ void getConfigSuccess(Vertx vertx, VertxTestContext testContext) {
}

@Test
@Tag("dontForceJwt")
void getConfigInvalidJson(Vertx vertx, VertxTestContext testContext) {
operatorConfig = "invalid config";

fakeAuth(Role.OPERATOR);
fakeAuth(attestationProtocolPublic, "PUBLIC", Role.OPERATOR);

this.get(vertx, Endpoints.OPERATOR_CONFIG.toString(), testContext.succeeding(response -> testContext.verify(() -> {
assertEquals(500, response.statusCode());
Expand Down