-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2281 from CactuseSecurity/develop
v7.3 tenant ip-filtering
- Loading branch information
Showing
194 changed files
with
5,849 additions
and
51,480 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#", | ||
| "handler": "Microsoft.Azure.CreateUIDef", | ||
| "version": "0.1.2-preview", | ||
| "parameters": { | ||
| "basics": [ | ||
| {} | ||
| ], | ||
| "steps": [ | ||
| { | ||
| "name": "webAppSettings", | ||
| "label": "Web App settings", | ||
| "subLabel": { | ||
| "preValidation": "Configure the web app settings", | ||
| "postValidation": "Completed" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "name": "appServicePlanName", | ||
| "type": "Microsoft.Common.TextBox", | ||
| "label": "App Service plan name", | ||
| "placeholder": "App Service plan name", | ||
| "defaultValue": "", | ||
| "toolTip": "Use alphanumeric characters or hyphens with a maximum of 40 characters.", | ||
| "constraints": { | ||
| "required": true, | ||
| "regex": "^[a-z0-9A-Z-]{1,40}$", | ||
| "validationMessage": "Only alphanumeric characters or hyphens are allowed, with a maximum of 40 characters." | ||
| }, | ||
| "visible": true | ||
| }, | ||
| { | ||
| "name": "appServiceName", | ||
| "type": "Microsoft.Common.TextBox", | ||
| "label": "App Service name prefix", | ||
| "placeholder": "App Service name prefix", | ||
| "defaultValue": "", | ||
| "toolTip": "Use alphanumeric characters or hyphens with minimum of 2 characters and maximum of 47 characters.", | ||
| "constraints": { | ||
| "required": true, | ||
| "regex": "^[a-z0-9A-Z-]{2,47}$", | ||
| "validationMessage": "Only alphanumeric characters or hyphens are allowed, with a minimum of 2 characters and maximum of 47 characters." | ||
| }, | ||
| "visible": true | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "storageConfig", | ||
| "label": "Storage settings", | ||
| "subLabel": { | ||
| "preValidation": "Configure the storage settings", | ||
| "postValidation": "Completed" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "name": "storageAccounts", | ||
| "type": "Microsoft.Storage.MultiStorageAccountCombo", | ||
| "label": { | ||
| "prefix": "Storage account name prefix", | ||
| "type": "Storage account type" | ||
| }, | ||
| "toolTip": { | ||
| "prefix": "Enter maximum of 11 lowercase letters or numbers.", | ||
| "type": "Available choices are Standard_LRS, Standard_GRS, and Premium_LRS." | ||
| }, | ||
| "defaultValue": { | ||
| "type": "Standard_LRS" | ||
| }, | ||
| "constraints": { | ||
| "allowedTypes": [ | ||
| "Premium_LRS", | ||
| "Standard_LRS", | ||
| "Standard_GRS" | ||
| ] | ||
| }, | ||
| "visible": true | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "outputs": { | ||
| "location": "[location()]", | ||
| "appServicePlanName": "[steps('webAppSettings').appServicePlanName]", | ||
| "appServiceNamePrefix": "[steps('webAppSettings').appServiceName]", | ||
| "storageAccountNamePrefix": "[steps('storageConfig').storageAccounts.prefix]", | ||
| "storageAccountType": "[steps('storageConfig').storageAccounts.type]" | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "location": { | ||
| "type": "string", | ||
| "defaultValue": "[resourceGroup().location]" | ||
| }, | ||
| "appServicePlanName": { | ||
| "type": "string", | ||
| "maxLength": 40, | ||
| "metadata": { | ||
| "description": "Firewall Orchestrator Managed" | ||
| } | ||
| }, | ||
| "appServiceNamePrefix": { | ||
| "type": "string", | ||
| "maxLength": 47, | ||
| "metadata": { | ||
| "description": "FWORCH" | ||
| } | ||
| }, | ||
| "storageAccountNamePrefix": { | ||
| "type": "string", | ||
| "maxLength": 11, | ||
| "metadata": { | ||
| "description": "FWORCH_STO" | ||
| } | ||
| }, | ||
| "storageAccountType": { | ||
| "type": "string", | ||
| "allowedValues": [ | ||
| "Premium_LRS", | ||
| "Standard_LRS", | ||
| "Standard_GRS" | ||
| ], | ||
| "metadata": { | ||
| "description": "Storage account type allowed values" | ||
| } | ||
| } | ||
| }, | ||
| "variables": { | ||
| "appServicePlanSku": "F1", | ||
| "appServicePlanCapacity": 1, | ||
| "appServiceName": "[format('{0}{1}', parameters('appServiceNamePrefix'), uniqueString(resourceGroup().id))]", | ||
| "storageAccountName": "[format('{0}{1}', parameters('storageAccountNamePrefix'), uniqueString(resourceGroup().id))]" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "Microsoft.Web/serverfarms", | ||
| "apiVersion": "2022-03-01", | ||
| "name": "[parameters('appServicePlanName')]", | ||
| "location": "[parameters('location')]", | ||
| "sku": { | ||
| "name": "[variables('appServicePlanSku')]", | ||
| "capacity": "[variables('appServicePlanCapacity')]" | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.Web/sites", | ||
| "apiVersion": "2022-03-01", | ||
| "name": "[variables('appServiceName')]", | ||
| "location": "[parameters('location')]", | ||
| "properties": { | ||
| "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', parameters('appServicePlanName'))]", | ||
| "httpsOnly": true, | ||
| "siteConfig": { | ||
| "appSettings": [ | ||
| { | ||
| "name": "AppServiceStorageConnectionString", | ||
| "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};EndpointSuffix={1};Key={2}', variables('storageAccountName'), environment().suffixes.storage, listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2022-09-01').keys[0].value)]" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Web/serverfarms', parameters('appServicePlanName'))]", | ||
| "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" | ||
| ] | ||
| }, | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts", | ||
| "apiVersion": "2022-09-01", | ||
| "name": "[variables('storageAccountName')]", | ||
| "location": "[parameters('location')]", | ||
| "sku": { | ||
| "name": "[parameters('storageAccountType')]" | ||
| }, | ||
| "kind": "StorageV2", | ||
| "properties": { | ||
| "accessTier": "Hot" | ||
| } | ||
| } | ||
| ], | ||
| "outputs": { | ||
| "appServicePlan": { | ||
| "type": "string", | ||
| "value": "[parameters('appServicePlanName')]" | ||
| }, | ||
| "appServiceApp": { | ||
| "type": "string", | ||
| "value": "[reference(resourceId('Microsoft.Web/sites', variables('appServiceName')), '2022-03-01').defaultHostName]" | ||
| }, | ||
| "storageAccount": { | ||
| "type": "string", | ||
| "value": "[reference(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2022-09-01').primaryEndpoints.blob]" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.