Preparing release 1.2.10

queueit · Jan 26, 2022 · 7771132 · 7771132
1 parent 626d633
commit 7771132
Show file tree

Hide file tree

Showing 7 changed files with 362 additions and 355 deletions.
diff --git a/README.md b/README.md
@@ -62,4 +62,4 @@ you want end-users to queue up for. For this to work, you will need to contact q
 your GO Queue-it platform account.  
 Once enabled, you will need to check the `Include body` checkbox in the `Viewer request` function associations. This can
 be done by editing your CloudFront distribution behaviors.
-![Function associations](https://github.com/queueit/KnownUser.V3.Cloudfront/blob/master/FunctionAssociations.png)
+![Function associations](https://github.com/queueit/KnownUser.V3.Cloudfront/blob/master/FunctionAssociations.png)
diff --git a/ViewerRequest/cloudFrontHttpContextProvider.js b/ViewerRequest/cloudFrontHttpContextProvider.js
@@ -1,5 +1,16 @@
 exports.getCloudFrontHttpContext = function (request, response) {
     return {
+        getCryptoProvider: function() {
+            // Code to configure hashing in KnownUser SDK (requires node module 'crypto'):
+            return {
+                getSha256Hash: function(secretKey, plaintext) {
+                    return require('crypto')
+                        .createHmac('sha256', secretKey)
+                        .update(plaintext)
+                        .digest('hex');
+                }
+            };
+        },
         getHttpRequest: function () {
             return {
                 decodedBody: null,
@@ -10,10 +21,8 @@
                 getHeader: function (headerNameArg) {
                     headerNameArg = (headerNameArg + "").toLowerCase();
                     for (let header in request.headers) {
-                        if (header.toLowerCase() === headerNameArg) {
-                            if (request.headers[header].length >= 1) {
-                                return request.headers[header][0].value;
-                            }
+                        if (header.toLowerCase() === headerNameArg && request.headers[header].length >= 1) {
+                            return request.headers[header][0].value;
                         }
                     }
                     return "";
@@ -73,15 +82,16 @@
                     }
 
                     setCookieString += " path=/";
-
+                    const setCookieHeader = 'set-cookie';
+                    const responseSetCookieHeader = 'queueit-response-set-cookie';
                     //adding cookie header to response in case response generated from request without sending request to origin
-                    response.headers['set-cookie'] = response.headers['set-cookie'] || [];
-                    response.headers['set-cookie'].push({key: "Set-Cookie", value: setCookieString});
+                    response.headers[setCookieHeader] = response.headers[setCookieHeader] || [];
+                    response.headers[setCookieHeader].push({key: "Set-Cookie", value: setCookieString});
 
                     //adding cookies as custom header to request to be used on the way back will be set in the response
-                    request.headers['queueit-response-set-cookie'] = request.headers['queueit-response-set-cookie'] || [];
-                    request.headers['queueit-response-set-cookie'].push({
-                        key: "queueit-response-set-cookie",
+                    request.headers[responseSetCookieHeader] = request.headers[responseSetCookieHeader] || [];
+                    request.headers[responseSetCookieHeader].push({
+                        key: responseSetCookieHeader,
                         value: setCookieString
                     });
                 }

diff --git a/ViewerRequest/index.js b/ViewerRequest/index.js
@@ -1,165 +1,164 @@
-'use strict';
-const QUEUEIT_FAILED_HEADERNAME = "x-queueit-failed";
-const QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME = 'x-queueit-connector';
-const QUEUEIT_CONNECTOR_NAME = "cloudfront"
-const SHOULD_IGNORE_OPTIONS_REQUESTS = false;
-
-let CustomerId = "YOUR CUSTOMERID HERE";
-let SecretKey = "YOUR SECRET KEY HERE";
-let APIKey = "YOUR API KEY HERE";
-
-const querystringParser = require('querystring');
-const QueueIT = require("./sdk/queueit-knownuserv3-sdk.js");
-const knownUser = QueueIT.KnownUser;
-const httpContextProvider = require("./cloudFrontHttpContextProvider.js");
-const helpers = require("./queueitHelpers.js");
-const integrationConfigProvider = require("./integrationConfigProvider.js");
-
-exports.setIntegrationDetails = (customerId, secretKey, apiKey) => {
-    CustomerId = customerId;
-    SecretKey = secretKey;
-    APIKey = apiKey;
-}
-
-exports.handler = async (event) => {
-    const request = event.Records[0].cf.request;
-    try {
-        return await handleRequest(request);
-    } catch (e) {
-        let errorText = getErrorText(e);
-        setQueueItErrorHeaders(request, null);
-        console.log("ERROR: Queue-it Connector " + errorText);
-        return request;
-    }
-};
-
-async function handleRequest(request) {
-    helpers.configureKnownUserHashing(QueueIT.Utils);
-    const response = {
-        headers: {}
-    };
-    setQueueItHeaders(response);
-
-    if (isIgnored(request)) {
-        return request;
-    }
-
-    let httpContext = httpContextProvider.getCloudFrontHttpContext(request, response);
-    const queueitToken = getQueueItToken(request, httpContext);
-    var requestUrl = httpContext.getHttpRequest().getAbsoluteUri();
-    var requestUrlWithoutToken = requestUrl.replace(new RegExp("([\?&])(" + knownUser.QueueITTokenKey + "=[^&]*)", 'i'), "");
-    requestUrlWithoutToken = requestUrlWithoutToken.replace(new RegExp("[?]$"), "");
-    var integrationConfig = "";
-
-    try {
-        integrationConfig = await integrationConfigProvider.getConfig(CustomerId, APIKey);
-    } catch (e) {
-        let errorText = getErrorText(e);
-        setQueueItErrorHeaders(request, response);
-        console.log("ERROR: Downloading config " + errorText);
-    }
-
-    var validationResult = knownUser.validateRequestByIntegrationConfig(
-        requestUrlWithoutToken, queueitToken, integrationConfig,
-        CustomerId, SecretKey, httpContext);
-
-    if (validationResult.doRedirect()) {
-        // Adding no cache headers to prevent browsers to cache requests
-        response.headers['cache-control'] = [
-            {
-                key: 'Cache-Control',
-                value: 'no-cache, no-store, must-revalidate, max-age=0'
-            }];
-        response.headers['pragma'] = [
-            {
-                key: 'Pragma',
-                value: 'no-cache'
-            }];
-        response.headers['expires'] = [
-            {
-                key: 'Expires',
-                value: 'Fri, 01 Jan 1990 00:00:00 GMT'
-            }];
-
-        if (validationResult.isAjaxResult) {
-            let headerName = validationResult.getAjaxQueueRedirectHeaderKey();
-            // In case of ajax call send the user to the queue by sending a custom queue-it header and redirecting user to queue from javascript
-            response.headers[headerName] = [{
-                key: headerName,
-                value: helpers.addKUPlatformVersion(validationResult.getAjaxRedirectUrl())
-            }];
-            response.headers['Access-Control-Expose-Headers'] = [{
-                key: 'Access-Control-Expose-Headers',
-                value: headerName
-            }];
-            response.status = '200';
-            response.statusDescription = 'OK';
-            return response;
-
-        } else {
-            // Send the user to the queue - either because hash was missing or because is was invalid
-            response.status = '302';
-            response.statusDescription = 'Found';
-            response.headers['location'] = [{
-                key: 'Location',
-                value: helpers.addKUPlatformVersion(validationResult.redirectUrl)
-            }];
-            return response;
-        }
-    } else {
-        // Request can continue - we remove queueittoken form querystring parameter to avoid sharing of user specific token
-        if (queueitToken && validationResult.actionType === "Queue") {
-            response.status = '302';
-            response.statusDescription = 'Found';
-            response.headers['location'] = [{
-                key: 'Location',
-                value: requestUrlWithoutToken
-            }];
-            return response;
-        } else {
-            return request;
-        }
-    }
-}
-
-function getQueueItToken(request, httpContext) {
-    let queueItToken = querystringParser.parse(request.querystring)[knownUser.QueueITTokenKey];
-    if (queueItToken) {
-        return queueItToken;
-    }
-
-    const tokenHeaderName = `x-${knownUser.QueueITTokenKey}`;
-    return httpContext.getHttpRequest().getHeader(tokenHeaderName);
-}
-
-function setQueueItHeaders(response) {
-    response.headers[QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME] = [
-        {key: QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME, value: QUEUEIT_CONNECTOR_NAME}
-    ];
-}
-
-function setQueueItErrorHeaders(request, response) {
-    request.headers['queueit-response-error'] = [
-        {key: 'queueit-response-error', value: 'true'}
-    ];
-
-    if (response) {
-        response.headers[QUEUEIT_FAILED_HEADERNAME] = [
-            {key: QUEUEIT_FAILED_HEADERNAME, value: 'true'}
-        ];
-    }
-}
-
-function isIgnored(request) {
-    return SHOULD_IGNORE_OPTIONS_REQUESTS && request.method === 'OPTIONS';
-}
-
-function getErrorText(e) {
-    let errorText = e;
-    if (e instanceof Error) {
-        errorText = e.toString();
-    } else if (typeof e == 'object') {
-        errorText = JSON.stringify(e);
-    }
-    return errorText;
-}
+'use strict';
+const QUEUEIT_FAILED_HEADERNAME = "x-queueit-failed";
+const QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME = 'x-queueit-connector';
+const QUEUEIT_CONNECTOR_NAME = "cloudfront"
+const SHOULD_IGNORE_OPTIONS_REQUESTS = false;
+
+let CustomerId = "YOUR CUSTOMERID HERE";
+let SecretKey = "YOUR SECRET KEY HERE";
+let APIKey = "YOUR API KEY HERE";
+
+const querystringParser = require('querystring');
+const QueueIT = require("./sdk/queueit-knownuserv3-sdk.js");
+const knownUser = QueueIT.KnownUser;
+const httpContextProvider = require("./cloudFrontHttpContextProvider.js");
+const helpers = require("./queueitHelpers.js");
+const integrationConfigProvider = require("./integrationConfigProvider.js");
+
+exports.setIntegrationDetails = (customerId, secretKey, apiKey) => {
+    CustomerId = customerId;
+    SecretKey = secretKey;
+    APIKey = apiKey;
+}
+
+exports.handler = async (event) => {
+    const request = event.Records[0].cf.request;
+    try {
+        return await handleRequest(request);
+    } catch (e) {
+        let errorText = getErrorText(e);
+        setQueueItErrorHeaders(request, null);
+        console.log("ERROR: Queue-it Connector " + errorText);
+        return request;
+    }
+};
+
+async function handleRequest(request) {
+    const response = {
+        headers: {}
+    };
+    setQueueItHeaders(response);
+
+    if (isIgnored(request)) {
+        return request;
+    }
+
+    let httpContext = httpContextProvider.getCloudFrontHttpContext(request, response);
+    const queueitToken = getQueueItToken(request, httpContext);
+    var requestUrl = httpContext.getHttpRequest().getAbsoluteUri();
+    var requestUrlWithoutToken = requestUrl.replace(new RegExp("([\?&])(" + knownUser.QueueITTokenKey + "=[^&]*)", 'i'), "");
+    requestUrlWithoutToken = requestUrlWithoutToken.replace(new RegExp("[?]$"), "");
+    var integrationConfig = "";
+
+    try {
+        integrationConfig = await integrationConfigProvider.getConfig(CustomerId, APIKey);
+    } catch (e) {
+        let errorText = getErrorText(e);
+        setQueueItErrorHeaders(request, response);
+        console.log("ERROR: Downloading config " + errorText);
+    }
+
+    var validationResult = knownUser.validateRequestByIntegrationConfig(
+        requestUrlWithoutToken, queueitToken, integrationConfig,
+        CustomerId, SecretKey, httpContext);
+
+    if (validationResult.doRedirect()) {
+        // Adding no cache headers to prevent browsers to cache requests
+        response.headers['cache-control'] = [
+            {
+                key: 'Cache-Control',
+                value: 'no-cache, no-store, must-revalidate, max-age=0'
+            }];
+        response.headers['pragma'] = [
+            {
+                key: 'Pragma',
+                value: 'no-cache'
+            }];
+        response.headers['expires'] = [
+            {
+                key: 'Expires',
+                value: 'Fri, 01 Jan 1990 00:00:00 GMT'
+            }];
+
+        if (validationResult.isAjaxResult) {
+            let headerName = validationResult.getAjaxQueueRedirectHeaderKey();
+            // In case of ajax call send the user to the queue by sending a custom queue-it header and redirecting user to queue from javascript
+            response.headers[headerName] = [{
+                key: headerName,
+                value: helpers.addKUPlatformVersion(validationResult.getAjaxRedirectUrl())
+            }];
+            response.headers['Access-Control-Expose-Headers'] = [{
+                key: 'Access-Control-Expose-Headers',
+                value: headerName
+            }];
+            response.status = '200';
+            response.statusDescription = 'OK';
+            return response;
+
+        } else {
+            // Send the user to the queue - either because hash was missing or because is was invalid
+            response.status = '302';
+            response.statusDescription = 'Found';
+            response.headers['location'] = [{
+                key: 'Location',
+                value: helpers.addKUPlatformVersion(validationResult.redirectUrl)
+            }];
+            return response;
+        }
+    } else {
+        // Request can continue - we remove queueittoken form querystring parameter to avoid sharing of user specific token
+        if (queueitToken && validationResult.actionType === "Queue") {
+            response.status = '302';
+            response.statusDescription = 'Found';
+            response.headers['location'] = [{
+                key: 'Location',
+                value: requestUrlWithoutToken
+            }];
+            return response;
+        } else {
+            return request;
+        }
+    }
+}
+
+function getQueueItToken(request, httpContext) {
+    let queueItToken = querystringParser.parse(request.querystring)[knownUser.QueueITTokenKey];
+    if (queueItToken) {
+        return queueItToken;
+    }
+
+    const tokenHeaderName = `x-${knownUser.QueueITTokenKey}`;
+    return httpContext.getHttpRequest().getHeader(tokenHeaderName);
+}
+
+function setQueueItHeaders(response) {
+    response.headers[QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME] = [
+        {key: QUEUEIT_CONNECTOR_EXECUTED_HEADER_NAME, value: QUEUEIT_CONNECTOR_NAME}
+    ];
+}
+
+function setQueueItErrorHeaders(request, response) {
+    request.headers['queueit-response-error'] = [
+        {key: 'queueit-response-error', value: 'true'}
+    ];
+
+    if (response) {
+        response.headers[QUEUEIT_FAILED_HEADERNAME] = [
+            {key: QUEUEIT_FAILED_HEADERNAME, value: 'true'}
+        ];
+    }
+}
+
+function isIgnored(request) {
+    return SHOULD_IGNORE_OPTIONS_REQUESTS && request.method === 'OPTIONS';
+}
+
+function getErrorText(e) {
+    let errorText = e;
+    if (e instanceof Error) {
+        errorText = e.toString();
+    } else if (typeof e == 'object') {
+        errorText = JSON.stringify(e);
+    }
+    return errorText;
+}