Solved some other issues that may lead to race conditions

#75

Author: Chris Wiechmann

CHANGELOG.md

@@ -4,6 +4,10 @@ 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/).
 
+## Unreleased
+### Fixed
+- Wrong organization assigned to API under heavy load [#75](https://github.com/Axway-API-Management-Plus/apigateway-openlogging-elk/issues/75)
+
 ## [2.1.0] 2021-02-04
 ### Added
 - Now the Application-Id shown in Traffic-Monitor column: Subject resolves to the Application-Name [#69](https://github.com/Axway-API-Management-Plus/apigateway-openlogging-elk/issues/69)

UPDATE.md

@@ -41,6 +41,7 @@ On the other hand, the API builder Docker image, as a central component of the s
 | 2.0.1 | [X](#api-builderlogstashmemcached) | -                                  | -                                  | -             | -               | -               | -               | -                  | 7.10.0  |            |
 | 2.0.2 | [X](#api-builderlogstashmemcached) | -                                  | -                                  | -             | -               | -               | -               | -                  | 7.10.0  |            |
 | 2.1.0 | [X](#api-builderlogstashmemcached) | [X](#api-builderlogstashmemcached) | -                                  | -             | -               | -               | [X](#parameters)|[X](#elastic-config)| 7.10.0  |            |
+| 2.1.1 | [X](#api-builderlogstashmemcached) | -                                  | -                                  | -             | -               | -               | -               |-                   | 7.10.0  | Unreleased |
 
 ### Update from Version 1.0.0
 

apibuilder4elastic/custom_flow_nodes/api-builder-plugin-axway-api-management/src/actions.js

@@ -58,7 +58,7 @@ async function lookupCurrentUser(params, options) {
 		logger.debug(`Trying to authorize user based on Authorization header.`);
 		user.loginName = await _getCurrentGWUser(headers = {'Authorization': `${requestHeaders.authorization}`});
 		logger.debug(`Authorized user is: ${user.loginName}`);
-		permissions = await _getCurrentGWPermissions(headers = {'Authorization': `${requestHeaders.authorization}`}, loginName);
+		permissions = await _getCurrentGWPermissions(headers = {'Authorization': `${requestHeaders.authorization}`}, user.loginName);
 	} else {
 		VIDUSR = _getCookie(requestHeaders.cookie, "VIDUSR");
 		if(!VIDUSR) {
@@ -75,7 +75,7 @@ async function lookupCurrentUser(params, options) {
 		logger.trace(`Trying to get current user based on VIDUSR cookie.`);
 		user.loginName = await _getCurrentGWUser(headers = {'Cookie': `VIDUSR=${VIDUSR}`});
 		logger.trace(`Current user is: ${user.loginName}`);
-		permissions = await _getCurrentGWPermissions(headers = {'Cookie': `VIDUSR=${VIDUSR}`, 'csrf-token': requestHeaders['csrf-token']}, loginName);
+		permissions = await _getCurrentGWPermissions(headers = {'Cookie': `VIDUSR=${VIDUSR}`, 'csrf-token': requestHeaders['csrf-token']}, user.loginName);
 	}
 	if(permissions.includes("adminusers_modify")) {
 		user.gatewayManager.isAdmin = true;
@@ -363,12 +363,13 @@ async function _getGroupRegionFilename(basefilename, groupId, region) {
 }
 
 async function _getCurrentGWUser(requestHeaders) {
+	debugger;
 	var options = {
 		path: '/api/rbac/currentuser',
 		headers: requestHeaders,
 		agent: new https.Agent({ rejectUnauthorized: false })
 	};
-	const loginName = await sendRequest(pluginConfig.apigateway.url, options)
+	var loginName = await sendRequest(pluginConfig.apigateway.url, options)
 		.then(response => {
 			return response.body.result;
 		})
@@ -475,7 +476,7 @@ async function _getCurrentGWPermissions(requestHeaders, loginName) {
 		headers: requestHeaders,
 		agent: new https.Agent({ rejectUnauthorized: false })
 	};
-	const result = await sendRequest(pluginConfig.apigateway.url, options)
+	var result = await sendRequest(pluginConfig.apigateway.url, options)
 		.then(response => {
 			return response.body.result;
 		})
@@ -497,7 +498,7 @@ async function _getManagerUser(user, groupId) {
 		},
 		agent: new https.Agent({ rejectUnauthorized: false })
 	};
-	const managerUser = await sendRequest(apiManagerConfig.url, options)
+	var managerUser = await sendRequest(apiManagerConfig.url, options)
 		.then(response => {
 			return response.body;
 		})
@@ -552,11 +553,12 @@ async function _getOrganization(apiProxy, groupId, region, options) {
 		if(apiProxy.organizationName == undefined) apiProxy.organizationName = "N/A";
 		return apiProxy;
 	}
+	var org;
 	const orgId = apiProxy.organizationId;
 	const apiManagerConfig = getManagerConfig(pluginConfig.apimanager, groupId, region);
 	const orgCacheKey = `ORG-${orgId}###${groupId}###${region}`
 	if(cache.has(orgCacheKey)) {
-		var org = cache.get(orgCacheKey);
+		org = cache.get(orgCacheKey);
 		logger.debug(`Organization: '${org.name}' (ID: ${orgId}) found in cache for groupId: ${groupId} in region: ${region}.`);
 		return org;
 	}
@@ -567,7 +569,7 @@ async function _getOrganization(apiProxy, groupId, region, options) {
 		},
 		agent: new https.Agent({ rejectUnauthorized: false })
 	};
-	const org = await sendRequest(apiManagerConfig.url, options)
+	org = await sendRequest(apiManagerConfig.url, options)
 		.then(response => {
 			if(!response.body) {
 				throw new Error(`Organization with : '${orgId}' not found in API-Manager.`);
@@ -591,8 +593,9 @@ async function _getConfiguredCustomProperties(groupId, region, options) {
 	const { logger } = options;
 	const apiManagerConfig = getManagerConfig(pluginConfig.apimanager, groupId, region);
 	const customPropCacheKey = `CUSTOM_PROPERTIES###${groupId}###${region}`
+	var propertiesConfig;
 	if(cache.has(customPropCacheKey)) {
-		var propertiesConfig = cache.get(customPropCacheKey);
+		propertiesConfig = cache.get(customPropCacheKey);
 		logger.debug(`Custom properties found in cache with groupId: ${groupId} and region ${region}.`);
 		return propertiesConfig;
 	}
@@ -604,7 +607,7 @@ async function _getConfiguredCustomProperties(groupId, region, options) {
 		},
 		agent: new https.Agent({ rejectUnauthorized: false })
 	};
-	const propertiesConfig = await sendRequest(apiManagerConfig.url, options)
+	propertiesConfig = await sendRequest(apiManagerConfig.url, options)
 		.then(response => {
 			if(!response.body) {
 				throw new Error(`Error getting custom properties from API-Manager: ${apiManagerConfig.ur}`);