Fix BlobProperties is empty issue when use sas without prefix '?'(#15465)

blueww · web-flow · commit 6456173d4869 · 2021-07-14T16:59:28.000+08:00
diff --git a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.8.0" />
     <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.6.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.5.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.6.0" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
   </ItemGroup>
 
diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
@@ -24,6 +24,7 @@
     -  `Add-AzStorageAccountManagementPolicyAction`
 * Make list datalake gen2 items list out all items by default, instead of need user to list chunk by chunk.
     - `Get-AzDataLakeGen2ChildItem`
+* Fix BlobProperties is empty issue when use sas without prefix '?' [#15460]
 
 ## Version 3.9.0
 * Supported enable/disable Blob container soft delete
diff --git a/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs b/src/Storage/Storage/Blob/StorageCloudBlobCmdletBase.cs
@@ -656,7 +656,7 @@ internal DataLakeFileSystemClient GetFileSystemClientByName(IStorageBlobManageme
             }
             else if (localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS
             {
-                fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + localChannel.StorageContext.StorageAccount.Credentials.SASToken));
+                fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + "?" + Util.GetSASStringWithoutQuestionMark(localChannel.StorageContext.StorageAccount.Credentials.SASToken)));
             }
             else if (localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key
             {
@@ -897,15 +897,16 @@ public static BlobClient GetTrack2BlobClient(CloudBlob cloubBlob, AzureStorageCo
             }
             else if (cloubBlob.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloubBlob.ServiceClient.Credentials.SASToken);
                 string fullUri = cloubBlob.SnapshotQualifiedUri.ToString();
                 if (cloubBlob.IsSnapshot)
                 {
                     // Since snapshot URL already has '?', need remove '?' in the first char of sas
-                    fullUri = fullUri + "&" + cloubBlob.ServiceClient.Credentials.SASToken.Substring(1);
+                    fullUri = fullUri + "&" + sas;
                 }
                 else
                 {
-                    fullUri = fullUri + cloubBlob.ServiceClient.Credentials.SASToken;
+                    fullUri = fullUri + "?" + sas;
                 }
                 blobClient = new BlobClient(new Uri(fullUri), options);
             }
diff --git a/src/Storage/Storage/Common/AzureStorageBlob.cs b/src/Storage/Storage/Common/AzureStorageBlob.cs
@@ -379,15 +379,16 @@ public static BlobClient GetTrack2BlobClient(CloudBlob cloubBlob, AzureStorageCo
             }
             else if (cloubBlob.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloubBlob.ServiceClient.Credentials.SASToken);
                 string fullUri = cloubBlob.SnapshotQualifiedUri.ToString();
                 if (cloubBlob.IsSnapshot)
                 {
                     // Since snapshot URL already has '?', need remove '?' in the first char of sas
-                    fullUri = fullUri + "&" + cloubBlob.ServiceClient.Credentials.SASToken.Substring(1);
+                    fullUri = fullUri + "&" + sas;
                 }
                 else
                 {
-                    fullUri = fullUri + cloubBlob.ServiceClient.Credentials.SASToken;
+                    fullUri = fullUri + "?" + sas;
                 }
                 blobClient = new BlobClient(new Uri(fullUri), options);
             }
diff --git a/src/Storage/Storage/Common/AzureStorageContainer.cs b/src/Storage/Storage/Common/AzureStorageContainer.cs
@@ -24,6 +24,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     using BlobContainerProperties = global::Azure.Storage.Blobs.Models.BlobContainerProperties;
     using Microsoft.Azure.Storage.Auth;
     using Microsoft.Azure.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
 
     /// <summary>
     /// azure storage container
