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.

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

Disable local auth in EventGrid #4254

Draft
wants to merge 3 commits into
base: tamirkamara/function-host-storage-mi
Choose a base branch
from
Draft

Disable local auth in EventGrid #4254

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
408e363
disbale eventgrid local auth
tamirkamara Jan 19, 2025
9423cf8
Merge branch 'tamirkamara/function-host-storage-mi' into tamirkamara/…
tamirkamara Jan 19, 2025
07fc62b
Update CHANGELOG.md
tamirkamara Jan 20, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ENHANCEMENTS:
* Add EventGrid diagnostics to identify airlock issues ([#4258](https://github.com/microsoft/AzureTRE/issues/4258))
* Surface the server-layout parameter of Guacamole [server-layout](https://guacamole.apache.org/doc/gug/configuring-guacamole.html#session-settings) ([#4234](https://github.com/microsoft/AzureTRE/issues/4234))
* Airlock function host storage to use the user-assigned managed identity ([#4276](https://github.com/microsoft/AzureTRE/issues/4276))
* Disable local authentication in EventGrid ([[#4254](https://github.com/microsoft/AzureTRE/issues/4254)])
tamirkamara marked this conversation as resolved.
Show resolved Hide resolved

BUG FIXES:
* Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112))
Expand Down
6 changes: 2 additions & 4 deletions airlock_processor/BlobCreatedTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
{
"type": "eventGrid",
"name": "stepResultEvent",
"topicEndpointUri": "EVENT_GRID_STEP_RESULT_TOPIC_URI_SETTING",
"topicKeySetting": "EVENT_GRID_STEP_RESULT_TOPIC_KEY_SETTING",
"connection": "EVENT_GRID_STEP_RESULT_CONNECTION",
"direction": "out"
},
{
"type": "eventGrid",
"name": "dataDeletionEvent",
"topicEndpointUri": "EVENT_GRID_DATA_DELETION_TOPIC_URI_SETTING",
"topicKeySetting": "EVENT_GRID_DATA_DELETION_TOPIC_KEY_SETTING",
"connection": "EVENT_GRID_DATA_DELETION_CONNECTION",
"direction": "out"
}
]
Expand Down
3 changes: 1 addition & 2 deletions airlock_processor/ScanResultTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
{
"type": "eventGrid",
"name": "outputEvent",
"topicEndpointUri": "EVENT_GRID_STEP_RESULT_TOPIC_URI_SETTING",
"topicKeySetting": "EVENT_GRID_STEP_RESULT_TOPIC_KEY_SETTING",
"connection": "EVENT_GRID_STEP_RESULT_CONNECTION",
"direction": "out"
}
]
Expand Down
6 changes: 2 additions & 4 deletions airlock_processor/StatusChangedQueueTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@
{
"type": "eventGrid",
"name": "stepResultEvent",
"topicEndpointUri": "EVENT_GRID_STEP_RESULT_TOPIC_URI_SETTING",
"topicKeySetting": "EVENT_GRID_STEP_RESULT_TOPIC_KEY_SETTING",
"connection": "EVENT_GRID_STEP_RESULT_CONNECTION",
"direction": "out"
},
{
"type": "eventGrid",
"name": "dataDeletionEvent",
"topicEndpointUri": "EVENT_GRID_DATA_DELETION_TOPIC_URI_SETTING",
"topicKeySetting": "EVENT_GRID_DATA_DELETION_TOPIC_KEY_SETTING",
"connection": "EVENT_GRID_DATA_DELETION_CONNECTION",
"direction": "out"
}
]
Expand Down
2 changes: 1 addition & 1 deletion airlock_processor/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.8.0"
__version__ = "0.8.1"
44 changes: 25 additions & 19 deletions core/terraform/airlock/airlock_processor.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,31 @@ resource "azurerm_linux_function_app" "airlock_function_app" {
}

app_settings = {
"SB_CONNECTION_STRING" = var.airlock_servicebus.default_primary_connection_string
"BLOB_CREATED_TOPIC_NAME" = azurerm_servicebus_topic.blob_created.name
"TOPIC_SUBSCRIPTION_NAME" = azurerm_servicebus_subscription.airlock_processor.name
"EVENT_GRID_STEP_RESULT_TOPIC_URI_SETTING" = azurerm_eventgrid_topic.step_result.endpoint
"EVENT_GRID_STEP_RESULT_TOPIC_KEY_SETTING" = azurerm_eventgrid_topic.step_result.primary_access_key
"EVENT_GRID_DATA_DELETION_TOPIC_URI_SETTING" = azurerm_eventgrid_topic.data_deletion.endpoint
"EVENT_GRID_DATA_DELETION_TOPIC_KEY_SETTING" = azurerm_eventgrid_topic.data_deletion.primary_access_key
"WEBSITES_ENABLE_APP_SERVICE_STORAGE" = false
"AIRLOCK_STATUS_CHANGED_QUEUE_NAME" = local.status_changed_queue_name
"AIRLOCK_SCAN_RESULT_QUEUE_NAME" = local.scan_result_queue_name
"AIRLOCK_DATA_DELETION_QUEUE_NAME" = local.data_deletion_queue_name
"ENABLE_MALWARE_SCANNING" = var.enable_malware_scanning
"ARM_ENVIRONMENT" = var.arm_environment
"MANAGED_IDENTITY_CLIENT_ID" = azurerm_user_assigned_identity.airlock_id.client_id
"TRE_ID" = var.tre_id
"WEBSITE_CONTENTOVERVNET" = 1
"STORAGE_ENDPOINT_SUFFIX" = module.terraform_azurerm_environment_configuration.storage_suffix
"AzureWebJobsStorage__clientId" = azurerm_user_assigned_identity.airlock_id.client_id
"AzureWebJobsStorage__credential" = "managedidentity"
"SB_CONNECTION_STRING" = var.airlock_servicebus.default_primary_connection_string
"BLOB_CREATED_TOPIC_NAME" = azurerm_servicebus_topic.blob_created.name
"TOPIC_SUBSCRIPTION_NAME" = azurerm_servicebus_subscription.airlock_processor.name
"WEBSITES_ENABLE_APP_SERVICE_STORAGE" = false
"AIRLOCK_STATUS_CHANGED_QUEUE_NAME" = local.status_changed_queue_name
"AIRLOCK_SCAN_RESULT_QUEUE_NAME" = local.scan_result_queue_name
"AIRLOCK_DATA_DELETION_QUEUE_NAME" = local.data_deletion_queue_name
"ENABLE_MALWARE_SCANNING" = var.enable_malware_scanning
"ARM_ENVIRONMENT" = var.arm_environment
"MANAGED_IDENTITY_CLIENT_ID" = azurerm_user_assigned_identity.airlock_id.client_id
"TRE_ID" = var.tre_id
"WEBSITE_CONTENTOVERVNET" = 1
"STORAGE_ENDPOINT_SUFFIX" = module.terraform_azurerm_environment_configuration.storage_suffix
"AzureWebJobsStorage__clientId" = azurerm_user_assigned_identity.airlock_id.client_id
"AzureWebJobsStorage__credential" = "managedidentity"

"EVENT_GRID_STEP_RESULT_CONNECTION" = local.step_result_eventgrid_connection
"${local.step_result_eventgrid_connection}__topicEndpointUri" = azurerm_eventgrid_topic.step_result.endpoint
"${local.step_result_eventgrid_connection}__credential" = "managedidentity"
"${local.step_result_eventgrid_connection}__clientId" = azurerm_user_assigned_identity.airlock_id.client_id

"EVENT_GRID_DATA_DELETION_CONNECTION" = local.data_deletion_eventgrid_connection
"${local.data_deletion_eventgrid_connection}__topicEndpointUri" = azurerm_eventgrid_topic.data_deletion.endpoint
"${local.data_deletion_eventgrid_connection}__credential" = "managedidentity"
"${local.data_deletion_eventgrid_connection}__clientId" = azurerm_user_assigned_identity.airlock_id.client_id
}

site_config {
Expand Down
5 changes: 5 additions & 0 deletions core/terraform/airlock/eventgrid_topics.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ resource "azurerm_eventgrid_topic" "step_result" {
location = var.location
resource_group_name = var.resource_group_name
public_network_access_enabled = var.enable_local_debugging
local_auth_enabled = false

identity {
type = "SystemAssigned"
Expand Down Expand Up @@ -60,6 +61,7 @@ resource "azurerm_eventgrid_topic" "status_changed" {
location = var.location
resource_group_name = var.resource_group_name
public_network_access_enabled = var.enable_local_debugging
local_auth_enabled = false

identity {
type = "SystemAssigned"
Expand Down Expand Up @@ -113,6 +115,7 @@ resource "azurerm_eventgrid_topic" "data_deletion" {
location = var.location
resource_group_name = var.resource_group_name
public_network_access_enabled = var.enable_local_debugging
local_auth_enabled = false

identity {
type = "SystemAssigned"
Expand Down Expand Up @@ -163,6 +166,7 @@ resource "azurerm_eventgrid_topic" "scan_result" {
resource_group_name = var.resource_group_name
# This is mandatory for the scan result to be published since private networks are not supported yet
public_network_access_enabled = true
local_auth_enabled = false

identity {
type = "SystemAssigned"
Expand Down Expand Up @@ -323,6 +327,7 @@ resource "azurerm_eventgrid_topic" "airlock_notification" {
location = var.location
resource_group_name = var.resource_group_name
public_network_access_enabled = var.enable_local_debugging
local_auth_enabled = false

identity {
type = "SystemAssigned"
Expand Down
14 changes: 13 additions & 1 deletion core/terraform/airlock/identity.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource "azurerm_role_assignment" "servicebus_receiver" {
principal_id = azurerm_user_assigned_identity.airlock_id.principal_id
}

resource "azurerm_role_assignment" "eventgrid_data_sender" {
resource "azurerm_role_assignment" "eventgrid_data_sender_status_changed" {
scope = azurerm_eventgrid_topic.status_changed.id
role_definition_name = "EventGrid Data Sender"
principal_id = var.api_principal_id
Expand All @@ -37,6 +37,18 @@ resource "azurerm_role_assignment" "eventgrid_data_sender_notification" {
principal_id = var.api_principal_id
}

resource "azurerm_role_assignment" "eventgrid_data_sender_step_result" {
scope = azurerm_eventgrid_topic.step_result.id
role_definition_name = "EventGrid Data Sender"
principal_id = azurerm_user_assigned_identity.airlock_id.principal_id
}

resource "azurerm_role_assignment" "eventgrid_data_sender_data_deletion" {
scope = azurerm_eventgrid_topic.data_deletion.id
role_definition_name = "EventGrid Data Sender"
principal_id = azurerm_user_assigned_identity.airlock_id.principal_id
}

resource "azurerm_role_assignment" "airlock_blob_data_contributor" {
count = length(local.airlock_sa_blob_data_contributor)
scope = local.airlock_sa_blob_data_contributor[count.index]
Expand Down
3 changes: 3 additions & 0 deletions core/terraform/airlock/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,7 @@ locals {
azurerm_storage_account.sa_import_in_progress.id,
azurerm_storage_account.sa_export_approved.id
]

step_result_eventgrid_connection = "EVENT_GRID_STEP_RESULT_CONNECTION"
data_deletion_eventgrid_connection = "EVENT_GRID_DATA_DELETION_CONNECTION"
}