queueit_knownuserv3 3.3.0 → 3.6.1

data/.devcontainer/Dockerfile

@@ -0,0 +1,43 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM ruby:1.9.3
+
+# Avoid warnings by switching to noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# This Dockerfile adds a non-root 'vscode' user with sudo access. However, for Linux,
+# this user's GID/UID must match your local user UID/GID to avoid permission issues
+# with bind mounts. Update USER_UID / USER_GID if yours is not 1000. See
+# https://aka.ms/vscode-remote/containers/non-root-user for details.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Configure apt and install packages
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
+    # Verify git, process tools installed
+    && apt-get -y install git iproute2 procps lsb-release \
+    #
+    # Install ruby-debug-ide and ruby-debug-base19x
+    #&& gem install ruby-debug-ide \
+    #&& gem install ruby-debug-base19x \
+    #
+    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
+    && groupadd --gid $USER_GID $USERNAME \
+    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    # [Optional] Add sudo support for the non-root user
+    && apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    #
+    # Clean up
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=

data/.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
+// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/ruby-2
+{
+	"name": "Ruby",
+	"dockerFile": "Dockerfile",
+
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	"workspaceMount": "src=${localWorkspaceFolder},dst=/workspace,type=bind,consistency=delegated",
+	"workspaceFolder": "/workspace",
+	// Uncomment the next line if you want to publish any ports.
+	// "appPort": [],
+
+	// Uncomment the next line to run commands after the container is created.
+	"postCreateCommand": "bundle install; gem install ruby-debug-ide -v 0.6.0; gem install ruby-debug-base19x",
+
+	// Uncomment the next line to use a non-root user. On Linux, this will prevent
+	// new files getting created as root, but you may need to update the USER_UID
+	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
+	// "runArgs": [ "-u", "vscode" ],
+
+	// Add the IDs of extensions you want installed when the container is created in the array below.
+	"extensions": [
+		"rebornix.Ruby"
+	]
+}

data/.gitignore

@@ -0,0 +1,5 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/.vs

data/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug",
+            "type": "Ruby",
+            "request": "launch",
+            "program": "${workspaceRoot}/test/test_queueit_knownuserv3.rb",
+            "cwd": "${workspaceRoot}"
+        }
+    ]
+}

data/ci-build.yml

@@ -0,0 +1,17 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+pool:
+  name: 'Default'
+
+steps:
+- task: Docker@2
+  inputs:
+    command: 'buildAndPush'
+    Dockerfile: '**/test/Dockerfile'
+    buildContext: './'

data/lib/queueit_knownuserv3.rb

@@ -1,5 +1,6 @@
 require_relative "queueit_knownuserv3/known_user"
 require_relative "queueit_knownuserv3/models"
+require_relative "queueit_knownuserv3/connector_diagnostics"
 require_relative "queueit_knownuserv3/queue_url_params"
 require_relative "queueit_knownuserv3/user_in_queue_state_cookie_repository"
 require_relative "queueit_knownuserv3/user_in_queue_service"

data/lib/queueit_knownuserv3/connector_diagnostics.rb

@@ -0,0 +1,69 @@
+module QueueIt
+    class ConnectorDiagnostics
+        attr_accessor :isEnabled
+        attr_accessor :hasError
+        attr_accessor :validationResult
+
+        def initialize
+            @isEnabled = false
+            @hasError = false
+            @validationResult = nil
+        end
+
+        def setStateWithTokenError(customerId, errorCode)
+            @hasError = true
+            @validationResult = RequestValidationResult.new(
+                "ConnectorDiagnosticsRedirect",
+                nil, nil, 
+                "https://" + customerId + ".api2.queue-it.net/" + customerId + "/diagnostics/connector/error/?code=" + errorCode, 
+                nil, nil)
+        end
+
+        def setStateWithSetupError()
+            @hasError = true
+            @validationResult = RequestValidationResult.new(
+                "ConnectorDiagnosticsRedirect",
+                nil, nil, 
+                "https://api2.queue-it.net/diagnostics/connector/error/?code=setup", 
+                nil, nil)
+        end
+
+        def self.verify(customerId, secretKey, queueitToken)
+            diagnostics = ConnectorDiagnostics.new
+
+            qParams = QueueUrlParams.extractQueueParams(queueitToken)
+
+            if(qParams == nil)
+                return diagnostics
+            end
+
+            if(qParams.redirectType == nil)
+                return diagnostics
+            end
+
+            if(not qParams.redirectType.upcase.eql?("DEBUG"))
+                return diagnostics
+            end
+
+            if(Utils.isNilOrEmpty(customerId) or Utils.isNilOrEmpty(secretKey))
+                diagnostics.setStateWithSetupError()
+                return diagnostics
+            end
+
+            calculatedHash = OpenSSL::HMAC.hexdigest('sha256', secretKey, qParams.queueITTokenWithoutHash)
+            if(not qParams.hashCode.eql?(calculatedHash))
+                diagnostics.setStateWithTokenError(customerId, "hash")
+                return diagnostics
+            end
+                
+            if(qParams.timeStamp < Time.now.getutc.tv_sec)
+                diagnostics.setStateWithTokenError(customerId, "timestamp")
+                return diagnostics
+			end
+            
+            diagnostics.isEnabled = true
+
+            return diagnostics
+        end            
+    end
+end