@@ -259,7 +260,8 @@ public static BlobContainerClient GetTrack2BlobContainerClient(CloudBlobContaine
             else if (cloubContainer.ServiceClient.Credentials.IsSAS) //SAS
             {
                 string fullUri = cloubContainer.Uri.ToString();
-                fullUri = fullUri + cloubContainer.ServiceClient.Credentials.SASToken;
+                string sas = Util.GetSASStringWithoutQuestionMark(cloubContainer.ServiceClient.Credentials.SASToken);
+                fullUri = fullUri + "?" + sas;
                 blobContainerClient = new BlobContainerClient(new Uri(fullUri), options);
             }
             else if (cloubContainer.ServiceClient.Credentials.IsSharedKey) //Shared Key
diff --git a/src/Storage/Storage/Common/AzureStorageFile.cs b/src/Storage/Storage/Common/AzureStorageFile.cs
@@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     using Microsoft.WindowsAzure.Commands.Storage;
     using global::Azure.Storage.Files.Shares;
     using global::Azure.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
 
     /// <summary>
     /// Azure storage file object
@@ -97,15 +98,16 @@ public static ShareFileClient GetTrack2FileClient(CloudFile cloudFile, AzureStor
             ShareFileClient fileClient;
             if (cloudFile.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloudFile.ServiceClient.Credentials.SASToken);
                 string fullUri = cloudFile.SnapshotQualifiedUri.ToString();
                 if (cloudFile.Share.IsSnapshot)
                 {
                     // Since snapshot URL already has '?', need remove '?' in the first char of sas
-                    fullUri = fullUri + "&" + cloudFile.ServiceClient.Credentials.SASToken.Substring(1);
+                    fullUri = fullUri + "&" + sas;
                 }
                 else
                 {
-                    fullUri = fullUri + cloudFile.ServiceClient.Credentials.SASToken;
+                    fullUri = fullUri + "?" + sas;
                 }
                 fileClient = new ShareFileClient(new Uri(fullUri));
             }
diff --git a/src/Storage/Storage/Common/AzureStorageFileDirectory.cs b/src/Storage/Storage/Common/AzureStorageFileDirectory.cs
@@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     using Microsoft.WindowsAzure.Commands.Storage;
     using global::Azure.Storage.Files.Shares;
     using global::Azure.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
 
     /// <summary>
     /// Azure storage file object
@@ -91,15 +92,16 @@ protected static ShareDirectoryClient GetTrack2FileDirClient(CloudFileDirectory
             ShareDirectoryClient fileDirClient;
             if (cloudFileDir.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloudFileDir.ServiceClient.Credentials.SASToken);
                 string fullUri = cloudFileDir.SnapshotQualifiedUri.ToString();
                 if (cloudFileDir.Share.IsSnapshot)
                 {
                     // Since snapshot URL already has '?', need remove '?' in the first char of sas
-                    fullUri = fullUri + "&" + cloudFileDir.ServiceClient.Credentials.SASToken.Substring(1);
+                    fullUri = fullUri + "&" + sas;
                 }
                 else
                 {
-                    fullUri = fullUri + cloudFileDir.ServiceClient.Credentials.SASToken;
+                    fullUri = fullUri + "?" + sas;
                 }
                 fileDirClient = new ShareDirectoryClient(new Uri(fullUri));
             }
diff --git a/src/Storage/Storage/Common/AzureStorageFileShare.cs b/src/Storage/Storage/Common/AzureStorageFileShare.cs
@@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     using Microsoft.WindowsAzure.Commands.Storage;
     using global::Azure.Storage.Files.Shares;
     using global::Azure.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
 
     /// <summary>
     /// Azure storage file object
@@ -108,15 +109,16 @@ protected static ShareClient GetTrack2FileShareClient(CloudFileShare cloudFileSh
             ShareClient fileShareClient;
             if (cloudFileShare.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloudFileShare.ServiceClient.Credentials.SASToken);
                 string fullUri = cloudFileShare.SnapshotQualifiedUri.ToString();
                 if (cloudFileShare.IsSnapshot)
                 {
                     // Since snapshot URL already has '?', need remove '?' in the first char of sas
-                    fullUri = fullUri + "&" + cloudFileShare.ServiceClient.Credentials.SASToken.Substring(1);
+                    fullUri = fullUri + "&" + sas;
                 }
                 else
                 {
-                    fullUri = fullUri + cloudFileShare.ServiceClient.Credentials.SASToken;
+                    fullUri = fullUri + "?" + sas;
                 }
                 fileShareClient = new ShareClient(new Uri(fullUri));
             }
diff --git a/src/Storage/Storage/Common/AzureStorageQueue.cs b/src/Storage/Storage/Common/AzureStorageQueue.cs
@@ -20,6 +20,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     using global::Azure.Storage;
     using global::Azure.Storage.Queues;
     using Microsoft.WindowsAzure.Commands.Storage;
+    using Microsoft.WindowsAzure.Commands.Storage.Common;
 
     /// <summary>
     /// Azure storage queue
@@ -111,8 +112,9 @@ protected static QueueClient GetTrack2QueueClient(CloudQueue cloudQueue, AzureSt
             }
             else if (cloudQueue.ServiceClient.Credentials.IsSAS) //SAS
             {
+                string sas = Util.GetSASStringWithoutQuestionMark(cloudQueue.ServiceClient.Credentials.SASToken);
                 string fullUri = cloudQueue.Uri.ToString();
-                fullUri = fullUri + cloudQueue.ServiceClient.Credentials.SASToken;
+                fullUri = fullUri + "?" + sas;
                 queueClient = new QueueClient(new Uri(fullUri));
             }
             else if (cloudQueue.ServiceClient.Credentials.IsSharedKey) //Shared Key
diff --git a/src/Storage/Storage/Common/Util.cs b/src/Storage/Storage/Common/Util.cs
@@ -679,5 +679,14 @@ public static NtfsFileAttributes LocalAttributesToAzureFileNtfsAttributes(FileAt
 
             return cloudFileNtfsAttributes;
         }
+
+        public static string GetSASStringWithoutQuestionMark(string sas)
+        {
+            if (sas.StartsWith("?"))
+            {
+                sas = sas.Substring(1);
+            }
+            return sas;
+        }
     }
 }
