diff --git a/conf/default-config.json b/conf/default-config.json
index cf8024fc1..c5de0d87b 100644
--- a/conf/default-config.json
+++ b/conf/default-config.json
@@ -31,6 +31,7 @@
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
+ "runtime_config_metadata_path": "runtime_config/metadata.json",
"encrypted_files": false,
"optout_metadata_path": null,
"optout_inmem_cache": false,
@@ -38,6 +39,6 @@
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"operator_type": "public",
- "enable_remote_config": false,
+ "enable_remote_config": true,
"uid_instance_id_prefix": "local-operator"
}
diff --git a/conf/docker-config.json b/conf/docker-config.json
index 213b4f426..0d841ba65 100644
--- a/conf/docker-config.json
+++ b/conf/docker-config.json
@@ -42,6 +42,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
- "enable_remote_config": false,
+ "enable_remote_config": true,
"uid_instance_id_prefix": "local-operator"
}
diff --git a/conf/local-config.json b/conf/local-config.json
index 3ad651e1e..061072ee6 100644
--- a/conf/local-config.json
+++ b/conf/local-config.json
@@ -41,7 +41,6 @@
"operator_type": "public",
"encrypted_files": false,
"disable_optout_token": true,
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-operator"
}
diff --git a/conf/local-e2e-docker-private-config.json b/conf/local-e2e-docker-private-config.json
index ac41a55a7..a6a58bbac 100644
--- a/conf/local-e2e-docker-private-config.json
+++ b/conf/local-e2e-docker-private-config.json
@@ -31,7 +31,6 @@
"cloud_refresh_interval": 30,
"salts_expired_shutdown_hours": 12,
"operator_type": "private",
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-private-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-private-operator"
}
diff --git a/conf/local-e2e-docker-public-config.json b/conf/local-e2e-docker-public-config.json
index 6921d31fd..d20fb52f0 100644
--- a/conf/local-e2e-docker-public-config.json
+++ b/conf/local-e2e-docker-public-config.json
@@ -38,7 +38,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-public-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-public-operator"
}
diff --git a/conf/local-e2e-private-config.json b/conf/local-e2e-private-config.json
index 473e3cdd7..55866d9a2 100644
--- a/conf/local-e2e-private-config.json
+++ b/conf/local-e2e-private-config.json
@@ -42,7 +42,6 @@
"client_side_token_generate_log_invalid_http_origins": true,
"salts_expired_shutdown_hours": 12,
"operator_type": "private",
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-private-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-private-operator"
}
diff --git a/conf/local-e2e-public-config.json b/conf/local-e2e-public-config.json
index 462b79d0f..60a832abc 100644
--- a/conf/local-e2e-public-config.json
+++ b/conf/local-e2e-public-config.json
@@ -44,7 +44,6 @@
"salts_expired_shutdown_hours": 12,
"operator_type": "public",
"disable_optout_token": true,
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-public-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-public-operator"
}
diff --git a/conf/validator-latest-e2e-docker-public-config.json b/conf/validator-latest-e2e-docker-public-config.json
index f5ba3ea4e..9fdc569f3 100644
--- a/conf/validator-latest-e2e-docker-public-config.json
+++ b/conf/validator-latest-e2e-docker-public-config.json
@@ -43,7 +43,6 @@
"config_scan_period_ms": 300000
},
"disable_optout_token": true,
- "enable_remote_config": false,
- "uid_instance_id_prefix": "local-public-operator",
- "identity_environment": "test"
+ "enable_remote_config": true,
+ "uid_instance_id_prefix": "local-public-operator"
}
diff --git a/pom.xml b/pom.xml
index bf65ce215..d3cb17d78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.uid2
uid2-operator
- 5.58.1
+ 5.58.4-alpha-457-SNAPSHOT
UTF-8
diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json
index 6b910a63c..bce9e1695 100644
--- a/scripts/aws/conf/default-config.json
+++ b/scripts/aws/conf/default-config.json
@@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
+ "runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"optout_inmem_cache": false,
"enclave_platform": "aws-nitro",
@@ -38,5 +39,6 @@
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"operator_type": "private",
+ "enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
\ No newline at end of file
diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json
index 702bc9ff2..fae54346d 100644
--- a/scripts/aws/conf/euid-integ-config.json
+++ b/scripts/aws/conf/euid-integ-config.json
@@ -11,6 +11,14 @@
"core_attest_url": "https://core.integ.euid.eu/attest",
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
"cloud_encryption_keys_metadata_path": "https://core.integ.euid.eu/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config",
"optout_s3_folder": "optout/",
- "identity_scope": "euid"
+ "identity_scope": "euid",
+ "runtime_config_store": {
+ "type": "http",
+ "config" : {
+ "url": "https://core.integ.euid.eu/operator/config"
+ },
+ "config_scan_period_ms": 300000
+ }
}
\ No newline at end of file
diff --git a/scripts/aws/conf/euid-prod-config.json b/scripts/aws/conf/euid-prod-config.json
index b9f043485..2c32ab008 100644
--- a/scripts/aws/conf/euid-prod-config.json
+++ b/scripts/aws/conf/euid-prod-config.json
@@ -11,6 +11,7 @@
"optout_metadata_path": "https://optout.prod.euid.eu/optout/refresh",
"core_attest_url": "https://core.prod.euid.eu/attest",
"cloud_encryption_keys_metadata_path": "https://core.prod.euid.eu/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.prod.euid.eu/operator/config",
"core_api_token": "your-api-token",
"optout_s3_path_compat": false,
"optout_api_uri": "https://optout.prod.euid.eu/optout/replicate",
diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json
index 3c267a655..682b904f5 100644
--- a/scripts/aws/conf/uid2-integ-config.json
+++ b/scripts/aws/conf/uid2-integ-config.json
@@ -11,6 +11,13 @@
"service_links_metadata_path": "https://core-integ.uidapi.com/service_links/refresh",
"optout_metadata_path": "https://optout-integ.uidapi.com/optout/refresh",
"cloud_encryption_keys_metadata_path": "https://core-integ.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core-integ.uidapi.com/operator/config",
"optout_s3_folder": "uid-optout-integ/",
- "identity_scope": "uid2"
-}
+ "identity_scope": "uid2",
+ "runtime_config_store": {
+ "type": "http",
+ "config" : {
+ "url": "https://core-integ.uidapi.com/operator/config"
+ },
+ "config_scan_period_ms": 300000
+ }}
diff --git a/scripts/aws/conf/uid2-prod-config.json b/scripts/aws/conf/uid2-prod-config.json
index 25ad8c7af..1790d8155 100644
--- a/scripts/aws/conf/uid2-prod-config.json
+++ b/scripts/aws/conf/uid2-prod-config.json
@@ -11,6 +11,7 @@
"optout_metadata_path": "https://optout-prod.uidapi.com/optout/refresh",
"core_attest_url": "https://core-prod.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core-prod.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core-prod.uidapi.com/operator/config",
"core_api_token": "your-api-token",
"optout_s3_path_compat": false,
"optout_api_uri": "https://optout-prod.uidapi.com/optout/replicate",
diff --git a/scripts/azure-cc/conf/default-config.json b/scripts/azure-cc/conf/default-config.json
index c7e8d6ab3..1b745afbb 100644
--- a/scripts/azure-cc/conf/default-config.json
+++ b/scripts/azure-cc/conf/default-config.json
@@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
+ "runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "azure-cc",
"optout_inmem_cache": true,
@@ -38,6 +39,6 @@
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private",
- "enable_remote_config": false,
+ "enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json
index 010a184ea..1b419abf7 100644
--- a/scripts/azure-cc/conf/integ-uid2-config.json
+++ b/scripts/azure-cc/conf/integ-uid2-config.json
@@ -11,6 +11,7 @@
"core_attest_url": "https://core.uidapi.com/attest",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_s3_folder": "uid-optout-integ/",
"uid_instance_id_prefix": "unknown",
"runtime_config_store": {
diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json
index 9e0ec902f..d5da5fc47 100644
--- a/scripts/azure-cc/conf/prod-uid2-config.json
+++ b/scripts/azure-cc/conf/prod-uid2-config.json
@@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
diff --git a/scripts/gcp-oidc/conf/default-config.json b/scripts/gcp-oidc/conf/default-config.json
index bd09cac63..df2b97529 100644
--- a/scripts/gcp-oidc/conf/default-config.json
+++ b/scripts/gcp-oidc/conf/default-config.json
@@ -28,6 +28,7 @@
"salts_metadata_path": "salts/metadata.json",
"services_metadata_path": "services/metadata.json",
"service_links_metadata_path": "service_links/metadata.json",
+ "runtime_config_metadata_path": "runtime_config/metadata.json",
"optout_metadata_path": null,
"enclave_platform": "gcp-oidc",
"optout_inmem_cache": true,
@@ -38,5 +39,6 @@
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
"operator_type": "private",
+ "enable_remote_config": true,
"uid_instance_id_prefix": "unknown"
}
\ No newline at end of file
diff --git a/scripts/gcp-oidc/conf/integ-config.json b/scripts/gcp-oidc/conf/integ-config.json
index e25b332d0..282b7422b 100644
--- a/scripts/gcp-oidc/conf/integ-config.json
+++ b/scripts/gcp-oidc/conf/integ-config.json
@@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"uid_instance_id_prefix": "unknown",
"optout_s3_folder": "uid-optout-integ/",
diff --git a/scripts/gcp-oidc/conf/prod-config.json b/scripts/gcp-oidc/conf/prod-config.json
index 9e0ec902f..d5da5fc47 100644
--- a/scripts/gcp-oidc/conf/prod-config.json
+++ b/scripts/gcp-oidc/conf/prod-config.json
@@ -10,6 +10,7 @@
"optout_metadata_path": "https://optout.uidapi.com/optout/refresh",
"core_attest_url": "https://core.uidapi.com/attest",
"cloud_encryption_keys_metadata_path": "https://core.uidapi.com/cloud_encryption_keys/retrieve",
+ "runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
"optout_api_uri": "https://optout.uidapi.com/optout/replicate",
"optout_s3_folder": "optout-v2/",
"identity_token_expires_after_seconds": 259200,
diff --git a/src/main/resources/com.uid2.core/test/runtime_config/metadata.json b/src/main/resources/com.uid2.core/test/runtime_config/metadata.json
index 42971832e..0d2771a09 100644
--- a/src/main/resources/com.uid2.core/test/runtime_config/metadata.json
+++ b/src/main/resources/com.uid2.core/test/runtime_config/metadata.json
@@ -4,6 +4,7 @@
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
- "sharing_token_expiry_seconds": 2592000
+ "sharing_token_expiry_seconds": 2592000,
+ "identity_environment": "test"
}
}