data/lib/queueit_knownuserv3/integration_config_helpers.rb

@@ -75,14 +75,14 @@ module QueueIt
 
 	class UrlValidatorHelper
 		def self.evaluate(triggerPart, url)
-			if (!triggerPart.key?("Operator") ||
+			if (triggerPart.nil? || 
+				!triggerPart.key?("Operator") ||
 				!triggerPart.key?("IsNegative") ||
 				!triggerPart.key?("IsIgnoreCase") ||
-				!triggerPart.key?("ValueToCompare") ||
 				!triggerPart.key?("UrlPart"))
-				return false;
+				return false
 			end
-
+			
 			urlPart = UrlValidatorHelper.getUrlPart(triggerPart["UrlPart"], url)
 
 			return ComparisonOperatorHelper.evaluate(
@@ -90,7 +90,8 @@ module QueueIt
 				triggerPart["IsNegative"], 
 				triggerPart["IsIgnoreCase"], 
 				urlPart, 
-				triggerPart["ValueToCompare"])
+				triggerPart["ValueToCompare"],
+				triggerPart["ValuesToCompare"])
 		end
 
 		def self.getUrlPart(urlPart, url)
@@ -115,12 +116,12 @@ module QueueIt
 	class CookieValidatorHelper
 		def self.evaluate(triggerPart, cookieJar)
 			begin
-				if (!triggerPart.key?("Operator") ||
+				if (triggerPart.nil? ||
+					!triggerPart.key?("Operator") ||
 					!triggerPart.key?("IsNegative") ||
 					!triggerPart.key?("IsIgnoreCase") ||
-					!triggerPart.key?("ValueToCompare") ||
 					!triggerPart.key?("CookieName"))
-					return false;
+					return false
 				end
 
 				if(cookieJar.nil?)
@@ -137,7 +138,8 @@ module QueueIt
 					triggerPart["IsNegative"], 
 					triggerPart["IsIgnoreCase"], 
 					cookieValue, 
-					triggerPart["ValueToCompare"])
+					triggerPart["ValueToCompare"],
+					triggerPart["ValuesToCompare"])
 			rescue
 				return false
 			end
@@ -147,33 +149,43 @@ module QueueIt
 	class UserAgentValidatorHelper
 		def self.evaluate(triggerPart, userAgent)
 			begin
-				if (!triggerPart.key?("Operator") ||
+				if (triggerPart.nil? ||
+					!triggerPart.key?("Operator") ||
 					!triggerPart.key?("IsNegative") ||
-					!triggerPart.key?("IsIgnoreCase") ||
-					!triggerPart.key?("ValueToCompare"))
-					return false;
+					!triggerPart.key?("IsIgnoreCase"))
+					return false
 				end
-
+			
 				return ComparisonOperatorHelper.evaluate(
 					triggerPart["Operator"], 
 					triggerPart["IsNegative"], 
 					triggerPart["IsIgnoreCase"], 
 					userAgent, 
-					triggerPart["ValueToCompare"])
+					triggerPart["ValueToCompare"],
+					triggerPart["ValuesToCompare"])
 			end
 		end
 	end
 
 	class HttpHeaderValidatorHelper
 		def self.evaluate(triggerPart, headers)
