Merge pull request #249 from PerimeterX/release/v3.4.2

Release/v3.4.2

Author: AsafAklerPX

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.4.2] - 2022-06-06
+
+### Fixed
+
+- GraphQL - parsed operation name issue
+
 ## [3.4.1] - 2022-05-18
 
 ### Added

README.md

@@ -6,7 +6,7 @@
 [PerimeterX](http://www.perimeterx.com) Shared base for NodeJS enforcers
 =============================================================
 
-> Latest stable version: [v3.4.1](https://www.npmjs.com/package/perimeterx-node-core)
+> Latest stable version: [v3.4.2](https://www.npmjs.com/package/perimeterx-node-core)
 
 This is a shared base implementation for PerimeterX Express enforcer and future NodeJS enforcers. For a fully functioning implementation example, see the [Node-Express enforcer](https://github.com/PerimeterX/perimeterx-node-express/) implementation.
 

lib/pxutil.js

@@ -269,20 +269,34 @@ function getTokenObject(cookie, delimiter = ':') {
 
 function getGraphqlData(req) {
     const isGraphqlPath = req.path.includes('graphql') || req.originalUrl.includes('graphql');
-    if (!isGraphqlPath) {
+    if (!isGraphqlPath || !req.body) {
         return null;
     }
 
-    const query = req.body ? req.body['query'] : null;
-    if (!query) {
-        return new GraphqlData(GraphqlOperationType.QUERY);
+    const { body, query } = getGraphqlBodyAndQuery(req);
+    if (!body || !query) {
+        return null;
     }
 
     const operationType = extractGraphqlOperationType(query);
-    const operationName = extractGraphqlOperationName(query, req.body['operationName'])
+    const operationName = extractGraphqlOperationName(query, body['operationName'])
     return new GraphqlData(operationType, operationName);
 }
 
+function getGraphqlBodyAndQuery(req) {
+    let body = {};
+    let query = '';
+
+    try {
+        body = typeof req.body === 'string' ? JSON.parse(req.body) : req.body;
+        query = body['query'];
+    } catch (err) {
+        // json parse error
+    }
+
+    return { body, query };
+}
+
 function extractGraphqlOperationType(query) {
     const isGraphqlQueryShorthand = query[0] === '{';
     if (isGraphqlQueryShorthand) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "perimeterx-node-core",
-    "version": "3.4.1",
+    "version": "3.4.2",
     "description": "PerimeterX NodeJS shared core for various applications to monitor and block traffic according to PerimeterX risk score",
     "main": "index.js",
     "scripts": {