Add HttpClient extension for custom User-Agent header

Introduced HttpClientExtension class with AddMajorsilenceReportingUserAgent method to set a custom User-Agent header. Updated various methods to use this extension, ensuring consistent User-Agent headers across HTTP requests. Added necessary using directives for RdlEngine.Utility namespace.
majorsilence · Jan 12, 2025 · 3c0a5b6 · 3c0a5b6
1 parent 96be402
commit 3c0a5b6
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 0 deletions.
diff --git a/DataProviders/HttpClientExtension.cs b/DataProviders/HttpClientExtension.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace fyiReporting.Data
+{
+    internal static class HttpClientExtension
+    {
+        public static void AddMajorsilenceReportingUserAgent(this HttpClient client)
+        {
+            if (client.DefaultRequestHeaders.UserAgent.Count == 0)
+            {
+                client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3 MajorsilenceReporting/1.0");
+            }
+        }
+    }
+}
diff --git a/DataProviders/MultipleStreamReader.cs b/DataProviders/MultipleStreamReader.cs
@@ -132,6 +132,7 @@ async Task<StreamReader> GetStream()
                 fname.StartsWith("file:") ||
                 fname.StartsWith("https:"))
             {
+                _httpClient.AddMajorsilenceReportingUserAgent();
                 HttpResponseMessage response = await _httpClient.GetAsync(fname);
                 response.EnsureSuccessStatusCode();
                 strm = await response.Content.ReadAsStreamAsync();

diff --git a/DataProviders/TxtDataReader.cs b/DataProviders/TxtDataReader.cs
@@ -194,6 +194,7 @@ async Task<StreamReader> GetStream()
             {
                 using (HttpClient client = new HttpClient())
                 {
+                    client.AddMajorsilenceReportingUserAgent();
                     HttpResponseMessage response = await client.GetAsync(fname);
                     response.EnsureSuccessStatusCode();
                     strm = await response.Content.ReadAsStreamAsync();

diff --git a/DataProviders/WebServiceWsdl.cs b/DataProviders/WebServiceWsdl.cs
@@ -192,6 +192,7 @@ async Task<Stream> GetStream()
             {
                 using (HttpClient client = new HttpClient())
                 {
+                    client.AddMajorsilenceReportingUserAgent();
                     HttpResponseMessage response = await client.GetAsync(fname);
                     if (response.IsSuccessStatusCode)
                     {

diff --git a/RdlEngine/Definition/Image.cs b/RdlEngine/Definition/Image.cs
@@ -37,6 +37,7 @@ the website www.fyiReporting.com.
 using System.Net;
 using System.Threading.Tasks;
 using System.Net.Http;
+using RdlEngine.Utility;
 
 
 namespace fyiReporting.RDL
@@ -318,6 +319,7 @@ override internal async Task RunPage(Pages pgs, Row row)
                         {
                             using (HttpClient client = new HttpClient())
                             {
+                                client.AddMajorsilenceReportingUserAgent();
                                 HttpResponseMessage response = await client.GetAsync(fname);
                                 response.EnsureSuccessStatusCode();
                                 strm = await response.Content.ReadAsStreamAsync();

diff --git a/RdlEngine/Definition/StyleBackgroundImage.cs b/RdlEngine/Definition/StyleBackgroundImage.cs
@@ -36,6 +36,7 @@ the website www.fyiReporting.com.
 using System.Net;
 using System.Threading.Tasks;
 using System.Net.Http;
+using RdlEngine.Utility;
 
 
 namespace fyiReporting.RDL
@@ -275,6 +276,7 @@ internal async Task<PageImage> GetPageImage(Report rpt, Row row)
                         {
                             using (HttpClient client = new HttpClient())
                             {
+                                client.AddMajorsilenceReportingUserAgent();
                                 HttpResponseMessage response = await client.GetAsync(fname);
                                 if (response.IsSuccessStatusCode)
                                 {

diff --git a/RdlEngine/Render/MhtConverter/MhtWebClientLocal.cs b/RdlEngine/Render/MhtConverter/MhtWebClientLocal.cs
@@ -24,6 +24,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 
+using RdlEngine.Utility;
 using System;
 using System.IO;
 using System.Net;
@@ -219,6 +220,7 @@ public async Task GetUrlData(string url)
 
             using (HttpClient client = new HttpClient())
             {
+                client.AddMajorsilenceReportingUserAgent();
                 HttpResponseMessage response = await client.GetAsync(url);
                 if (!response.IsSuccessStatusCode)
                 {

diff --git a/RdlEngine/Runtime/PageTextHtml.cs b/RdlEngine/Runtime/PageTextHtml.cs
@@ -37,6 +37,7 @@ the website www.fyiReporting.com.
 using RdlEngine.Resources;
 using System.Net.Http;
 using System.Threading.Tasks;
+using RdlEngine.Utility;
 
 namespace fyiReporting.RDL
 {
@@ -461,6 +462,7 @@ private async Task<PageImage> BuildImage(Drawing.Graphics g, string token, Style
                 {
                     using (HttpClient client = new HttpClient())
                     {
+						client.AddMajorsilenceReportingUserAgent();
                         strm = await client.GetStreamAsync(src);
                     }
                 }

diff --git a/RdlEngine/Utility/HttpClientExtension.cs b/RdlEngine/Utility/HttpClientExtension.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RdlEngine.Utility
+{
+    internal static class HttpClientExtension
+    {
+        public static void AddMajorsilenceReportingUserAgent(this HttpClient client)
+        {
+            if (client.DefaultRequestHeaders.UserAgent.Count == 0)
+            {
+                client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3 MajorsilenceReporting/1.0");
+            }
+        }
+    }
+}