-			begin				
+			begin
+				if (triggerPart.nil? || 
+					!triggerPart.key?("Operator") ||
+					!triggerPart.key?("IsNegative") ||
+					!triggerPart.key?("IsIgnoreCase")
+					!triggerPart.key?("HttpHeaderName"))
+					return false
+				end
+
 				headerValue = headers[triggerPart['HttpHeaderName']]
 				return ComparisonOperatorHelper.evaluate(
 					triggerPart["Operator"], 
 					triggerPart["IsNegative"], 
 					triggerPart["IsIgnoreCase"], 
 					headerValue, 
-					triggerPart["ValueToCompare"])				
+					triggerPart["ValueToCompare"],
+					triggerPart["ValuesToCompare"])
 			rescue
 				return false
 			end
@@ -181,35 +193,38 @@ module QueueIt
 	end
 
 	class ComparisonOperatorHelper
-		def self.evaluate(opt, isNegative, ignoreCase, left, right)
-			if(left.nil?)
-				left = ''
+		def self.evaluate(opt, isNegative, ignoreCase, value, valueToCompare, valuesToCompare)
+			if (value.nil?)
+				value = ''
+			end
+			
+			if (valueToCompare.nil?) 
+				valueToCompare = ''
 			end
-			if(right.nil?) 
-				right = ''
+			
+			if (valuesToCompare.nil?)
+				valuesToCompare = []
 			end
 
 			case opt		
 				when "Equals"
-					return ComparisonOperatorHelper.equals(left, right, isNegative, ignoreCase)
+					return ComparisonOperatorHelper.equals(value, valueToCompare, isNegative, ignoreCase)
 				when "Contains" 
-					return ComparisonOperatorHelper.contains(left, right, isNegative, ignoreCase)
-				when "StartsWith"
-					return ComparisonOperatorHelper.startsWith(left, right, isNegative, ignoreCase)
-				when "EndsWith"
-					return ComparisonOperatorHelper.endsWith(left, right, isNegative, ignoreCase)
-				when "MatchesWith"
-					return ComparisonOperatorHelper.matchesWith(left, right, isNegative, ignoreCase)
+					return ComparisonOperatorHelper.contains(value, valueToCompare, isNegative, ignoreCase)
+				when "EqualsAny"
+					return ComparisonOperatorHelper.equalsAny(value, valuesToCompare, isNegative, ignoreCase)
+				when "ContainsAny"
+					return ComparisonOperatorHelper.containsAny(value, valuesToCompare, isNegative, ignoreCase)
 				else
 					return false
 			end
 		end
 
-		def self.equals(left, right, isNegative, ignoreCase)
+		def self.equals(value, valueToCompare, isNegative, ignoreCase)
 			if(ignoreCase)
-				evaluation = left.upcase.eql? right.upcase
+				evaluation = value.upcase.eql? valueToCompare.upcase
 			else
-				evaluation = left.eql? right
+				evaluation = value.eql? valueToCompare
 			end
 
 			if(isNegative)
@@ -219,31 +234,17 @@ module QueueIt
 			end
 		end
 
-		def self.contains(left, right, isNegative, ignoreCase)
-			if(right.eql? "*")
+		def self.contains(value, valueToCompare, isNegative, ignoreCase)
+			if((valueToCompare.eql? "*") && !(value.empty? || value.nil?))
 				return true
 			end
 
 			if(ignoreCase)
-				left = left.upcase
-				right = right.upcase
-			end
-
-			evaluation = left.include? right
-			if(isNegative)
-				return !evaluation
-			else
-				return evaluation
-			end
-		end
-
-		def self.startsWith(left, right, isNegative, ignoreCase)
-			if(ignoreCase)
-				evaluation = left.upcase.start_with? right.upcase
-			else
-				evaluation = left.start_with? right
+				value = value.upcase
+				valueToCompare = valueToCompare.upcase
 			end
 
+			evaluation = value.include? valueToCompare
 			if(isNegative)
 				return !evaluation
 			else
@@ -251,33 +252,22 @@ module QueueIt
 			end
 		end
 
-		def self.endsWith(left, right, isNegative, ignoreCase)
-			if(ignoreCase)
-				evaluation = left.upcase.end_with? right.upcase
-			else
-				evaluation = left.end_with? right
-			end
-
-			if(isNegative)
-				return !evaluation
-			else
-				return evaluation
+		def self.equalsAny(value, valuesToCompare, isNegative, ignoreCase)
+			valuesToCompare.each do |valueToCompare|
+				if (ComparisonOperatorHelper.equals(value, valueToCompare, false, ignoreCase))
+					return !isNegative
+				end
 			end
