Merge pull request #30 from FrendsPlatform/issue-29

HTTP.RequestBytes - Added ExcludeFromCodeCoverage to Extensions.cs
FrendsPlatform · Jan 19, 2024 · aa7ed7b · aa7ed7b
2 parents 563c29d + 1463b55
commit aa7ed7b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/Frends.HTTP.RequestBytes/CHANGELOG.md b/Frends.HTTP.RequestBytes/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.0.1] - 2024-01-17
+### Fixed
+- Fixed issues which CodeQL found in the codebase.
+ Fixed Code Coverage
+
 ## [1.0.0] - 2023-01-27
 ### Added
 - Initial implementation of Frends.HTTP.Request.
diff --git a/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes.Tests/UnitTests.cs b/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes.Tests/UnitTests.cs
@@ -94,7 +94,7 @@ public async Task HttpRequestBytesReturnShoulReturnEmpty()
         _mockHttpMessageHandler.When(input.Url)
             .Respond("application/octet-stream", String.Empty);
 
-        var result = (dynamic) await HTTP.RequestBytes(input, options, CancellationToken.None);
+        var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
         Assert.AreEqual(0, result.BodySizeInMegaBytes);
         Assert.IsEmpty(result.Body);
     }
@@ -109,8 +109,10 @@ public async Task HttpRequestBytesShouldBeAbleToReturnBinary()
         var options = new Options { ConnectionTimeoutSeconds = 60 };
 
         var actualFileBytes = File.ReadAllBytes(localTestFilePath);
+
+        using var ms = new MemoryStream(actualFileBytes);
         _mockHttpMessageHandler.When(input.Url)
-            .Respond("image/png", new MemoryStream(actualFileBytes));
+            .Respond("image/png", ms);
 
         var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
 
@@ -200,8 +202,8 @@ public async Task RequestShouldAddBasicAuthHeaders()
             ConnectionTimeoutSeconds = 60,
             ThrowExceptionOnErrorResponse = true,
             Authentication = Authentication.Basic,
-            Username = "Foo",
-            Password = "Bar"
+            Username = Guid.NewGuid().ToString(),
+            Password = Guid.NewGuid().ToString()
         };
         var sentAuthValue =
             "Basic " + Convert.ToBase64String(Encoding.ASCII.GetBytes($"{options.Username}:{options.Password}"));
@@ -236,7 +238,7 @@ public async Task RequestShouldAddOAuthBearerHeader()
 
         _mockHttpMessageHandler.Expect($"{_basePath}/endpoint").WithHeaders("Authorization", "Bearer fooToken")
             .Respond("application/octet-stream", "FooBar");
-        var result = (dynamic) await HTTP.RequestBytes(input, options, CancellationToken.None);
+        var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
 
         _mockHttpMessageHandler.VerifyNoOutstandingExpectation();
         Assert.AreEqual(expectedReturn, result.Body);
@@ -263,7 +265,7 @@ public async Task AuthorizationHeaderShouldOverrideOption()
 
         _mockHttpMessageHandler.Expect($"{_basePath}/endpoint").WithHeaders("Authorization", "Basic fooToken")
             .Respond("application/octet-stream", "FooBar");
-        var result = (dynamic) await HTTP.RequestBytes(input, options, CancellationToken.None);
+        var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
 
         _mockHttpMessageHandler.VerifyNoOutstandingExpectation();
         Assert.AreEqual(expectedReturn, result.Body);
@@ -286,7 +288,7 @@ public async Task PatchShouldComeThrough()
         _mockHttpMessageHandler.Expect(new HttpMethod("PATCH"), input.Url).WithContent(message)
             .Respond("application/octet-stream", message);
 
-        var result = (dynamic) await HTTP.RequestBytes(input, options, CancellationToken.None);
+        var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
 
         _mockHttpMessageHandler.VerifyNoOutstandingExpectation();
         Assert.AreEqual(message, Encoding.UTF8.GetString(result.Body));
@@ -312,7 +314,7 @@ public async Task RequestShouldSetEncodingWithContentTypeCharsetIgnoringCase()
         _mockHttpMessageHandler.Expect(HttpMethod.Post, input.Url).WithHeaders("cONTENT-tYpE", expectedContentType).WithContent(requestMessage)
             .Respond("application/octet-stream", "foo åäö");
 
-        var result = (dynamic) await HTTP.RequestBytes(input, options, CancellationToken.None);
+        var result = (dynamic)await HTTP.RequestBytes(input, options, CancellationToken.None);
 
         _mockHttpMessageHandler.VerifyNoOutstandingExpectation();
         Assert.AreEqual("foo åäö", Encoding.UTF8.GetString(result.Body));

diff --git a/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/Extensions.cs b/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/Extensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -9,6 +10,7 @@
 
 namespace Frends.HTTP.RequestBytes;
 
+[ExcludeFromCodeCoverage]
 internal static class Extensions
 {
     internal static void SetHandlerSettingsBasedOnOptions(this HttpClientHandler handler, Options options)
@@ -124,7 +126,7 @@ private static X509Certificate2[] GetCertificatesFromStore(string thumbprint,
                 return new[] { certificate };
             }
 
-            var chain = new X509Chain();
+            using var chain = new X509Chain();
             chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
             chain.Build(certificate);
 

diff --git a/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes.csproj b/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <Authors>Frends</Authors>
 	<Copyright>Frends</Copyright>
 	<Company>Frends</Company>

diff --git a/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/RequestBytes.cs b/Frends.HTTP.RequestBytes/Frends.HTTP.RequestBytes/RequestBytes.cs
@@ -107,17 +107,14 @@ private static IDictionary<string, string> GetHeaderDictionary(Header[] headers,
 
     private static HttpContent GetContent(Input input, IDictionary<string, string> headers)
     {
-        //Check if Content-Type exists and is set and valid
-        var contentTypeIsSetAndValid = false;
-        MediaTypeWithQualityHeaderValue validContentType = null;
         if (headers.TryGetValue("content-type", out string contentTypeValue))
         {
-            contentTypeIsSetAndValid = MediaTypeWithQualityHeaderValue.TryParse(contentTypeValue, out validContentType);
+            var contentTypeIsSetAndValid = MediaTypeWithQualityHeaderValue.TryParse(contentTypeValue, out var validContentType);
+            if (contentTypeIsSetAndValid)
+                return new StringContent(input.Message ?? string.Empty, Encoding.GetEncoding(validContentType.CharSet ?? Encoding.UTF8.WebName));
         }
 
-        return contentTypeIsSetAndValid
-            ? new StringContent(input.Message ?? "", Encoding.GetEncoding(validContentType.CharSet ?? Encoding.UTF8.WebName))
-            : new StringContent(input.Message ?? "");
+        return new StringContent(input.Message ?? string.Empty);
     }
 
     private static HttpClient GetHttpClientForOptions(Options options)