diff --git a/src/Storage/Storage/Storage.csproj b/src/Storage/Storage/Storage.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.8.0" />
     <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.6.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.5.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.6.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ internal DataLakeFileSystemClient GetFileSystemClientByName(IStorageBlobManageme`
`656`	`656`	`}`
`657`	`657`	`else if (localChannel.StorageContext.StorageAccount.Credentials.IsSAS) //SAS`
`658`	`658`	`{`
`659`		`- fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + localChannel.StorageContext.StorageAccount.Credentials.SASToken));`
	`659`	`+ fileSystem = new DataLakeFileSystemClient(new Uri (fileSystemUri.ToString() + "?" + Util.GetSASStringWithoutQuestionMark(localChannel.StorageContext.StorageAccount.Credentials.SASToken)));`
`660`	`660`	`}`
`661`	`661`	`else if (localChannel.StorageContext.StorageAccount.Credentials.IsSharedKey) //Shared Key`
`662`	`662`	`{`
`@@ -897,15 +897,16 @@ public static BlobClient GetTrack2BlobClient(CloudBlob cloubBlob, AzureStorageCo`
`897`	`897`	`}`
`898`	`898`	`else if (cloubBlob.ServiceClient.Credentials.IsSAS) //SAS`
`899`	`899`	`{`
	`900`	`+ string sas = Util.GetSASStringWithoutQuestionMark(cloubBlob.ServiceClient.Credentials.SASToken);`
`900`	`901`	`string fullUri = cloubBlob.SnapshotQualifiedUri.ToString();`
`901`	`902`	`if (cloubBlob.IsSnapshot)`
`902`	`903`	`{`
`903`	`904`	`// Since snapshot URL already has '?', need remove '?' in the first char of sas`
`904`		`- fullUri = fullUri + "&" + cloubBlob.ServiceClient.Credentials.SASToken.Substring(1);`
	`905`	`+ fullUri = fullUri + "&" + sas;`
`905`	`906`	`}`
`906`	`907`	`else`
`907`	`908`	`{`
`908`		`- fullUri = fullUri + cloubBlob.ServiceClient.Credentials.SASToken;`
	`909`	`+ fullUri = fullUri + "?" + sas;`
`909`	`910`	`}`
`910`	`911`	`blobClient = new BlobClient(new Uri(fullUri), options);`
`911`	`912`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,15 +379,16 @@ public static BlobClient GetTrack2BlobClient(CloudBlob cloubBlob, AzureStorageCo`
`379`	`379`	`}`
`380`	`380`	`else if (cloubBlob.ServiceClient.Credentials.IsSAS) //SAS`
`381`	`381`	`{`
	`382`	`+ string sas = Util.GetSASStringWithoutQuestionMark(cloubBlob.ServiceClient.Credentials.SASToken);`
`382`	`383`	`string fullUri = cloubBlob.SnapshotQualifiedUri.ToString();`
`383`	`384`	`if (cloubBlob.IsSnapshot)`
`384`	`385`	`{`
`385`	`386`	`// Since snapshot URL already has '?', need remove '?' in the first char of sas`
`386`		`- fullUri = fullUri + "&" + cloubBlob.ServiceClient.Credentials.SASToken.Substring(1);`
	`387`	`+ fullUri = fullUri + "&" + sas;`
