Skip to content

Commit 8cc9239

Browse files
weastlerCopilot
andcommitted
fix(infrastructure): validate provisioning identity boundaries
Reject provisioning secret URLs outside the configured vault and allow public digest images without ACR authentication. Cover secret isolation, optional pull grants, and authenticated deployment storage access using mocked Terraform tests. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 4c891ea commit 8cc9239

3 files changed

Lines changed: 229 additions & 7 deletions

File tree

‎infrastructure/azure/provision/main.tf‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,25 @@ variable "name" { type = string }
2020
variable "location" { type = string }
2121
variable "resource_group" { type = string }
2222
variable "environment_id" { type = string }
23-
variable "registry_id" { type = string }
23+
variable "registry_id" {
24+
type = string
25+
default = null
26+
description = "Optional existing ACR resource ID. Omit for a public image."
27+
}
2428
variable "image" {
2529
type = string
2630
validation {
2731
condition = can(regex("^[a-z0-9][a-z0-9.:/-]+@sha256:[a-f0-9]{64}$", var.image))
2832
error_message = "Use an immutable registry/repository@sha256 digest for provisioning."
2933
}
3034
}
31-
variable "vault_id" { type = string }
35+
variable "vault_id" {
36+
type = string
37+
validation {
38+
condition = can(regex("^/subscriptions/[^/]+/resourceGroups/[^/]+/providers/Microsoft.KeyVault/vaults/[^/]+$", var.vault_id))
39+
error_message = "Supply the Key Vault resource ID that owns the provisioning secrets."
40+
}
41+
}
3242
variable "secret_urls" {
3343
type = map(string)
3444
validation {
@@ -40,6 +50,15 @@ variable "secret_urls" {
4050
)
4151
error_message = "Provide exactly three versioned Key Vault references for the administrator URL and two role passwords, never raw values."
4252
}
53+
validation {
54+
condition = (
55+
!can(regex("^/subscriptions/[^/]+/resourceGroups/[^/]+/providers/Microsoft.KeyVault/vaults/[^/]+$", var.vault_id)) ||
56+
alltrue([for secret in values(var.secret_urls) :
57+
lower(try(split("/", secret)[2], "")) == "${lower(try(split("/", var.vault_id)[8], ""))}.vault.azure.net"
58+
])
59+
)
60+
error_message = "Every provisioning secret URL must belong to vault_id."
61+
}
4362
}
4463

