k2hr3-api 1.0.24 → 1.0.25

package/ChangeLog

@@ -1,3 +1,9 @@
+k2hr3-api (1.0.25) unstable; urgency=low
+
+  * Added TENANT API for Local Tenant and updated etc - #100
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Fri, 07 Jul 2023 17:33:33 +0900
+
 k2hr3-api (1.0.24) unstable; urgency=low
 
   * Updated dependencies and test code for new chai version - #98

package/app.js

@@ -26,33 +26,59 @@ var logger		= require('morgan');
 var cookieParser= require('cookie-parser');
 var bodyParser	= require('body-parser');
 
-//
+//---------------------------------------------------------
+// Utilities
+//---------------------------------------------------------
+var	apiutil		= require('./lib/k2hr3apiutil');
+var	resutil		= require('./lib/k2hr3resutil');
+
+//---------------------------------------------------------
 // Load Configuration
-//
+//---------------------------------------------------------
 var	r3Conf		= require('./lib/k2hr3config').r3ApiConfig;
 var	apiConf		= new r3Conf();
 
 //
-// Debug logging objects
+// Load variables
 //
-var r3logger	= require('./lib/dbglogging');			// eslint-disable-line no-unused-vars
-
+// - Local Tenants
+// - Load CORS(Cross-Origin Resource Sharing) Setting
 //
-// utility
+// [NOTE][TODO]
+// It specifies a web development machine for temporary debugging.
+// In future we plan to specify with K2HR3 role.
 //
-var	apiutil		= require('./lib/k2hr3apiutil');
-var	resutil		= require('./lib/k2hr3resutil');
+var	is_localtenants		= true;
+var	cors_ips			= [];
 
-//
+(function()
+{
+	var	k2hr3config		= require('config');
+
+	is_localtenants		= apiConf.isLocalTenants();
+
+	if(apiutil.isSafeEntity(k2hr3config) && !apiutil.isEmptyArray(k2hr3config.corsips)){
+		apiutil.mergeArray(cors_ips, k2hr3config.corsips);
+	}
+}());
+
+//---------------------------------------------------------
+// Debug logging objects
+//---------------------------------------------------------
+var r3logger	= require('./lib/dbglogging');			// eslint-disable-line no-unused-vars
+
+//---------------------------------------------------------
+// Environments
+//---------------------------------------------------------
 // NODE_ENV(development or production)
 // NODE_LOGGER(if 'no', not logging by morgan)
 //
 var	is_product	= apiutil.compareCaseString(apiutil.getSafeString(process.env.NODE_ENV), 'production');
 var	is_logging	= !apiutil.compareCaseString(apiutil.getSafeString(process.env.NODE_LOGGER), 'no');
 
-//
+//---------------------------------------------------------
 // Routes
-//
+//---------------------------------------------------------
 var version		= require('./routes/version');
 var userTokens	= require('./routes/userTokens');
 var policy		= require('./routes/policy');
@@ -63,6 +89,10 @@ var acr			= require('./routes/acr');
 var list		= require('./routes/list');
 var userdata	= require('./routes/userdata');
 var extdata		= require('./routes/extdata');
+var tenant		= null;
+if(is_localtenants){
+	tenant		= require('./routes/tenant');
+}
 var verify		= null;
 if(!is_product){
 	verify		= require('./routes/debugVerify');
@@ -81,14 +111,18 @@ var acrExp		= express();
 var listExp		= express();
 var userdataExp	= express();
 var extdataExp	= express();
+var tenantExp	= null;
+if(is_localtenants){
+	tenantExp	= express();
+}
 var verifyExp	= null;
 if(!is_product){
 	verifyExp	= express();
 }
 
-//
+//---------------------------------------------------------
 // Trusted proxy
-//
+//---------------------------------------------------------
 // [NOTE][TODO]
 // We set trusted proxy as only loopback now.
 // Here, we need to add CDN/Proxy for our NW, but pending now.
@@ -103,26 +137,13 @@ acrExp.set('trust proxy',		'loopback');
 listExp.set('trust proxy',		'loopback');
 userdataExp.set('trust proxy',	'loopback');
 extdataExp.set('trust proxy',	'loopback');
+if(is_localtenants){
+	tenantExp.set('trust proxy','loopback');
+}
 if(!is_product){
 	verifyExp.set('trust proxy','loopback');
 }
 
-//
-// CORS(Cross-Origin Resource Sharing)
-//
-// [NOTE][TODO]
-// It specifies a web development machine for temporary debugging.
-// In future we plan to specify with K2HR3 role.
-//
-var	cors_ips			= [];
-(function()
-{
-	var	k2hr3config		= require('config');
-	if(apiutil.isSafeEntity(k2hr3config) && !apiutil.isEmptyArray(k2hr3config.corsips)){
-		apiutil.mergeArray(cors_ips, k2hr3config.corsips);
-	}
-}());
-
 //
 // CORS(Cross-Origin Resource Sharing) Controller
 //
@@ -175,6 +196,9 @@ app.use(function(req, res, next)
 	next();
 });
 
+//---------------------------------------------------------
+// Express
+//---------------------------------------------------------
 //
 // Setting for express
 //
@@ -191,7 +215,7 @@ app.use(express.static(path.join(__dirname, 'public')));
 app.use('/status.html',	express.static(__dirname + '/public/status.html'));
 
 //
-// route mapping
+// Route mapping
 //
 app.use('/',					version);		// '/'
 app.use('/v1',					version);		// '/v1'
@@ -204,6 +228,9 @@ acrExp.use('/*', 				acr);			// '/v1/acr'
 listExp.use('/*', 				list);			// '/v1/list'
 userdataExp.use('/*', 			userdata);		// '/v1/userdata'
 extdataExp.use('/*', 			extdata);		// '/v1/extdata'