+			return isNegative
 		end
 
-		def self.matchesWith(left, right, isNegative, ignoreCase)
-			if(ignoreCase)
-				pattern = Regexp.new(right, Regexp::IGNORECASE) 
-			else
-				pattern = Regexp.new(right)
-			end
-		
-			evaluation = pattern.match(left) != nil
-			if(isNegative)
-				return !evaluation
-			else
-				return evaluation
+		def self.containsAny(value, valuesToCompare, isNegative, ignoreCase)
+			valuesToCompare.each do |valueToCompare|
+				if (ComparisonOperatorHelper.contains(value, valueToCompare, false, ignoreCase))
+					return !isNegative
+				end
 			end
+			return isNegative
 		end
 	end
 end

data/lib/queueit_knownuserv3/known_user.rb

@@ -1,9 +1,11 @@
+require 'cgi'
 require 'json'
 
 module QueueIt
 	class KnownUser
 		QUEUEIT_TOKEN_KEY = "queueittoken"
 		QUEUEIT_DEBUG_KEY = "queueitdebug"
+		QUEUEIT_AJAX_HEADER_KEY = "x-queueit-ajaxpageurl"
 	
 		@@userInQueueService = nil	
 		def self.getUserInQueueService(cookieJar)
@@ -15,6 +17,19 @@ module QueueIt
 		end
 		private_class_method :getUserInQueueService
 
+		def self.isQueueAjaxCall(request)
+			return request.headers[QUEUEIT_AJAX_HEADER_KEY] != nil
+		end
+		private_class_method :isQueueAjaxCall
+
+		def self.generateTargetUrl(originalTargetUrl, request)
+			unless isQueueAjaxCall(request)
+				return originalTargetUrl
+			end			
+			return CGI::unescape(request.headers[QUEUEIT_AJAX_HEADER_KEY])			
+		end
+		private_class_method :generateTargetUrl
+
 		def self.convertToInt(value)
 			begin
 				converted = Integer(value)
@@ -25,25 +40,16 @@ module QueueIt
 		end
 		private_class_method :convertToInt
 	
-		def self.getIsDebug(queueitToken, secretKey)
-			qParams = QueueUrlParams.extractQueueParams(queueitToken)
-			if(qParams == nil)
-				return false
-			end
-
-			redirectType = qParams.redirectType
-			if(redirectType == nil)
-				return false
-			end
-		
-			if (redirectType.upcase.eql?("DEBUG"))
-				calculatedHash = OpenSSL::HMAC.hexdigest('sha256', secretKey, qParams.queueITTokenWithoutHash)
-				valid = qParams.hashCode.eql?(calculatedHash) 
-				return valid
-			end
-			return false
+		def self.logMoreRequestDetails(debugEntries, request)
+			debugEntries["ServerUtcTime"] = Time.now.utc.iso8601
+			debugEntries["RequestIP"] = request.remote_ip
+			debugEntries["RequestHttpHeader_Via"] = request.headers["via"]
+			debugEntries["RequestHttpHeader_Forwarded"] = request.headers["forwarded"]
+			debugEntries["RequestHttpHeader_XForwardedFor"] = request.headers["x-forwarded-for"]
+			debugEntries["RequestHttpHeader_XForwardedHost"] = request.headers["x-forwarded-host"]
+			debugEntries["RequestHttpHeader_XForwardedProto"] = request.headers["x-forwarded-proto"]
 		end
-		private_class_method :getIsDebug
+		private_class_method :logMoreRequestDetails
 
 		def self.setDebugCookie(debugEntries, cookieJar)
 			if(debugEntries == nil || debugEntries.length == 0)
@@ -60,17 +66,20 @@ module QueueIt
 		end
 		private_class_method :setDebugCookie
 
-		def self._resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)
-			isDebug = getIsDebug(queueitToken, secretKey)
+		def self._resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries, isDebug)
+			
 			if(isDebug)
+				debugEntries["SdkVersion"] = UserInQueueService::SDK_VERSION
+				debugEntries["Runtime"] = getRuntime()
 				debugEntries["TargetUrl"] = targetUrl
 				debugEntries["QueueitToken"] = queueitToken
