Deserialize xml content not containing namespace (#763)

* Deserialize xml content not containing namespace

* Optimize

* Format

* dispose using streams

* Fixes

* addresses git actions/warnings

---------

Co-authored-by: Thomas Paterson <tpaterson@redboxvoice.com>
Co-authored-by: Ersan <ersan.bozduman@gmail.com>

Minio.Examples/Cases/PutObject.cs

@@ -34,7 +34,7 @@ public static async Task Run(IMinioClient minio,
         {
             ReadOnlyMemory<byte> bs = await File.ReadAllBytesAsync(fileName).ConfigureAwait(false);
             Console.WriteLine("Running example for API: PutObjectAsync");
-            var filestream = bs.AsStream();
+            using var filestream = bs.AsStream();
 
             var fileInfo = new FileInfo(fileName);
             var metaData = new Dictionary<string, string>

Minio.Examples/Cases/SelectObjectContent.cs

@@ -41,7 +41,7 @@ public static async Task Run(IMinioClient minio,
             csvString.AppendLine("Employee5,Employee1,500");
             csvString.AppendLine("Employee2,Employee1,800");
             ReadOnlyMemory<byte> csvBytes = Encoding.UTF8.GetBytes(csvString.ToString());
-            var stream = csvBytes.AsStream();
+            using var stream = csvBytes.AsStream();
             var putObjectArgs = new PutObjectArgs()
                 .WithBucket(bucketName)
                 .WithObject(newObjectName)

Minio.Functional.Tests/FunctionalTest.cs

@@ -714,7 +714,7 @@ internal static async Task PutGetStatEncryptedObject_Test1(MinioClient minio)
                     .WithServerSideEncryption(ssec)
                     .WithCallbackStream(async (stream, cancellationToken) =>
                     {
-                        var fileStream = File.Create(tempFileName);
+                        using var fileStream = File.Create(tempFileName);
 
 #if NETFRAMEWORK
                         await stream.CopyToAsync(fileStream).ConfigureAwait(false);
@@ -805,7 +805,7 @@ internal static async Task PutGetStatEncryptedObject_Test2(MinioClient minio)
                     .WithServerSideEncryption(ssec)
                     .WithCallbackStream(async (stream, cancellationToken) =>
                     {
-                        var fileStream = File.Create(tempFileName);
+                        using var fileStream = File.Create(tempFileName);
 
 #if NETFRAMEWORK
                         await stream.CopyToAsync(fileStream).ConfigureAwait(false);
@@ -893,7 +893,7 @@ internal static async Task PutGetStatEncryptedObject_Test3(MinioClient minio)
                     .WithObject(objectName)
                     .WithCallbackStream(async (stream, cancellationToken) =>
                     {
-                        var fileStream = File.Create(tempFileName);
+                        using var fileStream = File.Create(tempFileName);
 #if NETFRAMEWORK
                         await stream.CopyToAsync(fileStream).ConfigureAwait(false);
                         fileStream.Dispose();
@@ -1478,7 +1478,7 @@ internal static async Task SelectObjectContent_Test(MinioClient minio)
             csvString.AppendLine("Employee5,Employee1,500");
             csvString.AppendLine("Employee2,Employee1,800");
             ReadOnlyMemory<byte> csvBytes = Encoding.UTF8.GetBytes(csvString.ToString());
-            var stream = csvBytes.AsStream();
+            using var stream = csvBytes.AsStream();
 
             var putObjectArgs = new PutObjectArgs()
                 .WithBucket(bucketName)
@@ -2846,7 +2846,7 @@ void Notify(MinioNotificationRaw data)
             await Task.Delay(sleepTime).ConfigureAwait(false);
 
             var modelJson = "{\"test\": \"test\"}";
-            var stream = Encoding.UTF8.GetBytes(modelJson).AsMemory().AsStream();
+            using var stream = Encoding.UTF8.GetBytes(modelJson).AsMemory().AsStream();
             var putObjectArgs = new PutObjectArgs()
                 .WithObject("test.json")
                 .WithBucket(bucketName)
@@ -2928,7 +2928,7 @@ internal static async Task ListenBucketNotificationsAsync_Test3(MinioClient mini
 
             var modelJson = "{\"test\": \"test\"}";
 
-            var stream = Encoding.UTF8.GetBytes(modelJson).AsMemory().AsStream();
+            using var stream = Encoding.UTF8.GetBytes(modelJson).AsMemory().AsStream();
             var putObjectArgs = new PutObjectArgs()
                 .WithObject("test.json")
                 .WithBucket(bucketName)

Minio.Tests/NotificationTest.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using System.Xml.Serialization;
 using CommunityToolkit.HighPerformance;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Minio.DataModel;
@@ -12,17 +11,21 @@ namespace Minio.Tests;
 [TestClass]
 public class NotificationTest
 {
-    [TestMethod]
-    public void TestNotificationStringHydration()
+    [DataTestMethod]
+    [DataRow(true)]
+    [DataRow(false)]
+    public void TestNotificationStringHydration(bool contentContainsNamespace)
     {
         var notificationString =
-            "<NotificationConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><TopicConfiguration><Id>YjVkM2Y0YmUtNGI3NC00ZjQyLWEwNGItNDIyYWUxY2I0N2M4 </Id><Arn>arnstring</Arn><Topic> arn:aws:sns:us-east-1:account-id:s3notificationtopic2 </Topic><Event> s3:ReducedRedundancyLostObject </Event><Event> s3:ObjectCreated: *</Event></TopicConfiguration></NotificationConfiguration>";
+            "<NotificationConfiguration" +
+            (contentContainsNamespace ? " xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"" : string.Empty) +
+            "><TopicConfiguration><Id>YjVkM2Y0YmUtNGI3NC00ZjQyLWEwNGItNDIyYWUxY2I0N2M4 </Id><Arn>arnstring</Arn><Topic> arn:aws:sns:us-east-1:account-id:s3notificationtopic2 </Topic><Event> s3:ReducedRedundancyLostObject </Event><Event> s3:ObjectCreated: *</Event></TopicConfiguration></NotificationConfiguration>";
 
         try
         {
             ReadOnlyMemory<byte> contentBytes = Encoding.UTF8.GetBytes(notificationString);
-            var notification =
-                (BucketNotification)new XmlSerializer(typeof(BucketNotification)).Deserialize(contentBytes.AsStream());
+            using var stream = contentBytes.AsStream();
+            var notification = Utils.DeserializeXml<BucketNotification>(stream);
             Assert.AreEqual(1, notification.TopicConfigs.Count);
         }
         catch (Exception ex)

Minio.Tests/OperationsTest.cs

@@ -62,7 +62,7 @@ public async Task PresignedGetObject()
         if (!await ObjectExistsAsync(client, bucket, objectName).ConfigureAwait(false))
         {
             var helloData = Encoding.UTF8.GetBytes("hello world");
-            var helloStream = helloData.AsMemory().AsStream();
+            using var helloStream = helloData.AsMemory().AsStream();
             var PutObjectArgs = new PutObjectArgs()
                 .WithBucket(bucket)
                 .WithObject(objectName)
@@ -114,7 +114,7 @@ public async Task PresignedGetObjectWithHeaders()
         if (!await ObjectExistsAsync(client, bucket, objectName).ConfigureAwait(false))
         {
             var helloData = Encoding.UTF8.GetBytes("hello world");
-            var helloStream = helloData.AsMemory().AsStream();
+            using var helloStream = helloData.AsMemory().AsStream();
             var PutObjectArgs = new PutObjectArgs()
                 .WithBucket(bucket)
                 .WithObject(objectName)

Minio/ApiEndpoints/BucketOperations.cs

@@ -17,7 +17,6 @@
 
 using System.Net;
 using System.Reactive.Linq;
-using System.Xml.Serialization;
 using CommunityToolkit.HighPerformance;
 using Minio.DataModel;
 using Minio.DataModel.ILM;
@@ -190,9 +189,10 @@ await ExecuteTaskAsync(NoErrorHandlers, requestMessageBuilder, cancellationToken
 
         var bucketList = new ListAllMyBucketsResult();
         if (HttpStatusCode.OK.Equals(response.StatusCode))
-            bucketList =
-                new XmlSerializer(typeof(ListAllMyBucketsResult)).Deserialize(response.ContentBytes.AsStream()) as
-                    ListAllMyBucketsResult;
+        {
+            using var stream = response.ContentBytes.AsStream();
+            bucketList = Utils.DeserializeXml<ListAllMyBucketsResult>(stream);
+        }
 
         return bucketList;
     }

Minio/ApiEndpoints/ObjectOperations.cs

@@ -19,7 +19,6 @@
 using System.Reactive.Linq;
 using System.Text;
 using System.Xml.Linq;
-using System.Xml.Serialization;
 using CommunityToolkit.HighPerformance;
 using Minio.DataModel;
 using Minio.DataModel.ObjectLock;
@@ -1476,19 +1475,19 @@ private async Task<Tuple<ListPartsResult, List<Part>>> GetListPartsAsync(string
             await ExecuteTaskAsync(NoErrorHandlers, requestMessageBuilder, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-        var listPartsResult =
-            (ListPartsResult)new XmlSerializer(typeof(ListPartsResult)).Deserialize(Encoding.UTF8
-                .GetBytes(response.Content).AsMemory().AsStream());
+        using var stream = Encoding.UTF8.GetBytes(response.Content).AsMemory().AsStream();
+        var listPartsResult = Utils.DeserializeXml<ListPartsResult>(stream);
 
         var root = XDocument.Parse(response.Content);
+        XNamespace ns = Utils.DetermineNamespace(root);
 
-        var uploads = from c in root.Root.Descendants("{http://s3.amazonaws.com/doc/2006-03-01/}Part")
+        var uploads = from c in root.Root.Descendants(ns + "Part")
             select new Part
             {
-                PartNumber = int.Parse(c.Element("{http://s3.amazonaws.com/doc/2006-03-01/}PartNumber").Value,
+                PartNumber = int.Parse(c.Element(ns + "PartNumber").Value,
                     CultureInfo.CurrentCulture),
-                ETag = c.Element("{http://s3.amazonaws.com/doc/2006-03-01/}ETag").Value.Replace("\"", string.Empty),
-                Size = long.Parse(c.Element("{http://s3.amazonaws.com/doc/2006-03-01/}Size").Value,
+                ETag = c.Element(ns + "ETag").Value.Replace("\"", string.Empty),
+                Size = long.Parse(c.Element(ns + "Size").Value,
                     CultureInfo.CurrentCulture)
             };
 
@@ -1517,9 +1516,8 @@ private async Task<string> NewMultipartUploadAsync(string bucketName, string obj
         using var response = await ExecuteTaskAsync(NoErrorHandlers,
             requestMessageBuilder, cancellationToken: cancellationToken).ConfigureAwait(false);
 
-        var newUpload = (InitiateMultipartUploadResult)new XmlSerializer(typeof(InitiateMultipartUploadResult))
-            .Deserialize(response.ContentBytes.AsStream());
-
+        using var stream = response.ContentBytes.AsStream();
+        var newUpload = Utils.DeserializeXml<InitiateMultipartUploadResult>(stream);
         return newUpload.UploadId;
     }
 
@@ -1670,13 +1668,16 @@ await ExecuteTaskAsync(NoErrorHandlers, requestMessageBuilder, cancellationToken
         object copyResult = null;
 
         if (type == typeof(CopyObjectResult))
-            copyResult =
-                (CopyObjectResult)new XmlSerializer(typeof(CopyObjectResult)).Deserialize(
-                    response.ContentBytes.AsStream());
+        {
+            using var stream = response.ContentBytes.AsStream();
+            copyResult = Utils.DeserializeXml<CopyObjectResult>(stream);
+        }
 
         if (type == typeof(CopyPartResult))
-            copyResult =
-                (CopyPartResult)new XmlSerializer(typeof(CopyPartResult)).Deserialize(response.ContentBytes.AsStream());
+        {
+            using var stream = response.ContentBytes.AsStream();
+            copyResult = Utils.DeserializeXml<CopyPartResult>(stream);
+        }
 
         return copyResult;
     }

Minio/Credentials/AssumeRoleBaseProvider.cs

@@ -17,7 +17,6 @@
 
 using System.Net;
 using System.Text;
-using System.Xml.Serialization;
 using CommunityToolkit.HighPerformance;
 using Minio.DataModel;
 
@@ -132,10 +131,12 @@ public override async Task<AccessCredentials> GetCredentialsAsync()
 
     internal virtual AccessCredentials ParseResponse(HttpResponseMessage response)
     {
-        if (string.IsNullOrEmpty(Convert.ToString(response.Content)) || !HttpStatusCode.OK.Equals(response.StatusCode))
-            throw new ArgumentNullException("Unable to generate credentials. Response error.");
-        return (AccessCredentials)new XmlSerializer(typeof(AccessCredentials)).Deserialize(Encoding.UTF8
-            .GetBytes(Convert.ToString(response.Content)).AsMemory().AsStream());
+        var content = Convert.ToString(response.Content);
+        if (string.IsNullOrEmpty(content) || !HttpStatusCode.OK.Equals(response.StatusCode))
+            throw new ArgumentNullException(nameof(response), "Unable to generate credentials. Response error.");
+
+        using var stream = Encoding.UTF8.GetBytes(content).AsMemory().AsStream();
+        return Utils.DeserializeXml<AccessCredentials>(stream);
     }
 
     public override AccessCredentials GetCredentials()

Minio/Credentials/AssumeRoleProvider.cs

@@ -109,9 +109,10 @@ public override async Task<AccessCredentials> GetCredentialsAsync()
 
                 AssumeRoleResponse assumeRoleResp = null;
                 if (responseResult.Response.IsSuccessStatusCode)
-                    assumeRoleResp =
-                        (AssumeRoleResponse)new XmlSerializer(typeof(AssumeRoleResponse)).Deserialize(
-                            Encoding.UTF8.GetBytes(responseResult.Content).AsMemory().AsStream());
+                {
+                    using var stream = Encoding.UTF8.GetBytes(responseResult.Content).AsMemory().AsStream();
+                    assumeRoleResp = Utils.DeserializeXml<AssumeRoleResponse>(stream);
+                }
 
                 if (credentials == null &&
                     assumeRoleResp?.arr != null)

Minio/Credentials/CertificateIdentityProvider.cs

@@ -131,9 +131,9 @@ public override async Task<AccessCredentials> GetCredentialsAsync()
         if (response.IsSuccessStatusCode)
         {
             var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            using var stream = Encoding.UTF8.GetBytes(content).AsMemory().AsStream();
             certResponse =
-                (CertificateResponse)new XmlSerializer(typeof(CertificateResponse))
-                    .Deserialize(Encoding.UTF8.GetBytes(content).AsMemory().AsStream());
+                Utils.DeserializeXml<CertificateResponse>(stream);
         }
 
         if (Credentials == null && certResponse?.Cr != null)

Minio/Credentials/WebIdentityClientGrantsProvider.cs

@@ -17,7 +17,6 @@
 
 using System.Net;
 using System.Text;
-using System.Xml.Serialization;
 using CommunityToolkit.HighPerformance;
 using Minio.DataModel;
 
@@ -62,12 +61,13 @@ internal override AccessCredentials ParseResponse(HttpResponseMessage response)
         // Stream receiveStream = response.Content.ReadAsStreamAsync();
         // StreamReader readStream = new StreamReader (receiveStream, Encoding.UTF8);
         // txtBlock.Text = readStream.ReadToEnd();
-        if (string.IsNullOrWhiteSpace(Convert.ToString(response.Content)) ||
+        var content = Convert.ToString(response.Content);
+        if (string.IsNullOrWhiteSpace(content) ||
             !HttpStatusCode.OK.Equals(response.StatusCode))
-            throw new ArgumentNullException("Unable to get credentials. Response error.");
+            throw new ArgumentNullException(nameof(response), "Unable to get credentials. Response error.");
 
-        return (AccessCredentials)new XmlSerializer(typeof(AccessCredentials)).Deserialize(Encoding.UTF8
-            .GetBytes(Convert.ToString(response.Content)).AsMemory().AsStream());
+        using var stream = Encoding.UTF8.GetBytes(content).AsMemory().AsStream();
+        return Utils.DeserializeXml<AccessCredentials>(stream);
     }
 
     protected void Validate()

Minio/Credentials/WebIdentityProvider.cs

@@ -73,7 +73,7 @@ internal override AccessCredentials ParseResponse(HttpResponseMessage response)
     {
         Validate();
         var credentials = base.ParseResponse(response);
-        return (AccessCredentials)new XmlSerializer(typeof(AccessCredentials)).Deserialize(Encoding.UTF8
-            .GetBytes(Convert.ToString(response.Content)).AsMemory().AsStream());
+        using var stream = Encoding.UTF8.GetBytes(Convert.ToString(response.Content)).AsMemory().AsStream();
+        return Utils.DeserializeXml<AccessCredentials>(stream);
     }
 }