`387`	`388`	`}`
`388`	`389`	`else`
`389`	`390`	`{`
`390`		`- fullUri = fullUri + cloubBlob.ServiceClient.Credentials.SASToken;`
	`391`	`+ fullUri = fullUri + "?" + sas;`
`391`	`392`	`}`
`392`	`393`	`blobClient = new BlobClient(new Uri(fullUri), options);`
`393`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel`
`21`	`21`	`using Microsoft.WindowsAzure.Commands.Storage;`
`22`	`22`	`using global::Azure.Storage.Files.Shares;`
`23`	`23`	`using global::Azure.Storage;`
	`24`	`+ using Microsoft.WindowsAzure.Commands.Storage.Common;`
`24`	`25`
`25`	`26`	`/// <summary>`
`26`	`27`	`/// Azure storage file object`
`@@ -97,15 +98,16 @@ public static ShareFileClient GetTrack2FileClient(CloudFile cloudFile, AzureStor`
`97`	`98`	`ShareFileClient fileClient;`
`98`	`99`	`if (cloudFile.ServiceClient.Credentials.IsSAS) //SAS`
`99`	`100`	`{`
	`101`	`+ string sas = Util.GetSASStringWithoutQuestionMark(cloudFile.ServiceClient.Credentials.SASToken);`
`100`	`102`	`string fullUri = cloudFile.SnapshotQualifiedUri.ToString();`
`101`	`103`	`if (cloudFile.Share.IsSnapshot)`
`102`	`104`	`{`
`103`	`105`	`// Since snapshot URL already has '?', need remove '?' in the first char of sas`
`104`		`- fullUri = fullUri + "&" + cloudFile.ServiceClient.Credentials.SASToken.Substring(1);`
	`106`	`+ fullUri = fullUri + "&" + sas;`
`105`	`107`	`}`
`106`	`108`	`else`
`107`	`109`	`{`
`108`		`- fullUri = fullUri + cloudFile.ServiceClient.Credentials.SASToken;`
	`110`	`+ fullUri = fullUri + "?" + sas;`
`109`	`111`	`}`
`110`	`112`	`fileClient = new ShareFileClient(new Uri(fullUri));`
`111`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel`
`20`	`20`	`using global::Azure.Storage;`
`21`	`21`	`using global::Azure.Storage.Queues;`
`22`	`22`	`using Microsoft.WindowsAzure.Commands.Storage;`
	`23`	`+ using Microsoft.WindowsAzure.Commands.Storage.Common;`
`23`	`24`
`24`	`25`	`/// <summary>`
`25`	`26`	`/// Azure storage queue`
`@@ -111,8 +112,9 @@ protected static QueueClient GetTrack2QueueClient(CloudQueue cloudQueue, AzureSt`
`111`	`112`	`}`
`112`	`113`	`else if (cloudQueue.ServiceClient.Credentials.IsSAS) //SAS`
`113`	`114`	`{`
	`115`	`+ string sas = Util.GetSASStringWithoutQuestionMark(cloudQueue.ServiceClient.Credentials.SASToken);`
`114`	`116`	`string fullUri = cloudQueue.Uri.ToString();`
`115`		`- fullUri = fullUri + cloudQueue.ServiceClient.Credentials.SASToken;`
	`117`	`+ fullUri = fullUri + "?" + sas;`
`116`	`118`	`queueClient = new QueueClient(new Uri(fullUri));`
`117`	`119`	`}`
`118`	`120`	`else if (cloudQueue.ServiceClient.Credentials.IsSharedKey) //Shared Key`
Original file line number	Diff line number	Diff line change
`@@ -679,5 +679,14 @@ public static NtfsFileAttributes LocalAttributesToAzureFileNtfsAttributes(FileAt`
`679`	`679`
`680`	`680`	`return cloudFileNtfsAttributes;`
`681`	`681`	`}`
	`682`	`+`
	`683`	`+ public static string GetSASStringWithoutQuestionMark(string sas)`
	`684`	`+ {`
	`685`	`+ if (sas.StartsWith("?"))`
	`686`	`+ {`
	`687`	`+ sas = sas.Substring(1);`
	`688`	`+ }`
	`689`	`+ return sas;`
	`690`	`+ }`
`682`	`691`	`}`
`683`	`692`	`}`