Merge pull request #96 from PerimeterX/release/v3.2.1

Release/v3.2.1 to master
PerimeterX · Jul 17, 2023 · 6c48651 · 6c48651
2 parents 0a95486 + 31deab1
commit 6c48651
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## [3.2.1] - 2023-08-17
+### Fixed
+- Fixed advanced blocking response feature
+
+
 ## [3.2.0] - 2023-01-03
 ### Added
 - Support for credentials intelligence protocols `v2` and `multistep_sso`

diff --git a/PerimeterXModule/Internals/CredentialsIntelligence/CredentialIntelligenceManager.cs b/PerimeterXModule/Internals/CredentialsIntelligence/CredentialIntelligenceManager.cs
@@ -100,7 +100,7 @@ private ExtractedCredentials HandleExtractCredentials(ExtractorObject extraction
                 return null;
             }
 
-            Dictionary<string, string> headers = pxContext.GetLowercaseHeadersAsDictionary();
+            Dictionary<string, string> headers = pxContext.lowercaseHttpHeaders;
 
             if (extractionDetails.SentThrough == "header")
             {

diff --git a/PerimeterXModule/Internals/PxBlock.cs b/PerimeterXModule/Internals/PxBlock.cs
@@ -24,9 +24,17 @@ public PxBlock(PxModuleConfigurationSection config)
 
 		public bool IsJsonResponse(PxContext pxContext)
 		{
-			Dictionary<string, string> headers = pxContext.GetHeadersAsDictionary();
-			string jsonHeader;
-			bool jsonHeaderExists = headers.TryGetValue("accept", out jsonHeader) || headers.TryGetValue("content-type", out jsonHeader);
+			Dictionary<string, string> headers = pxContext.lowercaseHttpHeaders;
+			string acceptHeader;
+			string contentTypeHeader;
+			bool jsonHeaderExistsInAccept = headers.TryGetValue("accept", out acceptHeader);
+			bool jsonHeaderExistsInContentType = headers.TryGetValue("content-type", out contentTypeHeader);
+			return DoesJsonExists(acceptHeader, jsonHeaderExistsInAccept) || DoesJsonExists(contentTypeHeader, jsonHeaderExistsInContentType);
+
+        }
+
+		private static bool DoesJsonExists(string jsonHeader, bool jsonHeaderExists)
+		{
 			if (jsonHeaderExists)
 			{
 				string[] values = jsonHeader.Split(',');

diff --git a/PerimeterXModule/Internals/PxContext.cs b/PerimeterXModule/Internals/PxContext.cs
@@ -53,6 +53,7 @@ public class PxContext
         public bool MonitorRequest { get; set; }
 		public LoginCredentialsFields LoginCredentialsFields { get; set; }
 		public string RequestId { get; set; }
+		public Dictionary<string,string> lowercaseHttpHeaders;
 
         public PxContext(HttpContext context, PxModuleConfigurationSection pxConfiguration)
 		{
@@ -194,6 +195,7 @@ public PxContext(HttpContext context, PxModuleConfigurationSection pxConfigurati
 			RedirectOnCustomUrl = pxConfiguration.RedirectOnCustomUrl;
 
             MonitorRequest = shouldMonitorRequest(context, pxConfiguration);
+            lowercaseHttpHeaders = GetLowercaseHeadersAsDictionary();
 		}
 
         private bool shouldMonitorRequest(HttpContext context, PxModuleConfigurationSection pxConfiguration)
@@ -275,18 +277,6 @@ public string GetPxCookie()
 			return PxCookies.ContainsKey(PxConstants.COOKIE_V3_PREFIX) ? PxCookies[PxConstants.COOKIE_V3_PREFIX] : PxCookies[PxConstants.COOKIE_V1_PREFIX];
 		}
 
-		public Dictionary<string, string> GetHeadersAsDictionary()
-		{
-			Dictionary<string, string> headersDictionary = new Dictionary<string, string>();
-
-			if (Headers != null && Headers.Count() > 0)
-			{
-				headersDictionary = Headers.ToDictionary(header => header.Name, header => header.Value);
-			}
-
-			return headersDictionary;
-		}
-
         public Dictionary<string, string> GetLowercaseHeadersAsDictionary()
         {
             Dictionary<string, string> headersDictionary = new Dictionary<string, string>();

diff --git a/PerimeterXModule/Properties/AssemblyInfo.cs b/PerimeterXModule/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0")]
-[assembly: AssemblyFileVersion("3.2.0")]
+[assembly: AssemblyVersion("3.2.1")]
+[assembly: AssemblyFileVersion("3.2.1")]
diff --git a/PerimeterXModule/PxModule.cs b/PerimeterXModule/PxModule.cs
@@ -473,7 +473,7 @@ private void PostActivity(PxContext pxContext, string eventType, ActivityDetails
 				SocketIP = pxContext.Ip,
 				Url = pxContext.FullUrl,
 				Details = details,
-				Headers = pxContext.GetHeadersAsDictionary(),
+				Headers = pxContext.lowercaseHttpHeaders,
 			};
 
 			if (!string.IsNullOrEmpty(pxContext.Vid))

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [PerimeterX](http://www.perimeterx.com) ASP.NET SDK
 ===================================================
 
-> Latest stable version: [v3.2.0](https://www.nuget.org/packages/PerimeterXModule/3.2.0)
+> Latest stable version: [v3.2.1](https://www.nuget.org/packages/PerimeterXModule/3.2.1)
 
 Table of Contents
 -----------------

diff --git a/px_metadata.json b/px_metadata.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.2.0",
+    "version": "3.2.1",
     "supported_features": [
         "additional_activity_handler",
         "advanced_blocking_response",