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

SQL Auditing fixes #5052

Merged
merged 8 commits into from
Dec 4, 2017
Merged

SQL Auditing fixes #5052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8e203a
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Jan 30, 2017
57b579a
Merge branch 'dev' of https://github.com/yaakoviyun/azure-powershell …
yaakoviyun Mar 6, 2017
efe2a51
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
yaakoviyun Mar 6, 2017
157b717
Merge pull request #16 from Azure/preview
ranisha2 Nov 30, 2017
d615c43
SQL Auditing fixes
ranisha2 Nov 30, 2017
03f85aa
Update TestBlobAuditingOnDatabase tests to check for AuditAction value
ranisha2 Nov 30, 2017
974decd
Merge branch 'preview' into dev
twitchax Nov 30, 2017
5077d12
Add fixes description to SQL change log
ranisha2 Dec 1, 2017
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
4 changes: 4 additions & 0 deletions src/ResourceManager/Sql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
-->
## Current Release
* Added ability to rename database using Set-AzureRmSqlDatabase
* Fixed issue https://github.com/Azure/azure-powershell/issues/5046
- AuditAction parameter in auditing cmdlets is no longer being ignored
* Fixed an issue in Auditing cmdlets when 'Secondary' StorageKeyType is provided
- When setting blob auditing, the primary storage account key was used instead of the secondary key when providing 'Secondary' value for StorageKeyType parameter.

## Version 4.0.1
* Fixed assembly loading issue that caused some cmdlets to fail when executing
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,18 +930,18 @@ function Test-BlobAuditingOnDatabase
Assert-True { $policy.StorageKeyType -eq "Primary"}

# Test
Set-AzureRmSqlDatabaseAuditingPolicy -AuditType Blob -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -StorageKeyType "Secondary" -AuditActionGroup "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP", "FAILED_DATABASE_AUTHENTICATION_GROUP" -RetentionInDays 8
Set-AzureRmSqlDatabaseAuditingPolicy -AuditType Blob -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -StorageKeyType "Secondary" -AuditActionGroup "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP", "FAILED_DATABASE_AUTHENTICATION_GROUP" -RetentionInDays 8 -AuditAction "UPDATE ON database::[$($params.databaseName)] BY [public]"
$policy = Get-AzureRmSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.AuditState "Enabled"
Assert-AreEqual $policy.AuditActionGroup.Length 2
Assert-True {$policy.AuditActionGroup.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditActionGroups]::SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP)}
Assert-True {$policy.AuditActionGroup.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditActionGroups]::FAILED_DATABASE_AUTHENTICATION_GROUP)}
Assert-AreEqual $policy.AuditAction.Length 0
Assert-AreEqual $policy.RetentionInDays 8
Assert-True { $policy.StorageKeyType -eq "Secondary"}

Assert-AreEqual $policy.AuditAction.Length 1
Assert-AreEqual $policy.AuditAction "UPDATE ON database::[$($params.databaseName)] BY [public]"

# Test
Remove-AzureRmSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
Expand Down
7 changes: 4 additions & 3 deletions src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/BlobAuditingTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,25 +517,26 @@ function Test-BlobAuditingOnDatabase
Assert-True { $policy.StorageKeyType -eq "Primary"}

# Test
Set-AzureRmSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -StorageKeyType "Secondary" -AuditActionGroup "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP", "FAILED_DATABASE_AUTHENTICATION_GROUP" -RetentionInDays 8
Set-AzureRmSqlDatabaseAuditing -State Enabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount -StorageKeyType "Secondary" -AuditActionGroup "SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP", "FAILED_DATABASE_AUTHENTICATION_GROUP" -RetentionInDays 8 -AuditAction "UPDATE ON database::[$($params.databaseName)] BY [public]"
$policy = Get-AzureRmSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.AuditState "Enabled"
Assert-AreEqual $policy.AuditActionGroup.Length 2
Assert-True {$policy.AuditActionGroup.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditActionGroups]::SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP)}
Assert-True {$policy.AuditActionGroup.Contains([Microsoft.Azure.Commands.Sql.Auditing.Model.AuditActionGroups]::FAILED_DATABASE_AUTHENTICATION_GROUP)}
Assert-AreEqual $policy.AuditAction.Length 0
Assert-AreEqual $policy.RetentionInDays 8
Assert-True { $policy.StorageKeyType -eq "Secondary"}
Assert-AreEqual $policy.AuditAction.Length 1
Assert-AreEqual $policy.AuditAction "UPDATE ON database::[$($params.databaseName)] BY [public]"

# Test
Set-AzureRmSqlDatabaseAuditing -State Disabled -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
$policy = Get-AzureRmSqlDatabaseAuditing -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName

# Assert
Assert-AreEqual $policy.AuditState "Disabled"
Assert-AreEqual $policy.AuditAction.Length 0
Assert-AreEqual $policy.AuditAction.Length 1
}
finally
{
Expand Down
Loading