Remove suppression and Fix trim warnings (#7488)

Author: Nigusu-Allehu

src/NuGet.Core/NuGet.Credentials/PluginCredentialProvider.cs

@@ -5,16 +5,13 @@
 
 using System;
 using System.Diagnostics;
-#if NET5_0_OR_GREATER
-using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
+using System.Text.Json;
 using NuGet.Common;
 using NuGet.Configuration;
 
@@ -173,10 +170,6 @@ public Task<CredentialResponse> GetAsync(
         /// </summary>
         public int TimeoutSeconds { get; }
 
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AOT", "IL2026", Justification = "Legacy command-line credential provider infrastructure; Newtonsoft.Json deserializes the concrete PluginCredentialResponse type, which is preserved here.")]
-        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Legacy command-line credential provider infrastructure; Newtonsoft.Json deserializes the concrete PluginCredentialResponse type, which is preserved here.")]
-#endif
         private PluginCredentialResponse GetPluginResponse(PluginCredentialRequest request,
             CancellationToken cancellationToken)
         {
@@ -216,8 +209,10 @@ private PluginCredentialResponse GetPluginResponse(PluginCredentialRequest reque
             try
             {
                 // Mono will add utf-16 byte order mark to the start of stdOut, remove it here.
-                credentialResponse =
-                    JsonConvert.DeserializeObject<PluginCredentialResponse>(stdOut.Trim(new char[] { '\uFEFF' }))
+                var trimmedOutput = stdOut.Trim(new char[] { '\uFEFF' });
+                credentialResponse = string.IsNullOrWhiteSpace(trimmedOutput)
+                    ? new PluginCredentialResponse()
+                    : JsonSerializer.Deserialize(trimmedOutput, PluginCredentialResponseJsonContext.Default.PluginCredentialResponse)
                     ?? new PluginCredentialResponse();
             }
             catch (Exception)

src/NuGet.Core/NuGet.Credentials/PluginCredentialResponseJsonContext.cs

@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Text.Json.Serialization;
+
+namespace NuGet.Credentials
+{
+    [JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+    [JsonSerializable(typeof(PluginCredentialResponse))]
+    internal partial class PluginCredentialResponseJsonContext : JsonSerializerContext
+    {
+    }
+}

test/NuGet.Core.Tests/NuGet.Credentials.Test/PluginCredentialResponseDeserializationTests.cs

@@ -0,0 +1,85 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Newtonsoft.Json;
+using Xunit;
+
+namespace NuGet.Credentials.Test
+{
+    public class PluginCredentialResponseDeserializationTests
+    {
+        private static PluginCredentialResponse? DeserializeWithStj(string json)
+        {
+            return System.Text.Json.JsonSerializer.Deserialize(json, PluginCredentialResponseJsonContext.Default.PluginCredentialResponse);
+        }
+
+        private static PluginCredentialResponse? DeserializeWithNsj(string json)
+        {
+            return JsonConvert.DeserializeObject<PluginCredentialResponse>(json);
+        }
+
+        private static void AssertResponsesEqual(PluginCredentialResponse? nsj, PluginCredentialResponse? stj)
+        {
+            Assert.Equal(nsj?.Username, stj?.Username);
+            Assert.Equal(nsj?.Password, stj?.Password);
+            Assert.Equal(nsj?.Message, stj?.Message);
+            Assert.Equal(nsj?.AuthTypes, stj?.AuthTypes);
+            Assert.Equal(nsj?.IsValid, stj?.IsValid);
+        }
+
+        [Theory]
+        [InlineData(@"{""Username"":""user"",""Password"":""pass"",""Message"":""msg"",""AuthTypes"":[""basic"",""digest""]}")]
+        [InlineData(@"{""username"":""u"",""password"":""p"",""message"":""m"",""authTypes"":[""basic""]}")]
+        [InlineData(@"{""USERNAME"":""u"",""PassWord"":""p""}")]
+        [InlineData(@"{""Username"":""u""}")]
+        [InlineData(@"{}")]
+        [InlineData(@"{""Username"":null,""Password"":null,""AuthTypes"":null}")]
+        [InlineData(@"{""Username"":""u"",""Password"":""p"",""AuthTypes"":[]}")]
+        [InlineData(@"{""Username"":""u"",""Password"":""p"",""ExtraProp"":""val"",""Another"":123}")]
+        [InlineData(@"{""Username"":"""",""Password"":"""",""Message"":""""}")]
+        [InlineData(@"{""Username"":"" user "",""Password"":"" pass ""}")]
+        [InlineData(@"{""Username"":""\u0041\u0042"",""Password"":""\u00e9""}")]
+        [InlineData(@"{""Username"":""user"",""Password"":""p@$$w0rd!#%&*""}")]
+        [InlineData(@"{""Username"":""u"",""Password"":""p"",""Message"":""""}")]
+        [InlineData(@"   {""Username"":""u"",""Password"":""p""}   ")]
+        [InlineData(@"{""Message"":""Extra message.""}")]
+        [InlineData(@"{""username"":""u"", ""password"":""p"", ""Message"":""""}")]
+        [InlineData(@"{""Username"":""u"",""Password"":""p"",""AuthTypes"":[""basic"",""digest"",""negotiate"",""ntlm""]}")]
+        public void StjAndNsjProduceSameResult(string json)
+        {
+            PluginCredentialResponse? nsjResult = DeserializeWithNsj(json);
+            PluginCredentialResponse? stjResult = DeserializeWithStj(json);
+
+            AssertResponsesEqual(nsjResult, stjResult);
+        }
+
+        [Theory]
+        [InlineData("null")]
+        public void StjAndNsjBothReturnNull(string json)
+        {
+            PluginCredentialResponse? nsjResult = DeserializeWithNsj(json);
+            PluginCredentialResponse? stjResult = DeserializeWithStj(json);
+
+            Assert.Null(nsjResult);
+            Assert.Null(stjResult);
+        }
+
+        [Theory]
+        [InlineData("not json")]
+        [InlineData("{invalid}")]
+        public void StjAndNsjBothThrowOnInvalidJson(string json)
+        {
+            Assert.ThrowsAny<JsonReaderException>(() => DeserializeWithNsj(json));
+            Assert.ThrowsAny<System.Text.Json.JsonException>(() => DeserializeWithStj(json));
+        }
+
+        [Fact]
+        public void StjAndNsjBothThrowOnJsonArrayInput()
+        {
+            var json = "[1,2,3]";
+
+            Assert.ThrowsAny<JsonSerializationException>(() => DeserializeWithNsj(json));
+            Assert.ThrowsAny<System.Text.Json.JsonException>(() => DeserializeWithStj(json));
+        }
+    }
+}