-				debugEntries["OriginalUrl"] = request.original_url            
+				debugEntries["OriginalUrl"] = getRealOriginalUrl(request)
 				if(queueConfig == nil)
 					debugEntries["QueueConfig"] = "NULL"
 				else
 					debugEntries["QueueConfig"] = queueConfig.toString()
 				end
+				logMoreRequestDetails(debugEntries, request)
 			end
 		
 			if(Utils.isNilOrEmpty(customerId))
@@ -103,21 +112,28 @@ module QueueIt
 			end
 
 			userInQueueService = getUserInQueueService(request.cookie_jar)
-			userInQueueService.validateQueueRequest(targetUrl, queueitToken, queueConfig, customerId, secretKey)
+			result = userInQueueService.validateQueueRequest(targetUrl, queueitToken, queueConfig, customerId, secretKey)
+			result.isAjaxResult = isQueueAjaxCall(request)
+			
+			return result
 		end
 		private_class_method :_resolveQueueRequestByLocalConfig
 	
-		def self._cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries)
-			isDebug = getIsDebug(queueitToken, secretKey)
+		def self._cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries, isDebug)
+			targetUrl = generateTargetUrl(targetUrl, request)				
+
 			if(isDebug)
+				debugEntries["SdkVersion"] = UserInQueueService::SDK_VERSION
+				debugEntries["Runtime"] = getRuntime()
 				debugEntries["TargetUrl"] = targetUrl
 				debugEntries["QueueitToken"] = queueitToken
-				debugEntries["OriginalUrl"] = request.original_url
+				debugEntries["OriginalUrl"] = getRealOriginalUrl(request)
 				if(cancelConfig == nil)
 					debugEntries["CancelConfig"] = "NULL"
 				else
 					debugEntries["CancelConfig"] = cancelConfig.toString()
 				end
+				logMoreRequestDetails(debugEntries, request)
 			end
 		
 			if(Utils.isNilOrEmpty(targetUrl))
@@ -145,7 +161,10 @@ module QueueIt
 			end
 
 			userInQueueService = getUserInQueueService(request.cookie_jar)
-			userInQueueService.validateCancelRequest(targetUrl, cancelConfig, customerId, secretKey)
+			result = userInQueueService.validateCancelRequest(targetUrl, cancelConfig, customerId, secretKey)
+			result.isAjaxResult = isQueueAjaxCall(request)
+			
+			return result
 		end
 		private_class_method :_cancelRequestByLocalConfig
 
@@ -169,38 +188,64 @@ module QueueIt
 
 		def self.resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request)
 			debugEntries = Hash.new
+			connectorDiagnostics = ConnectorDiagnostics.verify(customerId, secretKey, queueitToken)
+			
+			if(connectorDiagnostics.hasError)
+				return connectorDiagnostics.validationResult
+			end
 			begin
-				return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)
+				targetUrl = generateTargetUrl(targetUrl, request)
+				return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries, connectorDiagnostics.isEnabled)
+			rescue Exception => e
+				if(connectorDiagnostics.isEnabled)
+					debugEntries["Exception"] = e.message
+				end
+				raise e
 			ensure
 				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
 
-		def self.validateRequestByIntegrationConfig(currentUrlWithoutQueueITToken, queueitToken, integrationsConfigString, customerId, secretKey, request)
-			if(Utils.isNilOrEmpty(currentUrlWithoutQueueITToken))
-				raise KnownUserError, "currentUrlWithoutQueueITToken can not be nil or empty."
-			end
-
-			if(Utils.isNilOrEmpty(integrationsConfigString))
-				raise KnownUserError, "integrationsConfigString can not be nil or empty."
+		def self.validateRequestByIntegrationConfig(currentUrlWithoutQueueITToken, queueitToken, integrationConfigJson, customerId, secretKey, request)
+			debugEntries = Hash.new			
+			customerIntegration = Hash.new
+			connectorDiagnostics = ConnectorDiagnostics.verify(customerId, secretKey, queueitToken)
+			
+			if(connectorDiagnostics.hasError)
+				return connectorDiagnostics.validationResult
 			end
-
 			begin
