[Storage] Fix context issues - misleading StorageAccountName field and null reference issue when context has no Credentials field (#21741)

yifanz7 · web-flow · commit 737607bc8ab9 · 2023-05-11T14:42:09.000+08:00
* Fix context issue

* Add more checks
diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed an issue of StorageAccountName field in context object when the context is invalid 
+    - `New-AzStorageContext`
+* Fixed an issue when a context does not have Crendentials field 
 * Added "$blobchangefeed" to be a valid container name
 
 ## Version 5.6.0
diff --git a/src/Storage/Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs b/src/Storage/Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs
@@ -180,7 +180,7 @@ public override void ExecuteCmdlet()
 
             // When the input context is Oauth bases, can't generate normal SAS, but UserDelegationSas
             bool generateUserDelegationSas = false;
-            if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount.Credentials.IsToken)
+            if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount.Credentials !=null && Channel.StorageContext.StorageAccount.Credentials.IsToken)
             {
                 if (ShouldProcess(blob.Name, "Generate User Delegation SAS, since input Storage Context is OAuth based."))
                 {
diff --git a/src/Storage/Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs b/src/Storage/Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs
@@ -127,7 +127,7 @@ public override void ExecuteCmdlet()
 
             // When the input context is Oauth bases, can't generate normal SAS, but UserDelegationSas
             bool generateUserDelegationSas = false;
-            if (Channel!=null && Channel.StorageContext!= null && Channel.StorageContext.StorageAccount.Credentials.IsToken)
+            if (Channel!=null && Channel.StorageContext!= null && Channel.StorageContext.StorageAccount.Credentials != null && Channel.StorageContext.StorageAccount.Credentials.IsToken)
             {
                 if (ShouldProcess(Name, "Generate User Delegation SAS, since input Storage Context is OAuth based."))
                 {
diff --git a/src/Storage/Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs b/src/Storage/Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs
@@ -677,6 +677,8 @@ private async Task StartCopyFromBlob(long taskId, IStorageBlobManagement destCha
                 if (Channel!=null && destChannel != null && 
                     Channel.StorageContext!= null && destChannel.StorageContext != null 
                     && Channel.StorageContext.StorageAccountName == destChannel.StorageContext.StorageAccountName
+                    && Channel.StorageContext.StorageAccount != null 
+                    && Channel.StorageContext.StorageAccount.Credentials != null
                     && Channel.StorageContext.StorageAccount.Credentials.IsToken)
                 {
                     // if inside same account, source blob can be anonumous
@@ -712,6 +714,8 @@ private async Task StartCopyFromBlob(long taskId, IStorageBlobManagement destCha
                 if (Channel != null && destChannel != null &&
                     Channel.StorageContext != null && destChannel.StorageContext != null
                     && Channel.StorageContext.StorageAccountName == destChannel.StorageContext.StorageAccountName
+                    && Channel.StorageContext.StorageAccount != null
+                    && Channel.StorageContext.StorageAccount.Credentials != null
                     && Channel.StorageContext.StorageAccount.Credentials.IsToken)
                 {
                     // if inside same account, source blob can be anonumous
diff --git a/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs b/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs
@@ -713,15 +713,15 @@ internal DataLakeFileSystemClient GetFileSystemClientByName(IStorageBlobManageme
             Uri fileSystemUri = localChannel.StorageContext.StorageAccount.CreateCloudBlobClient().GetContainerReference(fileSystemName).Uri;
             DataLakeFileSystemClient fileSystem;
 
-            if (localChannel.StorageContext.StorageAccount.Credentials.IsToken) //Oauth
+            if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsToken) //Oauth
             {
                 fileSystem = new DataLakeFileSystemClient(fileSystemUri, localChannel.StorageContext.Track2OauthToken, this.DataLakeClientOptions);
             }
-            else if (localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS
+            else if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS
             {
                 fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + "?" + Util.GetSASStringWithoutQuestionMark(localChannel.StorageContext.StorageAccount.Credentials.SASToken)), this.DataLakeClientOptions);
             }
-            else if (localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key
+            else if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key
             {
                 fileSystem = new DataLakeFileSystemClient(fileSystemUri,
                      new StorageSharedKeyCredential(localChannel.StorageContext.StorageAccountName, localChannel.StorageContext.StorageAccount.Credentials.ExportBase64EncodedKey()), this.DataLakeClientOptions);
diff --git a/src/Storage/Storage/Common/AzureStorageBlob.cs b/src/Storage/Storage/Common/AzureStorageBlob.cs
@@ -313,7 +313,7 @@ public AzureStorageBlob(TaggedBlobItem blob, AzureStorageContext storageContext,
                 BlobName = blob.BlobName
             };
             Uri blobUri = uriBuilder.ToUri();
-            if (storageContext.StorageAccount.Credentials.IsSAS)
+            if (storageContext.StorageAccount != null && storageContext.StorageAccount.Credentials != null && storageContext.StorageAccount.Credentials.IsSAS)
             {
                 blobUri= new Uri(blobUri.ToString() + storageContext.StorageAccount.Credentials.SASToken);
             }
@@ -497,12 +497,12 @@ public static BlobClient GetTrack2BlobClient(BlobBaseClient blobBaseClient, Azur
                 return (BlobClient)blobBaseClient;
             }
             BlobClient blobClient;
-            if (context.StorageAccount.Credentials.IsToken) //Oauth
+            if (context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsToken) //Oauth
             {
                 blobClient = new BlobClient(blobBaseClient.Uri, context.Track2OauthToken, options);
 
             }
-            else if (context.StorageAccount.Credentials.IsSharedKey) //Shared Key
+            else if (context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey) //Shared Key
             {
                 blobClient = new BlobClient(blobBaseClient.Uri,
                     new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey()), options);
diff --git a/src/Storage/Storage/Common/AzureStorageContext.cs b/src/Storage/Storage/Common/AzureStorageContext.cs
@@ -186,7 +186,7 @@ public AzureStorageContext(CloudStorageAccount account, string accountName = nul
                 {
                     StorageAccountName = "[AccessToken]";
                 }
-                else
+                else if (account.Credentials != null && account.Credentials.IsAnonymous)
                 {
                     StorageAccountName = "[Anonymous]";
                 }
diff --git a/src/Storage/Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs b/src/Storage/Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs
@@ -90,7 +90,8 @@ public NewAzureStorageAccountSasTokenCommand(IStorageBlobManagement channel)
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
-            if (Channel != null && Channel.StorageContext != null && !Channel.StorageContext.StorageAccount.Credentials.IsSharedKey)
+            if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount != null 
+                && Channel.StorageContext.StorageAccount.Credentials != null && !Channel.StorageContext.StorageAccount.Credentials.IsSharedKey)
             {
                 throw new ArgumentException("Storage account SAS token must be secured with the storage account key.", "Context");
             }
diff --git a/src/Storage/Storage/Common/SasTokenHelper.cs b/src/Storage/Storage/Common/SasTokenHelper.cs
@@ -448,7 +448,7 @@ public static ShareSasBuilder SetShareSasBuilder(string shareName,
         /// </summary>
         public static string GetFileSharedAccessSignature(AzureStorageContext context, ShareSasBuilder sasBuilder, CancellationToken cancelToken)
         {
-            if (context != null && context.StorageAccount.Credentials.IsSharedKey)
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)
             {
                 return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();
             }
@@ -687,7 +687,7 @@ public static BlobSasBuilder SetBlobPermission(BlobSasBuilder sasBuilder, string
         /// </summary>
         public static string GetBlobSharedAccessSignature(AzureStorageContext context, BlobSasBuilder sasBuilder, bool generateUserDelegationSas, BlobClientOptions ClientOptions, CancellationToken cancelToken)
         {
-            if (context != null && context.StorageAccount.Credentials.IsSharedKey)
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)
             {
                 return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();
             }
@@ -716,7 +716,7 @@ public static string GetBlobSharedAccessSignature(AzureStorageContext context, B
         /// </summary>
         public static string GetDatalakeGen2SharedAccessSignature(AzureStorageContext context, DataLakeSasBuilder sasBuilder, bool generateUserDelegationSas, DataLakeClientOptions clientOptions, CancellationToken cancelToken)
         {
-            if (context != null && context.StorageAccount.Credentials.IsSharedKey)
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)
             {
                 return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();
             }
diff --git a/src/Storage/Storage/Common/StorageExtensions.cs b/src/Storage/Storage/Common/StorageExtensions.cs
@@ -197,7 +197,7 @@ internal static Uri GenerateUriWithCredentials(
             {
                 throw new ArgumentNullException("blob");
             }
-            else if (context.StorageAccount.Credentials.IsSAS)
+            else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSAS)
             {
                 return blob.Uri;
             }
diff --git a/src/Storage/Storage/Common/Util.cs b/src/Storage/Storage/Common/Util.cs
@@ -426,7 +426,7 @@ public static BlobBaseClient GetTrack2BlobClient(Uri blobUri, AzureStorageContex
             {
                 options = new BlobClientOptions();
             }
-            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials.IsToken) //Oauth
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsToken) //Oauth
             {
                 if (blobType == null)
                 {
@@ -448,7 +448,7 @@ public static BlobBaseClient GetTrack2BlobClient(Uri blobUri, AzureStorageContex
                     }
                 }
             }
-            else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials.IsSharedKey) //Shared Key
+            else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey) //Shared Key
             {
                 if (blobType == null)
                 {
@@ -503,7 +503,7 @@ public static BlobBaseClient GetTrack2BlobClientWithType(BlobBaseClient blob, Az
         public static BlobServiceClient GetTrack2BlobServiceClient(AzureStorageContext context, BlobClientOptions options = null)
         {
             BlobServiceClient blobServiceClient;
-            if (context.StorageAccount.Credentials.IsToken) //Oauth
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsToken) //Oauth
             {
                 blobServiceClient = new BlobServiceClient(context.StorageAccount.BlobEndpoint, context.Track2OauthToken, options);
             }
@@ -512,7 +512,7 @@ public static BlobServiceClient GetTrack2BlobServiceClient(AzureStorageContext c
                 string connectionString = context.ConnectionString;
 
                 // remove the "?" at the begin of SAS if any
-                if (context.StorageAccount.Credentials.IsSAS)
+                if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSAS)
                 {
                     connectionString = connectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
                 }
@@ -524,15 +524,15 @@ public static BlobServiceClient GetTrack2BlobServiceClient(AzureStorageContext c
         public static DataLakeServiceClient GetTrack2DataLakeServiceClient(AzureStorageContext context, DataLakeClientOptions options = null)
         {
             DataLakeServiceClient serviceClient;
-            if (context.StorageAccount.Credentials.IsToken) //Oauth
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsToken) //Oauth
             {
                 serviceClient = new DataLakeServiceClient(context.StorageAccount.BlobEndpoint, context.Track2OauthToken, options);
             }
-            else if (context.StorageAccount.Credentials.IsSharedKey) //key 
+            else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey) //key 
             {
                 serviceClient = new DataLakeServiceClient(context.StorageAccount.BlobEndpoint, new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey()), options);
             }
-            else if (context.StorageAccount.Credentials.IsSAS) //sas 
+            else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSAS) //sas 
             {
                 serviceClient = new DataLakeServiceClient(new Uri(context.StorageAccount.BlobEndpoint.ToString() + context.StorageAccount.Credentials.SASToken), options);
             }
@@ -768,7 +768,7 @@ public static ShareServiceClient GetTrack2FileServiceClient(AzureStorageContext
             string connectionString = context.ConnectionString;
 
             // remove the "?" at the begin of SAS if any
-            if (context.StorageAccount.Credentials.IsSAS)
+            if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSAS)
             {
                 connectionString = connectionString.Replace("SharedAccessSignature=?", "SharedAccessSignature=");
             }
diff --git a/src/Storage/Storage/DatalakeGen2/Cmdlet/GetAzDataLakeGen2FileContent.cs b/src/Storage/Storage/DatalakeGen2/Cmdlet/GetAzDataLakeGen2FileContent.cs
@@ -264,7 +264,8 @@ public override void ExecuteCmdlet()
             {
                 if (!InputObject.IsDirectory)
                 {
-                    if (Channel.StorageContext.StorageAccount.Credentials.IsSAS)
+                    if (Channel.StorageContext.StorageAccount != null &&
+                        Channel.StorageContext.StorageAccount.Credentials != null && Channel.StorageContext.StorageAccount.Credentials.IsSAS)
                     {
                         // For SAS, the Uri already contains the sas token, so can't repeatedly inout the credential
                         blob = new CloudBlockBlob(InputObject.File.Uri);
diff --git a/src/Storage/Storage/DatalakeGen2/Cmdlet/NewAzDataLakeGen2Item.cs b/src/Storage/Storage/DatalakeGen2/Cmdlet/NewAzDataLakeGen2Item.cs
@@ -214,8 +214,8 @@ public override void ExecuteCmdlet()
                 if (ShouldProcess(GetDataLakeItemUriWithoutSas(fileClient), "Create File: "))
                 {
                     // Use SDK to upload directly when use SAS credential, and need set permission, since set permission after upload will fail with SAS
-                    if (Channel.StorageContext.StorageAccount.Credentials.IsSAS
-                        && (!string.IsNullOrEmpty(this.Permission) || !string.IsNullOrEmpty(this.Umask)))
+                    if (Channel.StorageContext.StorageAccount != null && Channel.StorageContext.StorageAccount.Credentials != null &&
+                        Channel.StorageContext.StorageAccount.Credentials.IsSAS && (!string.IsNullOrEmpty(this.Permission) || !string.IsNullOrEmpty(this.Umask)))
                     {
                         Func<long, Task> taskGenerator = (taskId) => UploadDataLakeFile(taskId, fileClient, ResolvedFileName);
                         RunTask(taskGenerator);
diff --git a/src/Storage/Storage/DatalakeGen2/Cmdlet/NewAzDataLakeGen2SasToken.cs b/src/Storage/Storage/DatalakeGen2/Cmdlet/NewAzDataLakeGen2SasToken.cs
@@ -117,7 +117,8 @@ public override void ExecuteCmdlet()
 
             // When the input context is Oauth bases, can't generate normal SAS, but UserDelegationSas
             bool generateUserDelegationSas = false;
-            if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount.Credentials.IsToken)
+            if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount != null && 
+                Channel.StorageContext.StorageAccount.Credentials != null &&  Channel.StorageContext.StorageAccount.Credentials.IsToken)
             {
                 if (ShouldProcess(this.Path, "Generate User Delegation SAS, since input Storage Context is OAuth based."))
                 {
diff --git a/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileContent.cs b/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileContent.cs
@@ -225,7 +225,8 @@ public override void ExecuteCmdlet()
                         Resources.PrepareDownloadingFile);
 
                     // If not Oauth, use DMlib
-                    if (!(this.Channel != null && this.Channel.StorageContext != null && this.Channel.StorageContext.StorageAccount != null && this.Channel.StorageContext.StorageAccount.Credentials.IsToken))
+                    if (!(this.Channel != null && this.Channel.StorageContext != null && this.Channel.StorageContext.StorageAccount != null && 
+                    this.Channel.StorageContext.StorageAccount.Credentials != null && this.Channel.StorageContext.StorageAccount.Credentials.IsToken))
                     {
                         await DataMovementTransferHelper.DoTransfer(() =>
                         {
diff --git a/src/Storage/Storage/Model/Contract/StorageBlobManagement.cs b/src/Storage/Storage/Model/Contract/StorageBlobManagement.cs
@@ -166,11 +166,13 @@ public BlobServiceClient GetBlobServiceClient(BlobClientOptions options = null)
         {
             if (blobServiceClient == null)
             {
-                if (this.StorageContext.StorageAccount.Credentials.IsToken) //Oauth
+                if (this.StorageContext != null && this.StorageContext.StorageAccount != null && 
+                    this.StorageContext.StorageAccount.Credentials != null && this.StorageContext.StorageAccount.Credentials.IsToken) //Oauth
                 {
                     blobServiceClient = new BlobServiceClient(this.StorageContext.StorageAccount.BlobEndpoint, this.StorageContext.Track2OauthToken, options);
                 }
-                else if (this.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key
+                else if (this.StorageContext != null && this.StorageContext.StorageAccount != null &&
+                     this.StorageContext.StorageAccount.Credentials != null &&  this.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key
                 {
                     blobServiceClient = new BlobServiceClient(this.StorageContext.StorageAccount.BlobEndpoint,
                         new StorageSharedKeyCredential(this.StorageContext.StorageAccountName, this.StorageContext.StorageAccount.Credentials.ExportBase64EncodedKey()), options);

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public override void ExecuteCmdlet()`
`180`	`180`
`181`	`181`	`// When the input context is Oauth bases, can't generate normal SAS, but UserDelegationSas`
`182`	`182`	`bool generateUserDelegationSas = false;`
`183`		`- if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount.Credentials.IsToken)`
	`183`	`+ if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount.Credentials !=null && Channel.StorageContext.StorageAccount.Credentials.IsToken)`
`184`	`184`	`{`
`185`	`185`	`if (ShouldProcess(blob.Name, "Generate User Delegation SAS, since input Storage Context is OAuth based."))`
`186`	`186`	`{`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public override void ExecuteCmdlet()`
`127`	`127`
`128`	`128`	`// When the input context is Oauth bases, can't generate normal SAS, but UserDelegationSas`
`129`	`129`	`bool generateUserDelegationSas = false;`
`130`		`- if (Channel!=null && Channel.StorageContext!= null && Channel.StorageContext.StorageAccount.Credentials.IsToken)`
	`130`	`+ if (Channel!=null && Channel.StorageContext!= null && Channel.StorageContext.StorageAccount.Credentials != null && Channel.StorageContext.StorageAccount.Credentials.IsToken)`
`131`	`131`	`{`
`132`	`132`	`if (ShouldProcess(Name, "Generate User Delegation SAS, since input Storage Context is OAuth based."))`
`133`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -713,15 +713,15 @@ internal DataLakeFileSystemClient GetFileSystemClientByName(IStorageBlobManageme`
`713`	`713`	`Uri fileSystemUri = localChannel.StorageContext.StorageAccount.CreateCloudBlobClient().GetContainerReference(fileSystemName).Uri;`
`714`	`714`	`DataLakeFileSystemClient fileSystem;`
`715`	`715`
`716`		`- if (localChannel.StorageContext.StorageAccount.Credentials.IsToken) //Oauth`
	`716`	`+ if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsToken) //Oauth`
`717`	`717`	`{`
`718`	`718`	`fileSystem = new DataLakeFileSystemClient(fileSystemUri, localChannel.StorageContext.Track2OauthToken, this.DataLakeClientOptions);`
`719`	`719`	`}`
`720`		`- else if (localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS`
	`720`	`+ else if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS`
`721`	`721`	`{`
`722`	`722`	`fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + "?" + Util.GetSASStringWithoutQuestionMark(localChannel.StorageContext.StorageAccount.Credentials.SASToken)), this.DataLakeClientOptions);`
`723`	`723`	`}`
`724`		`- else if (localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key`
	`724`	`+ else if (localChannel.StorageContext.StorageAccount.Credentials != null && localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key`
`725`	`725`	`{`
`726`	`726`	`fileSystem = new DataLakeFileSystemClient(fileSystemUri,`
`727`	`727`	`new StorageSharedKeyCredential(localChannel.StorageContext.StorageAccountName, localChannel.StorageContext.StorageAccount.Credentials.ExportBase64EncodedKey()), this.DataLakeClientOptions);`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public AzureStorageBlob(TaggedBlobItem blob, AzureStorageContext storageContext,`
`313`	`313`	`BlobName = blob.BlobName`
`314`	`314`	`};`
`315`	`315`	`Uri blobUri = uriBuilder.ToUri();`
`316`		`- if (storageContext.StorageAccount.Credentials.IsSAS)`
	`316`	`+ if (storageContext.StorageAccount != null && storageContext.StorageAccount.Credentials != null && storageContext.StorageAccount.Credentials.IsSAS)`
`317`	`317`	`{`
`318`	`318`	`blobUri= new Uri(blobUri.ToString() + storageContext.StorageAccount.Credentials.SASToken);`
`319`	`319`	`}`
`@@ -497,12 +497,12 @@ public static BlobClient GetTrack2BlobClient(BlobBaseClient blobBaseClient, Azur`
`497`	`497`	`return (BlobClient)blobBaseClient;`
`498`	`498`	`}`
`499`	`499`	`BlobClient blobClient;`
`500`		`- if (context.StorageAccount.Credentials.IsToken) //Oauth`
	`500`	`+ if (context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsToken) //Oauth`
`501`	`501`	`{`
`502`	`502`	`blobClient = new BlobClient(blobBaseClient.Uri, context.Track2OauthToken, options);`
`503`	`503`
`504`	`504`	`}`
`505`		`- else if (context.StorageAccount.Credentials.IsSharedKey) //Shared Key`
	`505`	`+ else if (context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey) //Shared Key`
`506`	`506`	`{`
`507`	`507`	`blobClient = new BlobClient(blobBaseClient.Uri,`
`508`	`508`	`new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey()), options);`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public AzureStorageContext(CloudStorageAccount account, string accountName = nul`
`186`	`186`	`{`
`187`	`187`	`StorageAccountName = "[AccessToken]";`
`188`	`188`	`}`
`189`		`- else`
	`189`	`+ else if (account.Credentials != null && account.Credentials.IsAnonymous)`
`190`	`190`	`{`
`191`	`191`	`StorageAccountName = "[Anonymous]";`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ public NewAzureStorageAccountSasTokenCommand(IStorageBlobManagement channel)`
`90`	`90`	`[PermissionSet(SecurityAction.Demand, Name = "FullTrust")]`
`91`	`91`	`public override void ExecuteCmdlet()`
`92`	`92`	`{`
`93`		`- if (Channel != null && Channel.StorageContext != null && !Channel.StorageContext.StorageAccount.Credentials.IsSharedKey)`
	`93`	`+ if (Channel != null && Channel.StorageContext != null && Channel.StorageContext.StorageAccount != null`
	`94`	`+ && Channel.StorageContext.StorageAccount.Credentials != null && !Channel.StorageContext.StorageAccount.Credentials.IsSharedKey)`
`94`	`95`	`{`
`95`	`96`	`throw new ArgumentException("Storage account SAS token must be secured with the storage account key.", "Context");`
`96`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ public static ShareSasBuilder SetShareSasBuilder(string shareName,`
`448`	`448`	`/// </summary>`
`449`	`449`	`public static string GetFileSharedAccessSignature(AzureStorageContext context, ShareSasBuilder sasBuilder, CancellationToken cancelToken)`
`450`	`450`	`{`
`451`		`- if (context != null && context.StorageAccount.Credentials.IsSharedKey)`
	`451`	`+ if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)`
`452`	`452`	`{`
`453`	`453`	`return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();`
`454`	`454`	`}`
`@@ -687,7 +687,7 @@ public static BlobSasBuilder SetBlobPermission(BlobSasBuilder sasBuilder, string`
`687`	`687`	`/// </summary>`
`688`	`688`	`public static string GetBlobSharedAccessSignature(AzureStorageContext context, BlobSasBuilder sasBuilder, bool generateUserDelegationSas, BlobClientOptions ClientOptions, CancellationToken cancelToken)`
`689`	`689`	`{`
`690`		`- if (context != null && context.StorageAccount.Credentials.IsSharedKey)`
	`690`	`+ if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)`
`691`	`691`	`{`
`692`	`692`	`return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();`
`693`	`693`	`}`
`@@ -716,7 +716,7 @@ public static string GetBlobSharedAccessSignature(AzureStorageContext context, B`
`716`	`716`	`/// </summary>`
`717`	`717`	`public static string GetDatalakeGen2SharedAccessSignature(AzureStorageContext context, DataLakeSasBuilder sasBuilder, bool generateUserDelegationSas, DataLakeClientOptions clientOptions, CancellationToken cancelToken)`
`718`	`718`	`{`
`719`		`- if (context != null && context.StorageAccount.Credentials.IsSharedKey)`
	`719`	`+ if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSharedKey)`
`720`	`720`	`{`
`721`	`721`	`return sasBuilder.ToSasQueryParameters(new StorageSharedKeyCredential(context.StorageAccountName, context.StorageAccount.Credentials.ExportBase64EncodedKey())).ToString();`
`722`	`722`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ internal static Uri GenerateUriWithCredentials(`
`197`	`197`	`{`
`198`	`198`	`throw new ArgumentNullException("blob");`
`199`	`199`	`}`
`200`		`- else if (context.StorageAccount.Credentials.IsSAS)`
	`200`	`+ else if (context != null && context.StorageAccount != null && context.StorageAccount.Credentials != null && context.StorageAccount.Credentials.IsSAS)`
`201`	`201`	`{`
`202`	`202`	`return blob.Uri;`
`203`	`203`	`}`