4564
resource "azurerm_user_assigned_identity" "provision" {
@@ -56,6 +75,7 @@ resource "azurerm_role_assignment" "secrets" {
5675
}
5776

5877
resource "azurerm_role_assignment" "image" {
78+
count = var.registry_id == null ? 0 : 1
5979
scope = var.registry_id
6080
role_definition_name = "AcrPull"
6181
principal_id = azurerm_user_assigned_identity.provision.principal_id
@@ -78,9 +98,12 @@ resource "azurerm_container_app_job" "provision" {
7898
type = "UserAssigned"
7999
identity_ids = [azurerm_user_assigned_identity.provision.id]
80100
}
81-
registry {
82-
server = split("/", var.image)[0]
83-
identity = azurerm_user_assigned_identity.provision.id
101+
dynamic "registry" {
102+
for_each = var.registry_id == null ? [] : [var.registry_id]
103+
content {
104+
server = split("/", var.image)[0]
105+
identity = azurerm_user_assigned_identity.provision.id
106+
}
84107
}
85108
dynamic "secret" {
86109
for_each = var.secret_urls

‎infrastructure/azure/provision/tests/provision.tftest.hcl‎

Lines changed: 167 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ variables {
1414
location = "eastus2"
1515
resource_group = "test-hub"
1616
environment_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-hub/providers/Microsoft.App/managedEnvironments/test"
17-
registry_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-foundation/providers/Microsoft.ContainerRegistry/registries/testregistry"
18-
image = "testregistry.azurecr.io/replica-hub@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
17+
image = "ghcr.io/example/hub@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
1918
vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-foundation/providers/Microsoft.KeyVault/vaults/testvault"
2019
secret_urls = {
2120
DATABASE_URL = "https://testvault.vault.azure.net/secrets/postgres-admin-url/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -26,6 +25,12 @@ variables {
2625

2726
run "fresh_database_job_is_explicit_and_has_separate_access" {
2827
command = plan
28+
29+
variables {
30+
registry_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-foundation/providers/Microsoft.ContainerRegistry/registries/testregistry"
31+
image = "testregistry.azurecr.io/replica-hub@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
32+
}
33+
2934
assert {
3035
condition = (
3136
azurerm_container_app_job.provision.replica_retry_limit == 0 &&
@@ -40,4 +45,164 @@ run "fresh_database_job_is_explicit_and_has_separate_access" {
4045
)
4146
error_message = "Fresh provisioning must use its own identity and Key Vault references, and never retry automatically."
4247
}
48+
assert {
49+
condition = (
50+
length(azurerm_container_app_job.provision.registry) == 1 &&
51+
one(azurerm_container_app_job.provision.registry).server == "testregistry.azurecr.io" &&
52+
one(azurerm_container_app_job.provision.registry).identity == azurerm_user_assigned_identity.provision.id &&
53+
length(azurerm_role_assignment.image) == 1 &&
54+
alltrue([for grant in azurerm_role_assignment.image :
55+
grant.scope == var.registry_id &&
56+
grant.role_definition_name == "AcrPull" &&
57+
grant.principal_id == azurerm_user_assigned_identity.provision.principal_id
58+
])
59+
)
60+
error_message = "An explicit ACR needs exactly one registry block and one AcrPull grant for the provisioning identity on that ACR."
61+
}
62+
assert {
63+
condition = (
64+
azurerm_container_app_job.provision.template[0].container[0].image == var.image &&
65+
azurerm_container_app_job.provision.identity[0].identity_ids == toset([azurerm_user_assigned_identity.provision.id]) &&
66+
toset([for grant in azurerm_role_assignment.secrets : grant.scope]) == toset([
67+
"${var.vault_id}/secrets/postgres-admin-url",
68+
"${var.vault_id}/secrets/postgres-migration-password",
69+
"${var.vault_id}/secrets/postgres-runtime-password",
70+
]) &&
71+
alltrue([for grant in azurerm_role_assignment.secrets :
72+
grant.principal_id == azurerm_user_assigned_identity.provision.principal_id &&
73+
grant.role_definition_name == "Key Vault Secrets User"
74+
]) &&
75+
toset([for secret in azurerm_container_app_job.provision.secret : secret.key_vault_secret_id]) == toset(values(var.secret_urls)) &&
76+
toset([for env in azurerm_container_app_job.provision.template[0].container[0].env : env.name]) == toset([
77+
"NODE_ENV", "DATABASE_URL", "HUB_MIGRATION_PASSWORD", "HUB_RUNTIME_PASSWORD",
78+
]) &&
79+
alltrue([for name, url in var.secret_urls :
80+
one([for env in azurerm_container_app_job.provision.template[0].container[0].env : env.secret_name if env.name == name]) ==
81+
one([for secret in azurerm_container_app_job.provision.secret : secret.name if secret.key_vault_secret_id == url])
82+
])
83+
)
84+
error_message = "Only the isolated provisioning job may receive its three secret-scoped grants and reference-backed administrator settings."
85+
}
86+
}
87+
88+
run "public_digest_needs_no_registry_or_pull_grant" {
89+
command = plan
90+
91+
assert {
92+
condition = (
93+
var.registry_id == null &&
94+
length(azurerm_container_app_job.provision.registry) == 0 &&
95+
length(azurerm_role_assignment.image) == 0 &&
96+
azurerm_container_app_job.provision.template[0].container[0].image == var.image
97+
)
98+
error_message = "A public digest must work with registry_id omitted, without registry authentication or an AcrPull grant."
99+
}
100+
}
101+
102+
run "matching_vault_names_are_case_insensitive" {
103+
command = plan
104+
105+
variables {
106+
vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-foundation/providers/Microsoft.KeyVault/vaults/TESTVAULT"
107+
secret_urls = {
108+
DATABASE_URL = "https://TestVault.vault.azure.net/secrets/postgres-admin-url/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
109+
HUB_MIGRATION_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-migration-password/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
110+
HUB_RUNTIME_PASSWORD = "https://TESTVAULT.vault.azure.net/secrets/postgres-runtime-password/cccccccccccccccccccccccccccccccc"
111+
}
112+
}
113+
114+
assert {
115+
condition = (
116+
length(azurerm_role_assignment.secrets) == 3 &&
117+
alltrue([for grant in azurerm_role_assignment.secrets : startswith(grant.scope, "${var.vault_id}/secrets/")]) &&
118+
toset([for secret in azurerm_container_app_job.provision.secret : secret.key_vault_secret_id]) == toset(values(var.secret_urls))
119+
)
120+
error_message = "Matching DNS vault names must be accepted regardless of case, without changing the configured secret references or grant scopes."
121+
}
122+
}
123+
124+
run "mutable_image_is_rejected" {
125+
command = plan
126+
127+
variables {
128+
image = "ghcr.io/example/hub:latest"
129+
}
130+
131+
expect_failures = [var.image]
132+
}
133+
134+
run "all_three_provisioning_secrets_are_required" {
135+
command = plan
136+
137+
variables {
138+
secret_urls = {
139+
HUB_MIGRATION_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-migration-password/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
140+
HUB_RUNTIME_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-runtime-password/cccccccccccccccccccccccccccccccc"
141+
}
142+
}
143+
144+
expect_failures = [var.secret_urls]
145+
}
146+
147+
run "additional_secret_access_is_rejected" {
148+
command = plan
149+
150+
variables {
151+
secret_urls = {
152+
DATABASE_URL = "https://testvault.vault.azure.net/secrets/postgres-admin-url/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
153+
HUB_MIGRATION_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-migration-password/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
154+
HUB_RUNTIME_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-runtime-password/cccccccccccccccccccccccccccccccc"
155+
EXTRA_SECRET = "https://testvault.vault.azure.net/secrets/extra/dddddddddddddddddddddddddddddddd"
156+
}
157+
}
158+
159+
expect_failures = [var.secret_urls]
160+
}
161+
162+
run "unversioned_secret_is_rejected" {
163+
command = plan
164+
165+
variables {
166+
secret_urls = {
167+
DATABASE_URL = "https://testvault.vault.azure.net/secrets/postgres-admin-url"
168+
HUB_MIGRATION_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-migration-password/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
169+
HUB_RUNTIME_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-runtime-password/cccccccccccccccccccccccccccccccc"
170+
}
171+
}
172+
173+
expect_failures = [var.secret_urls]
174+
}
175+
176+
run "malformed_vault_resource_id_is_rejected" {
177+
command = plan
178+
179+
variables {
180+
vault_id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-foundation/providers/Microsoft.Storage/storageAccounts/testvault"
181+
}
182+
183+
expect_failures = [var.vault_id]
184+
}
185+
186+
run "incomplete_vault_resource_id_is_rejected" {
187+
command = plan
188+
189+
variables {
190+
vault_id = "testvault"
191+
}
192+
193+
expect_failures = [var.vault_id]
194+
}
195+
196+
run "secret_hosts_must_match_the_granted_vault" {
197+
command = plan
198+
199+
variables {
200+
secret_urls = {
201+
DATABASE_URL = "https://another-vault.vault.azure.net/secrets/postgres-admin-url/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
202+
HUB_MIGRATION_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-migration-password/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
203+
HUB_RUNTIME_PASSWORD = "https://testvault.vault.azure.net/secrets/postgres-runtime-password/cccccccccccccccccccccccccccccccc"
204+
}
205+
}
206+
207+
expect_failures = [var.secret_urls]
43208
}

‎infrastructure/azure/tests/deployment.tftest.hcl‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
mock_provider "azurerm" {
22
override_during = plan
3+
mock_data "azurerm_client_config" {
4+
defaults = {
5+
object_id = "00000000-0000-0000-0000-000000000005"
6+
}
7+
}
38
mock_resource "azurerm_resource_group" {
49
defaults = {
510
id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-hub"
@@ -116,6 +121,13 @@ run "bootstrap_keeps_hub_stopped" {
116121
condition = length(azurerm_container_app.hub) == 0
117122
error_message = "Bootstrap must not create a combined process before setup."
118123
}
124+
assert {
125+
condition = (
126+
length(data.azurerm_client_config.deployment) == 0 &&
127+
length(azurerm_role_assignment.deployment_storage) == 0
128+
)
129+
error_message = "Deployment Blob access must remain opt-in without reading or granting a deployment principal by default."
130+
}
119131
assert {
120132
condition = (
121133
output.installation.app_id == null &&
@@ -136,6 +148,28 @@ run "bootstrap_keeps_hub_stopped" {
136148
}
137149
}
138150

151+
run "deployment_blob_access_is_an_explicit_account_scoped_grant" {
152+
command = plan
153+
154+
variables {
155+
grant_deployment_storage_access = true
156+
}
157+
158+
assert {
159+
condition = (
160+
length(data.azurerm_client_config.deployment) == 1 &&
161+
length(azurerm_role_assignment.deployment_storage) == 1 &&
162+
azurerm_role_assignment.deployment_storage[0].scope == azurerm_storage_account.artifacts.id &&
163+
azurerm_role_assignment.deployment_storage[0].role_definition_name == "Storage Blob Data Contributor" &&
164+
azurerm_role_assignment.deployment_storage[0].principal_id == data.azurerm_client_config.deployment[0].object_id &&
165+
azurerm_role_assignment.deployment_storage[0].principal_id == "00000000-0000-0000-0000-000000000005" &&
166+
azurerm_role_assignment.deployment_storage[0].principal_id != azurerm_user_assigned_identity.hub.principal_id &&
167+
azurerm_role_assignment.deployment_storage[0].principal_id != azurerm_user_assigned_identity.setup.principal_id
168+
)
169+
error_message = "Opt-in Blob access must grant only the authenticated deployment principal on the installation storage account, not a workload or the artifacts container."
170+
}
171+
}
172+
139173
run "durable_state_requires_private_authenticated_access" {
140174
command = plan
141175

0 commit comments

Comments
 (0)