Rename CreateHttpClient to CreateOrUseCachedHttpClient (#517)

microsoft · Jul 30, 2021 · 575a568 · 575a568
1 parent 06ff25f
commit 575a568
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 deletions.
diff --git a/Src/Plugins/Security/SEC101_001.HttpAuthorizationRequestHeaderValidator.cs b/Src/Plugins/Security/SEC101_001.HttpAuthorizationRequestHeaderValidator.cs
@@ -76,7 +76,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
                 using var requestDummy = new HttpRequestMessage(HttpMethod.Get, uri);
                 requestDummy.Headers.Authorization = new AuthenticationHeaderValue("Basic", ScanIdentityGuid);
 

diff --git a/Src/Plugins/Security/SEC101_004.FacebookAppCredentialsValidator.cs b/Src/Plugins/Security/SEC101_004.FacebookAppCredentialsValidator.cs
@@ -116,7 +116,7 @@ private ValidationState RetrieveAccountInformation(string id, string creatorUid,
 
         private ValidationState RetrieveInformation<T>(string url, string id, ref string message, out T obj)
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateOrUseCachedHttpClient();
             obj = default;
 
             try

diff --git a/Src/Plugins/Security/SEC101_010.SquarePatValidator.cs b/Src/Plugins/Security/SEC101_010.SquarePatValidator.cs
@@ -69,7 +69,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 using var request = new HttpRequestMessage(HttpMethod.Get, uri);
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", pat);

diff --git a/Src/Plugins/Security/SEC101_011.SquareCredentialsValidator.cs b/Src/Plugins/Security/SEC101_011.SquareCredentialsValidator.cs
@@ -75,7 +75,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 var dict = new Dictionary<string, string>()
                 {

diff --git a/Src/Plugins/Security/SEC101_012.SlackWebhookValidator.cs b/Src/Plugins/Security/SEC101_012.SlackWebhookValidator.cs
@@ -69,7 +69,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             string secret = fingerprint.Secret;
             string uri = $"https://hooks.slack.com/services/{id}/{secret}";
 
-            HttpClient client = CreateHttpClient();
+            HttpClient client = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_015.AkamaiCredentialsValidator.cs b/Src/Plugins/Security/SEC101_015.AkamaiCredentialsValidator.cs
@@ -87,7 +87,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
                 using var hmacSignature = new HMACSHA256(Convert.FromBase64String(signingKey));
                 string signature = Convert.ToBase64String(hmacSignature.ComputeHash(Convert.FromBase64String(textToSign)));
 
-                HttpClient httpClient = CreateHttpClient();
+                HttpClient httpClient = CreateOrUseCachedHttpClient();
                 using var request = new HttpRequestMessage(HttpMethod.Get, $"{host}/ccu/v2/queues/default");
                 request.Headers.Authorization = new AuthenticationHeaderValue(
                     $"EG1-HMAC-SHA256",

diff --git a/Src/Plugins/Security/SEC101_016.StripeApiKeyValidator.cs b/Src/Plugins/Security/SEC101_016.StripeApiKeyValidator.cs
@@ -84,7 +84,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             {
                 message = $"The detected secret is a {keyKind} secret.";
 
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 using var request = new HttpRequestMessage(HttpMethod.Get, uri);
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secret);

diff --git a/Src/Plugins/Security/SEC101_017.NpmAuthorTokenValidator.cs b/Src/Plugins/Security/SEC101_017.NpmAuthorTokenValidator.cs
@@ -71,7 +71,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 using var request = new HttpRequestMessage(HttpMethod.Get, uri);
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secret);

diff --git a/Src/Plugins/Security/SEC101_018.TwilioCredentialsValidator.cs b/Src/Plugins/Security/SEC101_018.TwilioCredentialsValidator.cs
@@ -74,7 +74,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             try
             {
                 string credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", id, secret)));
-                HttpClient httpClient = CreateHttpClient();
+                HttpClient httpClient = CreateOrUseCachedHttpClient();
                 using var request = new HttpRequestMessage(HttpMethod.Get, uri);
                 request.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
 

diff --git a/Src/Plugins/Security/SEC101_020.DropboxAccessTokenValidator.cs b/Src/Plugins/Security/SEC101_020.DropboxAccessTokenValidator.cs
@@ -73,7 +73,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             const string uri = "https://api.dropboxapi.com/2/file_requests/count";
 
             string secret = fingerprint.Secret;
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_021.DropboxAppCredentialsValidator.cs b/Src/Plugins/Security/SEC101_021.DropboxAppCredentialsValidator.cs
@@ -77,7 +77,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             string id = fingerprint.Id;
             string secret = fingerprint.Secret;
             string credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", id, secret)));
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_026.MailgunApiCredentialsValidator.cs b/Src/Plugins/Security/SEC101_026.MailgunApiCredentialsValidator.cs
@@ -66,7 +66,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 string credentials = $"api:{secret}";
                 byte[] bytes = Encoding.UTF8.GetBytes(credentials);

diff --git a/Src/Plugins/Security/SEC101_027.MailChimpApiKeyValidator.cs b/Src/Plugins/Security/SEC101_027.MailChimpApiKeyValidator.cs
@@ -69,7 +69,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
                 string[] keys = secret.Split('-');
 
                 using var request = new HttpRequestMessage(HttpMethod.Get, $"https://{keys[1]}.api.mailchimp.com/3.0/?fields=account_name");

diff --git a/Src/Plugins/Security/SEC101_043.NuGetCredentialsValidator.cs b/Src/Plugins/Security/SEC101_043.NuGetCredentialsValidator.cs
@@ -115,7 +115,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             string host = fingerprint.Host;
             string secret = fingerprint.Secret;
 
-            HttpClient client = CreateHttpClient();
+            HttpClient client = CreateOrUseCachedHttpClient();
 
             try
             {
@@ -244,7 +244,7 @@ private static List<(string user, string password)> ExtractCredentials(string cr
                                                               string uri,
                                                               string id)
         {
-            HttpClient httpClient = CreateHttpClient();
+            HttpClient httpClient = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_044.NpmCredentialsValidator.cs b/Src/Plugins/Security/SEC101_044.NpmCredentialsValidator.cs
@@ -105,7 +105,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
             string secret = fingerprint.Secret;
             string uri = $"https://{host}";
 
-            HttpClient client = CreateHttpClient();
+            HttpClient client = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_045.PostmanApiKeyValidator.cs b/Src/Plugins/Security/SEC101_045.PostmanApiKeyValidator.cs
@@ -71,7 +71,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             string secret = fingerprint.Secret;
 
-            HttpClient client = CreateHttpClient();
+            HttpClient client = CreateOrUseCachedHttpClient();
 
             try
             {

diff --git a/Src/Plugins/Security/SEC101_046.DiscordApiCredentialsValidator.cs b/Src/Plugins/Security/SEC101_046.DiscordApiCredentialsValidator.cs
@@ -80,7 +80,7 @@ protected override IEnumerable<ValidationResult> IsValidStaticHelper(Dictionary<
 
             try
             {
-                HttpClient client = CreateHttpClient();
+                HttpClient client = CreateOrUseCachedHttpClient();
 
                 var dict = new Dictionary<string, string>();
                 dict.Add("grant_type", "client_credentials");

diff --git a/Src/Sarif.PatternMatcher.Sdk/ValidatorBase.cs b/Src/Sarif.PatternMatcher.Sdk/ValidatorBase.cs
@@ -325,7 +325,7 @@ internal static void SetHttpClient(HttpClient client)
             httpClient = client;
         }
 
-        protected HttpClient CreateHttpClient()
+        protected HttpClient CreateOrUseCachedHttpClient()
         {
             if (httpClient == null)
             {