-				customerIntegration = JSON.parse(integrationsConfigString)
-			
-				debugEntries = Hash.new		
-				isDebug = getIsDebug(queueitToken, secretKey)
-				if(isDebug)
-					debugEntries["ConfigVersion"] = customerIntegration["Version"]
+				if(connectorDiagnostics.isEnabled)
+					debugEntries["SdkVersion"] = UserInQueueService::SDK_VERSION
+					debugEntries["Runtime"] = getRuntime()				
 					debugEntries["PureUrl"] = currentUrlWithoutQueueITToken
 					debugEntries["QueueitToken"] = queueitToken
-					debugEntries["OriginalUrl"] = request.original_url
+					debugEntries["OriginalUrl"] = getRealOriginalUrl(request)
+					logMoreRequestDetails(debugEntries, request)
 				end
-			
+
+				customerIntegration = JSON.parse(integrationConfigJson)
+				
+				if(connectorDiagnostics.isEnabled)
+					if(customerIntegration.length != 0 and customerIntegration["Version"] != nil)
+						debugEntries["ConfigVersion"] = customerIntegration["Version"]
+					else
+						debugEntries["ConfigVersion"] = "NULL"
+					end
+				end
+
+				if(Utils.isNilOrEmpty(currentUrlWithoutQueueITToken))
+					raise KnownUserError, "currentUrlWithoutQueueITToken can not be nil or empty."
+				end
+
+				if(customerIntegration.length == 0 || customerIntegration["Version"] == nil)
+					raise KnownUserError, "integrationConfigJson is not valid json."
+				end
+
 				integrationEvaluator = IntegrationEvaluator.new
 				matchedConfig = integrationEvaluator.getMatchedIntegrationConfig(customerIntegration, currentUrlWithoutQueueITToken, request)
 
-				if(isDebug)
+				if(connectorDiagnostics.isEnabled)
 					if(matchedConfig == nil)
 						debugEntries["MatchedConfig"] = "NULL"
 					else
@@ -209,55 +254,99 @@ module QueueIt
 				end
 
 				if(matchedConfig == nil)
-					return RequestValidationResult.new(nil, nil, nil, nil)
+					return RequestValidationResult.new(nil, nil, nil, nil, nil, nil)
 				end
 			
+				# unspecified or 'Queue' specified
 				if(!matchedConfig.key?("ActionType") || Utils.isNilOrEmpty(matchedConfig["ActionType"]) || matchedConfig["ActionType"].eql?(ActionTypes::QUEUE))
-					queueConfig = QueueEventConfig.new
-					queueConfig.eventId = matchedConfig["EventId"]
-					queueConfig.queueDomain = matchedConfig["QueueDomain"]
-					queueConfig.layoutName = matchedConfig["LayoutName"]
-					queueConfig.culture = matchedConfig["Culture"]
-					queueConfig.cookieDomain = matchedConfig["CookieDomain"]
-					queueConfig.extendCookieValidity = matchedConfig["ExtendCookieValidity"]
-					queueConfig.cookieValidityMinute = matchedConfig["CookieValidityMinute"]
-					queueConfig.version = customerIntegration["Version"]
-			
-					case matchedConfig["RedirectLogic"]
-						when "ForcedTargetUrl"
-							targetUrl = matchedConfig["ForcedTargetUrl"]					
-						when "EventTargetUrl"
-							targetUrl = ''
-						else
-							targetUrl = currentUrlWithoutQueueITToken
-					end
-
-					return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)			
-			
-				else # cancel action			
-					cancelConfig = CancelEventConfig.new;
-					cancelConfig.eventId = matchedConfig["EventId"]
-					cancelConfig.queueDomain = matchedConfig["QueueDomain"]
-					cancelConfig.cookieDomain = matchedConfig["CookieDomain"]
-					cancelConfig.version = customerIntegration["Version"]
-            
-					return _cancelRequestByLocalConfig(currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries);
+					return handleQueueAction(currentUrlWithoutQueueITToken, queueitToken, customerIntegration, 
+								customerId, secretKey, matchedConfig, request, debugEntries, connectorDiagnostics.isEnabled)
+				
+				elsif(matchedConfig["ActionType"].eql?(ActionTypes::CANCEL))
+					return handleCancelAction(currentUrlWithoutQueueITToken, queueitToken, customerIntegration, 
+								customerId, secretKey, matchedConfig, request, debugEntries, connectorDiagnostics.isEnabled)
+					
+				# for all unknown types default to 'Ignore'
+				else
+					userInQueueService = getUserInQueueService(request.cookie_jar)
+					result = userInQueueService.getIgnoreActionResult(matchedConfig["Name"])
+					result.isAjaxResult = isQueueAjaxCall(request)
+					
+					return result
+				end
+			rescue Exception => e
+				if(connectorDiagnostics.isEnabled)
+					debugEntries["Exception"] = e.message
 				end
