Skip to content

fix: address SFI security compliance issues #435

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

Open
Prachig-Microsoft wants to merge 5 commits into
base: dev
Choose a base branch
from
+98 −34
Open

fix: address SFI security compliance issues #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06df144
fix: address SFI security compliance issues
Prachig-Microsoft May 15, 2026
4503d5b
fix: address PR review - remove unneeded SecurityEvent DCR/solution
Prachig-Microsoft May 18, 2026
fdf9237
fix: use Microsoft-Event stream with audit keyword xPath filter
Prachig-Microsoft May 19, 2026
6d62c07
fix: enforce HTTPS-only ingress and refactor DCR destination name
Prachig-Microsoft May 20, 2026
febe9b9
Merge remote-tracking branch 'origin/dev' into feature/sfi-security-f…
Prachig-Microsoft May 20, 2026
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
28 changes: 26 additions & 2 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
var dataCollectionRulesLocation = useExistingLogAnalytics
? existingLogAnalyticsWorkspace!.location
: logAnalyticsWorkspace!.outputs.location
var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceName}-destination'
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
params: {
Expand Down Expand Up @@ -586,12 +587,23 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
name: 'perfCounterDataSource60'
}
]
windowsEventLogs: [
{
name: 'SecurityAuditEvents'
streams: [
'Microsoft-Event'
]
xPathQueries: [
'Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]'
Comment thread
Prachig-Microsoft marked this conversation as resolved.
]
Comment thread
Prachig-Microsoft marked this conversation as resolved.
}
]
}
destinations: {
logAnalytics: [
{
workspaceResourceId: logAnalyticsWorkspaceResourceId
name: 'la-${dataCollectionRulesResourceName}'
name: dcrLogAnalyticsDestinationName
}
]
}
Expand All @@ -601,8 +613,18 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
'Microsoft-Perf'
]
destinations: [
'la-${dataCollectionRulesResourceName}'
dcrLogAnalyticsDestinationName
]
}
{
streams: [
'Microsoft-Event'
]
destinations: [
dcrLogAnalyticsDestinationName
]
transformKql: 'source'
outputStream: 'Microsoft-Event'
}
Comment thread
Prachig-Microsoft marked this conversation as resolved.
]
}
Expand Down Expand Up @@ -1077,6 +1099,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.22.0' = {
]
ingressTargetPort: 8000
ingressExternal: true
ingressAllowInsecure: false
scaleSettings: {
// maxReplicas: enableScalability ? 3 : 1
maxReplicas: 1 // maxReplicas set to 1 (not 3) due to multiple agents created per type during WAF deployment
Expand Down Expand Up @@ -1132,6 +1155,7 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.22.0' = {
]
ingressTargetPort: 3000
ingressExternal: true
ingressAllowInsecure: false
scaleSettings: {
maxReplicas: enableScalability ? 3 : 1
minReplicas: 1
Expand Down
81 changes: 54 additions & 27 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "2263929965524886405"
"version": "0.42.1.51946",
"templateHash": "18156607440911418905"
},
"name": "Modernize Your Code Solution Accelerator",
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \n"
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
},
"parameters": {
"solutionName": {
Expand Down Expand Up @@ -5093,8 +5093,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "14487392921976794826"
"version": "0.42.1.51946",
"templateHash": "15922750226218572834"
}
},
"definitions": {
Expand Down Expand Up @@ -13101,11 +13101,11 @@
},
"dependsOn": [
"applicationInsights",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
"dataCollectionEndpoint",
"logAnalyticsWorkspace",
"virtualNetwork"
Expand Down Expand Up @@ -15351,13 +15351,24 @@
],
"name": "perfCounterDataSource60"
}
],
"windowsEventLogs": [
{
"name": "SecurityAuditEvents",
"streams": [
"Microsoft-Event"
],
"xPathQueries": [
"Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]"
]
}
]
},
"destinations": {
"logAnalytics": [
{
"workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)]",
"name": "[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
"name": "[format('la-{0}-destination', if(variables('useExistingLogAnalytics'), variables('existingLawName'), reference('logAnalyticsWorkspace').outputs.name.value))]"
}
]
},
Expand All @@ -15367,8 +15378,18 @@
"Microsoft-Perf"
],
"destinations": [
"[format('la-{0}', variables('dataCollectionRulesResourceName'))]"
"[format('la-{0}-destination', if(variables('useExistingLogAnalytics'), variables('existingLawName'), reference('logAnalyticsWorkspace').outputs.name.value))]"
]
},
{
"streams": [
"Microsoft-Event"
],
"destinations": [
"[format('la-{0}-destination', if(variables('useExistingLogAnalytics'), variables('existingLawName'), reference('logAnalyticsWorkspace').outputs.name.value))]"
],
"transformKql": "source",
"outputStream": "Microsoft-Event"
}
]
}
Expand Down Expand Up @@ -26168,8 +26189,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "5833130864503278162"
"version": "0.42.1.51946",
"templateHash": "7788164101952925462"
},
"name": "AI Services and Project Module",
"description": "This module creates an AI Services resource and an AI Foundry project within it. It supports private networking, OpenAI deployments, and role assignments."
Expand Down Expand Up @@ -27466,8 +27487,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "427786211377533956"
"version": "0.42.1.51946",
"templateHash": "3451497265231138743"
}
},
"definitions": {
Expand Down Expand Up @@ -29176,8 +29197,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "9014582203949799641"
"version": "0.42.1.51946",
"templateHash": "6439859910553532577"
}
},
"definitions": {
Expand Down Expand Up @@ -29391,8 +29412,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "427786211377533956"
"version": "0.42.1.51946",
"templateHash": "3451497265231138743"
}
},
"definitions": {
Expand Down Expand Up @@ -31101,8 +31122,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "9014582203949799641"
"version": "0.42.1.51946",
"templateHash": "6439859910553532577"
}
},
"definitions": {
Expand Down Expand Up @@ -32017,9 +32038,9 @@
},
"dependsOn": [
"aiServices",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"virtualNetwork"
]
},
Expand Down Expand Up @@ -32075,8 +32096,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "12228537903958998388"
"version": "0.42.1.51946",
"templateHash": "15460841004653840446"
}
},
"definitions": {
Expand Down Expand Up @@ -32314,7 +32335,7 @@
"value": "TLS1_2"
},
"requireInfrastructureEncryption": {
"value": false
"value": true
},
"keyType": {
"value": "Service"
Expand Down Expand Up @@ -40529,8 +40550,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "9897457440526781857"
"version": "0.42.1.51946",
"templateHash": "9745767047675020484"
}
},
"definitions": {
Expand Down Expand Up @@ -47977,6 +47998,9 @@
"ingressExternal": {
"value": true
},
"ingressAllowInsecure": {
"value": false
},
"scaleSettings": {
"value": {
"maxReplicas": 1,
Expand Down Expand Up @@ -49551,6 +49575,9 @@
"ingressExternal": {
"value": true
},
"ingressAllowInsecure": {
"value": false
},
"scaleSettings": {
"value": {
"maxReplicas": "[if(parameters('enableScalability'), 3, 1)]",
Expand Down
21 changes: 17 additions & 4 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
var dataCollectionRulesLocation = useExistingLogAnalytics
? existingLogAnalyticsWorkspace!.location
: logAnalyticsWorkspace!.outputs.location
var dcrLogAnalyticsDestinationName = 'la-${logAnalyticsWorkspaceName}-destination'
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
params: {
Expand Down Expand Up @@ -497,10 +498,10 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
{
name: 'SecurityAuditEvents'
streams: [
'Microsoft-WindowsEvent'
'Microsoft-Event'
]
xPathQueries: [
'Security!*[System[(EventID=4624 or EventID=4625)]]'
'Security!*[System[(band(Keywords,13510798882111488)) and (EventID != 4624)]]'
Comment thread
Prachig-Microsoft marked this conversation as resolved.
Comment thread
Prachig-Microsoft marked this conversation as resolved.
]
}
]
Expand All @@ -509,7 +510,7 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
logAnalytics: [
{
workspaceResourceId: logAnalyticsWorkspaceResourceId
name: 'la-${dataCollectionRulesResourceName}'
name: dcrLogAnalyticsDestinationName
}
]
}
Expand All @@ -519,11 +520,21 @@ module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-
'Microsoft-Perf'
]
destinations: [
'la-${dataCollectionRulesResourceName}'
dcrLogAnalyticsDestinationName
]
transformKql: 'source'
outputStream: 'Microsoft-Perf'
}
{
streams: [
'Microsoft-Event'
]
destinations: [
dcrLogAnalyticsDestinationName
]
transformKql: 'source'
outputStream: 'Microsoft-Event'
}
]
}
}
Expand Down Expand Up @@ -1022,6 +1033,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.22.0' = {
]
ingressTargetPort: 8000
ingressExternal: true
ingressAllowInsecure: false
scaleSettings: {
// maxReplicas: enableScalability ? 3 : 1
maxReplicas: 1 // maxReplicas set to 1 (not 3) due to multiple agents created per type during WAF deployment
Expand Down Expand Up @@ -1085,6 +1097,7 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.22.0' = {
]
ingressTargetPort: 3000
ingressExternal: true
ingressAllowInsecure: false
scaleSettings: {
maxReplicas: enableScalability ? 3 : 1
minReplicas: 1
Expand Down
2 changes: 1 addition & 1 deletion infra/modules/storageAccount.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
allowSharedKeyAccess: false
allowCrossTenantReplication: false
minimumTlsVersion: 'TLS1_2'
requireInfrastructureEncryption: false
requireInfrastructureEncryption: true
keyType: 'Service'
enableHierarchicalNamespace: false
enableNfsV3: false
Expand Down
Loading