+if(is_localtenants){
+	tenantExp.use('/*', 		tenant);		// '/v1/tenant'
+}
 if(!is_product){
 	verifyExp.use('/*',			verify);		// '/v1/debug/verify*'
 }
@@ -217,10 +244,16 @@ app.use('/v1/acr',				acrExp);		// mountpath:	'/v1/acr*'
 app.use('/v1/list',				listExp);		// mountpath:	'/v1/list*'
 app.use('/v1/userdata',			userdataExp);	// mountpath:	'/v1/userdata*'
 app.use('/v1/extdata',			extdataExp);	// mountpath:	'/v1/extdata*'
+if(is_localtenants){
+	app.use('/v1/tenant',		tenantExp);		// mountpath:	'/v1/tenant*'
+}
 if(!is_product){
 	app.use('/v1/debug/verify',	verifyExp);		// mountpath:	'/v1/debug/verify*'
 }
 
+//---------------------------------------------------------
+// Error handler
+//---------------------------------------------------------
 //
 // catch 404 and forward to error handler
 //

package/bin/run.sh

@@ -74,6 +74,9 @@ PrintUsage()
 	echo "         --watcher(-w)          : Run IP watcher process as daemon"
 	echo "         --oneshot(-os)         : Run watcher process only once"
 	echo ""
+	echo "Environment:"
+	echo "         DEBUG_LEVEL            : Specify DBG/MSG/WARN/ERR. Same as --debuglevel(-dl) option, and --debuglevel(-dl) takes precedence."
+	echo ""
 }
 
 #
@@ -388,6 +391,17 @@ elif [ "${DEBUG_ENV_LEVEL}" -ge 1 ]; then
 	DEBUG_ENV_PARAM="LOGLEVEL_ERR"
 else
 	DEBUG_ENV_PARAM="LOGLEVEL_SILENT"
+    if [ -n "${DEBUG_LEVEL}" ]; then
+		if [ "${DEBUG_LEVEL}" = "dbg" ] || [ "${DEBUG_LEVEL}" = "DBG" ] || [ "${DEBUG_LEVEL}" = "debug" ] || [ "${DEBUG_LEVEL}" = "DEBUG" ]; then
+			DEBUG_ENV_PARAM="LOGLEVEL_DBG"
+		elif [ "${DEBUG_LEVEL}" = "msg" ] || [ "${DEBUG_LEVEL}" = "MSG" ] || [ "${DEBUG_LEVEL}" = "message" ] || [ "${DEBUG_LEVEL}" = "MESSAGE" ] || [ "${DEBUG_LEVEL}" = "info" ] || [ "${DEBUG_LEVEL}" = "INFO" ]; then
+			DEBUG_ENV_PARAM="LOGLEVEL_MSG"
+		elif [ "${DEBUG_LEVEL}" = "warn" ] || [ "${DEBUG_LEVEL}" = "WARN" ] || [ "${DEBUG_LEVEL}" = "warning" ] || [ "${DEBUG_LEVEL}" = "WARNING" ]; then
+			DEBUG_ENV_PARAM="LOGLEVEL_WAN"
+		elif [ "${DEBUG_LEVEL}" = "err" ] || [ "${DEBUG_LEVEL}" = "ERR" ] || [ "${DEBUG_LEVEL}" = "error" ] || [ "${DEBUG_LEVEL}" = "ERROR" ]; then
+			DEBUG_ENV_PARAM="LOGLEVEL_ERR"
+		fi
+    fi
 fi
 if [ -n "${DEBUG_ENV_CUSTOM}" ]; then
 	if [ -n "${DEBUG_ENV_PARAM}" ]; then

package/config/default.json

@@ -40,8 +40,8 @@
 	},
 
 	'k2hdkc': {
-		'config':			'/etc/k2hdkc/slave.ini',
-		'port':				8031
+		'config':			'/etc/antpickax/slave.ini',
+		'port':				8022
 	},
 
 	'multiproc':			true,
@@ -76,6 +76,7 @@
 		'delhostrole':		'delhostrole'
 	},
 
+	'localtenants':			true,
 	'confirmtenant':		false,
 
 	'chkipconfig': {

package/lib/k2hr3config.js

@@ -63,6 +63,7 @@ const reserved_key_list = [
 	'userdata',
 	'extdata',
 	'k2hr3admin',
+	'localtenants',
 	'confirmtenant',
 	'chkipconfig',
 	'allowcredauth',
@@ -189,6 +190,7 @@ var	loadedConfig = (function()
 			delhostrole:		'delhostrole'							// Admin Role name
 		},
 
+		localtenants:		true,										// Whether to allow K2HR3 cluster local tenants
 		confirmtenant:		false,										// Whichever confirm tenant when adding service member
 
 		chkipconfig:		{											// IP Addresses checker(watcher) type
@@ -392,6 +394,11 @@ var	loadedConfig = (function()
 			}
 		}
 
+		// Local tenants
+		if(apiutil.isSafeEntity(config.localtenants) && 'boolean' == typeof config.localtenants){
+			data.localtenants					= config.localtenants;
+		}
+
 		// Confirm tenant mode for adding service member
 		if(apiutil.isSafeEntity(config.confirmtenant) && 'boolean' == typeof config.confirmtenant){
 			data.confirmtenant					= config.confirmtenant;
@@ -758,6 +765,11 @@ var R3ApiConfig = (function()
 		return this.loadedConfig.k2hr3admin;
 	};
 
+	proto.isLocalTenants = function()
+	{
+		return this.loadedConfig.localtenants;
+	};
+
 	proto.isConfirmTenantForService = function()
 	{
 		return this.loadedConfig.confirmtenant;