Merge branch 'main' into gdm-UID2-5837-v4-uid

gmsdelmundo · gmsdelmundo · commit dc65abe94ef9 · 2025-09-08T18:56:45.000+08:00
diff --git a/conf/default-config.json b/conf/default-config.json
@@ -31,13 +31,14 @@
   "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,
   "enclave_platform": null,
   "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,6 +15,7 @@
   "services_metadata_path": "http://core:8088/services/refresh",
   "service_links_metadata_path": "http://core:8088/service_links/refresh",
   "cloud_encryption_keys_metadata_path": "http://core:8088/cloud_encryption_keys/retrieve",
+  "runtime_config_metadata_path": "http://core:8088/operator/config",
   "encrypted_files": true,
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
@@ -43,7 +44,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
@@ -6,11 +6,11 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.58.0</version>
+    <version>5.58.9</version>
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vertx.version>4.5.18</vertx.version>
+        <vertx.version>4.5.21</vertx.version>
         <vertx-maven-plugin.version>1.0.22</vertx-maven-plugin.version>
         <junit-jupiter.version>5.11.2</junit-jupiter.version>
         <junit-vintage.version>5.11.2</junit-vintage.version>
diff --git 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"
 }
diff --git 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
+  }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }
diff --git 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
@@ -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
@@ -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"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@`
`42`	`42`	`"salts_expired_shutdown_hours": 12,`
`43`	`43`	`"operator_type": "public",`
`44`	`44`	`"disable_optout_token": true,`
`45`		`- "enable_remote_config": false,`
	`45`	`+ "enable_remote_config": true,`
`46`	`46`	`"uid_instance_id_prefix": "local-operator"`
`47`	`47`	`}`