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 authentication between Airlock Processor and Azure Service Bus in Function Binding #4277

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Disable local authentication between Airlock Processor and Azure Service Bus in Function Binding #4277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5047495
support managed idendity authentication in azure function binding bet…
guybartal Jan 19, 2025
ab18f68
Add FQDN for Airlock Service Bus in Terraform configuration and disab…
guybartal Jan 19, 2025
7ad89d4
Refactor app settings in Airlock function app for improved readability
guybartal Jan 19, 2025
30f3151
Add entry to CHANGELOG for disabling local authentication in ServiceBus
guybartal Jan 20, 2025
228de03
- update SB connection string to use service bus connection name.
guybartal Jan 20, 2025
e1a2a74
update service bus connection string variable for clarity
guybartal 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 @@ -34,6 +34,7 @@ ENHANCEMENTS:
* Update Guacamole dependencies ([[#4232](https://github.com/microsoft/AzureTRE/issues/4232)])
* Add option to force tunnel TRE's Firewall ([#4237](https://github.com/microsoft/AzureTRE/issues/4237))
* Add EventGrid diagnostics to identify airlock issues ([#4258](https://github.com/microsoft/AzureTRE/issues/4258))
* Disable local authentication in ServiceBus ([#4259](https://github.com/microsoft/AzureTRE/issues/4259))

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
2 changes: 1 addition & 1 deletion airlock_processor/BlobCreatedTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"direction": "in",
"topicName": "%BLOB_CREATED_TOPIC_NAME%",
"subscriptionName": "%TOPIC_SUBSCRIPTION_NAME%",
"connection": "SB_CONNECTION_STRING"
"connection": "SERVICEBUS_CONNECTION"
},
{
"type": "eventGrid",
Expand Down
2 changes: 1 addition & 1 deletion airlock_processor/DataDeletionTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "serviceBusTrigger",
"direction": "in",
"queueName": "%AIRLOCK_DATA_DELETION_QUEUE_NAME%",
"connection": "SB_CONNECTION_STRING"
"connection": "SERVICEBUS_CONNECTION"
}
]
}
2 changes: 1 addition & 1 deletion airlock_processor/ScanResultTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "serviceBusTrigger",
"direction": "in",
"queueName": "%AIRLOCK_SCAN_RESULT_QUEUE_NAME%",
"connection": "SB_CONNECTION_STRING"
"connection": "SERVICEBUS_CONNECTION"
},
{
"type": "eventGrid",
Expand Down
2 changes: 1 addition & 1 deletion airlock_processor/StatusChangedQueueTrigger/function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "serviceBusTrigger",
"direction": "in",
"queueName": "%AIRLOCK_STATUS_CHANGED_QUEUE_NAME%",
"connection": "SB_CONNECTION_STRING"
"connection": "SERVICEBUS_CONNECTION"
},
{
"type": "eventGrid",
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"
4 changes: 2 additions & 2 deletions airlock_processor/host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
}
}
},
"extensionBundle": {
"extensionBundle": {
"id": "Microsoft.Azure.Functions.ExtensionBundle",
"version": "[4.0.0, 5.0.0)"
"version": "[4.*, 5.0.0)"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you have confirmed that the current versions we use don't support this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not yet, planning to do confirm first thing this morning.

}
}
38 changes: 21 additions & 17 deletions core/terraform/airlock/airlock_processor.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,27 @@ 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
"SERVICEBUS_CONNECTION" = local.servicebus_connection
"${local.servicebus_connection}__tenantId" = azurerm_user_assigned_identity.airlock_id.tenant_id
"${local.servicebus_connection}__clientId" = azurerm_user_assigned_identity.airlock_id.client_id
"${local.servicebus_connection}__credential" = "managedidentity"
"${local.servicebus_connection}__fullyQualifiedNamespace" = var.airlock_servicebus_fqdn
"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
}

site_config {
Expand Down
2 changes: 2 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,6 @@ locals {
azurerm_storage_account.sa_import_in_progress.id,
azurerm_storage_account.sa_export_approved.id
]

servicebus_connection = "SERVICEBUS_CONNECTION"
}
3 changes: 3 additions & 0 deletions core/terraform/airlock/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ variable "airlock_servicebus" {
default_primary_connection_string = string
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried to add the endpoint property here and checking if it will get populated automatically?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is, refactored

})
}
variable "airlock_servicebus_fqdn" {
type = string
}
variable "tre_core_tags" {
type = map(string)
}
Expand Down
1 change: 1 addition & 0 deletions core/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ module "airlock_resources" {
airlock_app_service_plan_sku = var.core_app_service_plan_sku
airlock_processor_subnet_id = module.network.airlock_processor_subnet_id
airlock_servicebus = azurerm_servicebus_namespace.sb
airlock_servicebus_fqdn = azurerm_servicebus_namespace.sb.endpoint
applicationinsights_connection_string = module.azure_monitor.app_insights_connection_string
enable_malware_scanning = var.enable_airlock_malware_scanning
arm_environment = var.arm_environment
Expand Down
1 change: 1 addition & 0 deletions core/terraform/servicebus.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ resource "azurerm_servicebus_namespace" "sb" {
sku = "Premium"
premium_messaging_partitions = "1"
capacity = "1"
local_auth_enabled = false
tags = local.tre_core_tags

# Block public access
Expand Down