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

[Don't Merge!][SecureString] [SDK-based][Az.Storage] Add a SecureString Property with custom code #27253

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −12
Draft

[Don't Merge!][SecureString] [SDK-based][Az.Storage] Add a SecureString Property with custom code #27253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/Storage/Storage.Management.Sdk/custom/StorageAccountKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Microsoft.Azure.Management.Storage.Models
{
using Microsoft.WindowsAzure.Commands.Common;

/// <summary>
/// An access key for the storage account.
/// </summary>
public partial class StorageAccountKey
{
public System.Security.SecureString ValueSecure { get => (this.Value.ConvertToSecureString()); }
}
}
24 changes: 12 additions & 12 deletions src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ function Test-StorageAccount
New-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;

$stokey2 = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey2[1].Value $stokey1[1].Value;
Assert-AreNotEqual ($stokey1[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreEqual ($stokey2[1].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey1[1].ValueSecure | ConvertFrom-SecureString -AsPlainText);

New-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;

$stokey3 = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey3[0].Value $stokey2[0].Value;
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;
Assert-AreNotEqual ($stokey1[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreEqual ($stokey3[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreNotEqual ($stokey2[1].ValueSecure | ConvertFrom-SecureString -AsPlainText) $stokey3[1].Value;

Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
Expand Down Expand Up @@ -360,7 +360,7 @@ function Test-GetAzureStorageAccountKey
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { $global:stokeys = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname; }
Assert-AreNotEqual $stokeys[1].Value $stokeys[0].Value;
Assert-AreNotEqual ($stokeys[1].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokeys[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);

Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
Expand Down Expand Up @@ -397,15 +397,15 @@ function Test-NewAzureStorageAccountKey
New-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key1;

$stokey2 = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey1[1].Value $stokey2[1].Value;
Assert-AreNotEqual ($stokey1[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreEqual ($stokey1[1].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[1].ValueSecure | ConvertFrom-SecureString -AsPlainText);

New-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname -KeyName key2;

$stokey3 = Get-AzStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
Assert-AreNotEqual $stokey1[0].Value $stokey2[0].Value;
Assert-AreEqual $stokey2[0].Value $stokey3[0].Value;
Assert-AreNotEqual $stokey2[1].Value $stokey3[1].Value;
Assert-AreNotEqual ($stokey1[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreEqual ($stokey2[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokey3[0].ValueSecure | ConvertFrom-SecureString -AsPlainText);
Assert-AreNotEqual ($stokey2[1].ValueSecure | ConvertFrom-SecureString -AsPlainText) $stokey3[1].Value;

Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
Expand Down Expand Up @@ -438,7 +438,7 @@ function Test-PipingGetAccountToGetKey
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;

Retry-IfException { $global:stokeys = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname | Get-AzStorageAccountKey -ResourceGroupName $rgname; }
Assert-AreNotEqual $stokeys[0].Value $stokeys[1].Value;
Assert-AreNotEqual ($stokeys[0].ValueSecure | ConvertFrom-SecureString -AsPlainText) ($stokeys[1].ValueSecure | ConvertFrom-SecureString -AsPlainText);

Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
}
Expand Down