-			rescue StandardError => stdErr
-				raise KnownUserError, "integrationConfiguration text was not valid: " + stdErr.message
+				raise e
 			ensure
 				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
 
+		def self.handleQueueAction(currentUrlWithoutQueueITToken, queueitToken, customerIntegration, customerId, secretKey, matchedConfig, request, debugEntries, isDebug)
+			queueConfig = QueueEventConfig.new
+			queueConfig.eventId = matchedConfig["EventId"]
+			queueConfig.queueDomain = matchedConfig["QueueDomain"]
+			queueConfig.layoutName = matchedConfig["LayoutName"]
+			queueConfig.culture = matchedConfig["Culture"]
+			queueConfig.cookieDomain = matchedConfig["CookieDomain"]
+			queueConfig.extendCookieValidity = matchedConfig["ExtendCookieValidity"]
+			queueConfig.cookieValidityMinute = matchedConfig["CookieValidityMinute"]
+			queueConfig.version = customerIntegration["Version"]
+			queueConfig.actionName = matchedConfig["Name"]
+
+			case matchedConfig["RedirectLogic"]
+				when "ForcedTargetUrl"
+					targetUrl = matchedConfig["ForcedTargetUrl"]					
+				when "EventTargetUrl"
+					targetUrl = ''
+				else
+					targetUrl = generateTargetUrl(currentUrlWithoutQueueITToken, request)
+			end
+
+			return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries, isDebug)		
+		end
+
+		def self.handleCancelAction(currentUrlWithoutQueueITToken, queueitToken, customerIntegration, customerId, secretKey, matchedConfig, request, debugEntries, isDebug)
+			cancelConfig = CancelEventConfig.new
+			cancelConfig.eventId = matchedConfig["EventId"]
+			cancelConfig.queueDomain = matchedConfig["QueueDomain"]
+			cancelConfig.cookieDomain = matchedConfig["CookieDomain"]
+			cancelConfig.version = customerIntegration["Version"]
+			cancelConfig.actionName = matchedConfig["Name"]
+			
+			return _cancelRequestByLocalConfig(currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries, isDebug)
+		end
+
 		def self.cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request)
 			debugEntries = Hash.new
+			connectorDiagnostics = ConnectorDiagnostics.verify(customerId, secretKey, queueitToken)
+			
+			if(connectorDiagnostics.hasError)
+				return connectorDiagnostics.validationResult
+			end
 			begin
-				return _cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries)
+				return _cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries, connectorDiagnostics.isEnabled)
+			rescue Exception => e
+				if(connectorDiagnostics.isEnabled)
+					debugEntries["Exception"] = e.message
+				end
+				raise e
 			ensure
 				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
+
+		def self.getRealOriginalUrl(request)
+			# RoR could modify request.original_url if request contains x-forwarded-host/proto http headers.  
+			# Therefore we need this method to be able to access the 'real' original url.
+			return request.env["rack.url_scheme"] + "://" + request.env["HTTP_HOST"] + request.original_fullpath
+		end
+
+		def self.getRuntime()
+			return RUBY_VERSION.to_s
+		end
 	end
 
 	class CookieManager
@@ -286,9 +375,9 @@ module QueueIt
 					@cookies.delete(key)
 				else
 					if(noExpire)
-						@cookies[key] = { :value => value }
+						@cookies[key] = { :value => value, :httponly => false }
 					else
-						@cookies[key] = { :value => value, :expires => expire }
+						@cookies[key] = { :value => value, :expires => expire, :httponly => false }
 					end
 				end		
 			else
@@ -296,9 +385,9 @@ module QueueIt
 					@cookies.delete(key, :domain => domain)				
 				else
 					if(noExpire)
-						@cookies[key] = { :value => value, :domain => domain }		
+						@cookies[key] = { :value => value, :domain => domain, :httponly => false }		
 					else
-						@cookies[key] = { :value => value, :expires => expire, :domain => domain }		
+						@cookies[key] = { :value => value, :expires => expire, :domain => domain, :httponly => false }		
 					end
 				end		
 			end