k2hr3-api 1.0.24 → 1.0.26

package/tests/manual_tenant_gethead.js

@@ -0,0 +1,268 @@
+/*
+ * K2HR3 REST API
+ *
+ * Copyright 2023 Yahoo Japan Corporation.
+ *
+ * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
+ * common management information for the cloud.
+ * K2HR3 can dynamically manage information as "who", "what", "operate".
+ * These are stored as roles, resources, policies in K2hdkc, and the
+ * client system can dynamically read and modify these information.
+ *
+ * For the full copyright and license information, please view
+ * the license file that was distributed with this source code.
+ *
+ * AUTHOR:   Takeshi Nakatani
+ * CREATE:   Mon Jun 3 2023
+ * REVISION:
+ *
+ */
+
+'use strict';
+
+var	http		= require('http');
+var	https		= require('https');
+
+var	cacerts		= require('../lib/cacerts');
+var	apiutil		= require('../lib/k2hr3apiutil');
+var cliutil		= require('../lib/k2hr3cliutil');
+
+// Debug logging objects
+var r3logger	= require('../lib/dbglogging');
+
+//
+// Hostname and port from env
+//
+var hostname = apiutil.getSafeString(process.env.APIHOST);
+var	hostport = apiutil.getSafeString(process.env.APIPORT);
+var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
+
+//
+// Request API for test
+//
+function getV1Tenant(token, name, is_expand)
+{
+	var	path;
+	var	urlarg;
+	if(apiutil.isSafeString(name)){
+		path	= '/v1/tenant/' + name;
+		urlarg	= '';
+	}else{
+		path	= '/v1/tenant';
+		if(is_expand){
+			urlarg = encodeURI('?expand=true');
+		}else{
+			urlarg = encodeURI('?expand=false');
+		}
+	}
+
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':					hostname,
+		'port':					hostport,
+		'path': 				path + urlarg,
+		'method':				'GET',
+		'headers':				headers
+	};
+
+	r3logger.dlog('request options   = ' + JSON.stringify(options));
+	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
+
+	var	httpobj;
+	if(is_https){
+		if(null !== cacerts.ca){
+			options.ca = cacerts.ca;
+		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
+		options.agent	= new https.Agent(options);
+		httpobj			= https;
+	}else{
+		options.agent	= new http.Agent(options);
+		httpobj			= http;
+	}
+
+	var	req	= httpobj.request(options, function(res)
+	{
+		var	response = '';
+		console.log('RESPONSE CODE = ' + res.statusCode);
+		r3logger.dlog('response status   = ' + res.statusCode);
+		r3logger.dlog('response header   = ' + JSON.stringify(res.headers));
+		res.setEncoding('utf8');
+
+		res.on('data', function (chunk)
+		{
+			r3logger.dlog('response chunk    = ' + chunk);
+			response += chunk;
+		});
+
+		res.on('end', function(result)					// eslint-disable-line no-unused-vars
+		{
+			r3logger.mlog(r3logger.dump(response));		// response is object(or not)
+			console.log('RESPONSE BODY = ' + JSON.stringify(response));
+			process.exit(0);
+		});
+	});
+
+	req.on('error', function(e)
+	{
+		r3logger.elog('problem with request: ' + e.message);
+	});
+	req.end();
+}
+
+function headV1Tenant(token, name)
+{
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/tenant/' + name,
+		'method':			'HEAD',
+		'headers':			headers
+	};
+
+	r3logger.dlog('request options   = ' + JSON.stringify(options));
+	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
+
+	var	httpobj;
+	if(is_https){
+		if(null !== cacerts.ca){
+			options.ca = cacerts.ca;
+		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
+		options.agent	= new https.Agent(options);
+		httpobj			= https;
+	}else{
+		options.agent	= new http.Agent(options);
+		httpobj			= http;
+	}
+
+	var	req	= httpobj.request(options, function(res)
+	{
+		var	response = '';
+		console.log('RESPONSE CODE = ' + res.statusCode);
+		r3logger.dlog('response status   = ' + res.statusCode);
+		r3logger.dlog('response header   = ' + JSON.stringify(res.headers));
+		res.setEncoding('utf8');
+
+		res.on('data', function (chunk)
+		{
+			r3logger.dlog('response chunk    = ' + chunk);
+			response += chunk;
+		});
+
+		res.on('end', function(result)					// eslint-disable-line no-unused-vars
+		{
+			r3logger.mlog(r3logger.dump(response));		// response is object(or not)
+			console.log('RESPONSE BODY = ' + JSON.stringify(response));
+			process.exit(0);
+		});
+	});
+
+	req.on('error', function(e)
+	{
+		r3logger.elog('problem with request: ' + e.message);
+	});
+	req.end();
+}
+
+//
+// run
+//
+cliutil.getConsoleInput('Method(GET/HEAD)                     : ', true, false, function(isbreak, method)
+{
+	if(isbreak){
+		process.exit(0);
+	}
+	var	_method = method;
+
+	cliutil.getConsoleInput('Unscoped(or Scoped) user token       : ', true, false, function(isbreak, token)
+	{
+		if(isbreak){
+			process.exit(0);
+		}
+		var	_token = token;
+
+		if(apiutil.compareCaseString('get', _method)){
+			cliutil.getConsoleInput('Tenant name(null is get tenant list) : ', true, false, function(isbreak, tenant)
+			{
+				if(isbreak){
+					process.exit(0);
+				}
+
+				if(apiutil.isSafeString(tenant)){
+					var	_tenant = apiutil.getSafeString(tenant);
+
+					//
+					// Run
+					//
+					getV1Tenant(_token, _tenant, false);
+
+				}else{
+					cliutil.getConsoleInput('Expand tenant list(yes(default)/no)  : ', true, false, function(isbreak, expand)
+					{
+						if(isbreak){
+							process.exit(0);
+						}
+
+						var	_is_expand;
+						if('' === apiutil.getSafeString(expand) || apiutil.compareCaseString('null', apiutil.getSafeString(expand))){
+							_is_expand = true;
+						}else if(apiutil.compareCaseString('yes', apiutil.getSafeString(expand)) || apiutil.compareCaseString('true', apiutil.getSafeString(expand))){
+							_is_expand = true;
+						}else if(apiutil.compareCaseString('no', apiutil.getSafeString(expand)) || apiutil.compareCaseString('false', apiutil.getSafeString(expand))){
+							_is_expand = false;
+						}else{
+							console.log('function expand must be empty or yes(true) or no(false) : ' + expand);
+							process.exit(0);
+						}
+
+						//
+						// Run
+						//
+						getV1Tenant(_token, null, _is_expand);
+					});
+				}
+			});
+
+		}else if(apiutil.compareCaseString('head', _method)){
+			cliutil.getConsoleInput('Tenant name                          : ', true, false, function(isbreak, tenant)
+			{
+				if(isbreak){
+					process.exit(0);
+				}
+
+				if(!apiutil.isSafeString(tenant)){
+					console.log('method HEAD must specify tenant name');
+					process.exit(0);
+				}
+				var	_tenant = apiutil.getSafeString(tenant);
+
+				//
+				// Run
+				//
+				headV1Tenant(_token, _tenant);
+			});
+		}else{
+			console.log('method must be GET or HEAD : ' + _method);
+			process.exit(0);
+		}
+	});
+});
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
+ */

package/tests/manual_tenant_postput.js

@@ -0,0 +1,293 @@
+/*
+ * K2HR3 REST API
+ *
+ * Copyright 2023 Yahoo Japan Corporation.
+ *
+ * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
+ * common management information for the cloud.
+ * K2HR3 can dynamically manage information as "who", "what", "operate".
+ * These are stored as roles, resources, policies in K2hdkc, and the
+ * client system can dynamically read and modify these information.
+ *
+ * For the full copyright and license information, please view
+ * the license file that was distributed with this source code.
+ *
+ * AUTHOR:   Takeshi Nakatani
+ * CREATE:   Mon Jun 3 2023
+ * REVISION:
+ *
+ */
+
+'use strict';
+
+var	http		= require('http');
+var	https		= require('https');
+
+var	cacerts		= require('../lib/cacerts');
+var	apiutil		= require('../lib/k2hr3apiutil');
+var cliutil		= require('../lib/k2hr3cliutil');
+
+// Debug logging objects
+var r3logger	= require('../lib/dbglogging');
+
+//
+// Hostname and port from env
+//
+var hostname = apiutil.getSafeString(process.env.APIHOST);
+var	hostport = apiutil.getSafeString(process.env.APIPORT);
+var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
+
+//
+// Request API for test
+//
+function postputV1Tenant(method, token, is_create, name, desc, display, users, id)
+{
+	var	strbody	= '';
+	var	headers	= {
+		'Content-Type':		'application/json',
+		'X-Auth-Token':		token
+	};
+	var	options	= {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/tenant',
+		'method':			method
+	};
+
+	var	path;
+	if(apiutil.compareCaseString('post', method)){
+		var	body;
+		if(is_create){
+			body = {
+				'tenant': {
+					'name':			name,
+					'desc':			desc,
+					'display':		display,
+					'users':		users
+				}
+			};
+			path = '/v1/tenant';
+		}else{
+			body = {
+				'tenant': {
+					'id':			id,
+					'desc':			desc,
+					'display':		display,
+					'users':		users,
+				}
+			};
+			path = '/v1/tenant/' + name;
+		}
+
+		strbody						= JSON.stringify(body);
+		headers['Content-Length']	= strbody.length;
+		options.headers				= headers;
+		options.path				= path;
+
+	}else if(apiutil.compareCaseString('put', method)){
+		var urlarg		= '';
+		var	already_set	= false;
+
+		if(is_create){
+			path		= '/v1/tenant';
+			urlarg		= '?name=' + name;
+			already_set	= true;
+		}else{
+			urlarg		= '?id=' + id;
+			path		= '/v1/tenant/' + name;
+		}
+		if('' === desc || apiutil.isSafeString(desc)){
+			urlarg		+= already_set ? '&desc=' : '?desc=';
+			urlarg		+= desc;
+			already_set	= true;
+		}
+		if('' === display || apiutil.isSafeString(display)){
+			urlarg		+= already_set ? '&display=' : '?display=';
+			urlarg		+= display;
+			already_set	= true;
+		}
+		if(!apiutil.isEmptyArray(users)){
+			urlarg		+= already_set ? '&users=' : '?users=';
+			urlarg		+= JSON.stringify(users);
+			already_set	= true;
+		}
+
+		headers['Content-Length']	= 0;
+		options.headers				= headers;
+		options.path				= path + encodeURI(urlarg);
+
+	}else{
+		console.log('method must be POST or PUT : ' + method);
+		process.exit(0);
+	}
+
+	r3logger.dlog('request options   = ' + JSON.stringify(options));
+	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
+	r3logger.dlog('request body      = ' + strbody);
+
+	var	httpobj;
+	if(is_https){
+		if(null !== cacerts.ca){
+			options.ca = cacerts.ca;
+		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
+		options.agent	= new https.Agent(options);
+		httpobj			= https;
+	}else{
+		options.agent	= new http.Agent(options);
+		httpobj			= http;
+	}
+
+	var	req	= httpobj.request(options, function(res)
+	{
+		var	response = '';
+		console.log('RESPONSE CODE = ' + res.statusCode);
+		r3logger.dlog('response status   = ' + res.statusCode);
+		r3logger.dlog('response header   = ' + JSON.stringify(res.headers));
+		res.setEncoding('utf8');
+
+		res.on('data', function (chunk)
+		{
+			r3logger.dlog('response chunk    = ' + chunk);
+			response += chunk;
+		});
+
+		res.on('end', function(result)					// eslint-disable-line no-unused-vars
+		{
+			r3logger.mlog(r3logger.dump(response));		// response is object(or not)
+			console.log('RESPONSE BODY = ' + JSON.stringify(response));
+			process.exit(0);
+		});
+	});
+
+	req.on('error', function(e)
+	{
+		r3logger.elog('problem with request: ' + e.message);
+	});
+
+	// write data to request body
+	if('' !== strbody){
+		req.write(strbody);
+	}
+	req.end();
+}
+
+//
+// run
+//
+cliutil.getConsoleInput('Method(POST/PUT)                                         : ', true, false, function(isbreak, method)
+{
+	if(isbreak){
+		process.exit(0);
+	}
+
+	var	_method;
+	if(apiutil.compareCaseString('post', method)){
+		_method	= 'POST';
+	}else if(apiutil.compareCaseString('put', method)){
+		_method	= 'PUT';
+	}else{
+		console.log('method must be POST or PUT : ' + method);
+		process.exit(0);
+	}
+
+	cliutil.getConsoleInput('Unscoped(or Scoped) user token                           : ', true, false, function(isbreak, token)
+	{
+		if(isbreak){
+			process.exit(0);
+		}
+		var	_token = token;
+
+		cliutil.getConsoleInput('Create or Update tenant(create(default)/update)          : ', true, false, function(isbreak, mode)
+		{
+			if(isbreak){
+				process.exit(0);
+			}
+
+			var	_is_create;
+			if('' === apiutil.getSafeString(mode) || apiutil.compareCaseString('null', apiutil.getSafeString(mode))){
+				_is_create = true;
+			}else if(apiutil.compareCaseString('create', apiutil.getSafeString(mode))){
+				_is_create = true;
+			}else if(apiutil.compareCaseString('update', apiutil.getSafeString(mode))){
+				_is_create = false;
+			}else{
+				console.log('function mode must be empty or create or update : ' + mode);
+				process.exit(0);
+			}
+
+			cliutil.getConsoleInput('tenant name(if not specify, add prefix local@)           : ', true, false, function(isbreak, name)
+			{
+				if(isbreak){
+					process.exit(0);
+				}
+				var	_name = name;
+
+				cliutil.getConsoleInput('tenant description(allow null)                           : ', true, false, function(isbreak, desc)
+				{
+					if(isbreak){
+						process.exit(0);
+					}
+					var	_desc = desc;
+
+					cliutil.getConsoleInput('tenant display name(allow null)                          : ', true, false, function(isbreak, display)
+					{
+						if(isbreak){
+							process.exit(0);
+						}
+						var	_display = display;
+
+						cliutil.getConsoleInput('tenant users(input user name separate with ,)            : ', true, false, function(isbreak, users)
+						{
+							if(isbreak){
+								process.exit(0);
+							}
+
+							var	_users = Array();
+							var	tmparr = apiutil.getSafeString(users).split(',');
+							for(var cnt = 0; cnt < tmparr.length; ++cnt){
+								var	tmpstr = apiutil.getSafeString(tmparr[cnt].trim());
+								if('' !== tmpstr){
+									_users.push(tmpstr);
+								}
+							}
+							if(apiutil.isEmptyArray(_users)){
+								_users = null;
+							}
+
+							if(_is_create){
+								//
+								// Create mode
+								//
+								postputV1Tenant(_method, _token, _is_create, _name, _desc, _display, _users, null);
+
+							}else{
+								//								// Update mode
+								//
+								cliutil.getConsoleInput('tenant id                                                : ', true, false, function(isbreak, id)
+								{
+									if(isbreak){
+										process.exit(0);
+									}
+									var	_id = id;
+
+									// run
+									postputV1Tenant(_method, _token, _is_create, _name, _desc, _display, _users, _id);
+								});
+							}
+						});
+					});
+				});
+			});
+		});
+	});
+});
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
+ */

package/tests/manual_test.sh

@@ -49,6 +49,9 @@ COMMANDS="
 	role_delete
 	role_gethead
 	role_postput
+	tenant_delete
+	tenant_gethead
+	tenant_postput
 	service_postput
 	service_gethead
 	service_delete
@@ -72,7 +75,7 @@ PrintUsage()
 {
 	echo "Usage:   $1 [--apihost(-a) hostname]"
 	echo "            [--apiport(-p) port]"
-	echo "            [--sec(-s) | --https]"
+	echo "            [--https | --http]"
 	echo "            [--debuglevel(-d) DBG/MSG/WARN/ERR/(custom debug level)]"
 	echo "            <Command>"
 	echo ""
@@ -102,6 +105,10 @@ PrintUsage()
 	echo "         role_gethead           : Get(Head) role(v1)"
 	echo "         role_delete            : Delete role(v1)"
 	echo ""
+	echo "         tenant_postput         : Post(Put) tenant(v1)"
+	echo "         tenant_gethead         : Get(Head) tenant(v1)"
+	echo "         tenant_delete          : Delete tenant(v1)"
+	echo ""
 	echo "         service_postput        : Post(Put) service(v1)"
 	echo "         service_gethead        : Get(head) service(v1)"
 	echo "         service_delete         : Delete service(v1)"
@@ -174,7 +181,7 @@ while [ $# -ne 0 ]; do
 		#
 		# API PORT
 		#
-		if [ -n "${APIPORT}" ]; then
+		if [ "${APIPORT}" -ne 0 ]; then
 			echo "[ERROR] already specified --apiport option"
 			exit 1
 		fi
@@ -192,13 +199,20 @@ while [ $# -ne 0 ]; do
 		fi
 		APIPORT="$1"
 
-	elif [ "$1" = "-s" ] || [ "$1" = "-S" ] || [ "$1" = "--sec" ] || [ "$1" = "--SEC" ] || [ "$1" = "--https" ] || [ "$1" = "--HTTPS" ]; then
+	elif [ "$1" = "--https" ] || [ "$1" = "--HTTPS" ]; then
 		if [ -n "${HTTPS_ENV}" ]; then
-			echo "[ERROR] already specified --sec(-s) or --https option"
+			echo "[ERROR] already specified --https or --http option"
 			exit 1
 		fi
 		HTTPS_ENV="yes"
 
+	elif [ "$1" = "--http" ] || [ "$1" = "--HTTP" ]; then
+		if [ -n "${HTTPS_ENV}" ]; then
+			echo "[ERROR] already specified --https or --http option"
+			exit 1
+		fi
+		HTTPS_ENV="no"
+
 	elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--debuglevel" ] || [ "$1" = "--DEBUGLEVEL" ]; then
 		#
 		# DEBUG option
@@ -291,7 +305,7 @@ fi
 #
 # Check HTTPS
 #
-if [ -n "${HTTPS_ENV}" ]; then
+if [ -z "${HTTPS_ENV}" ]; then
 	HTTPS_ENV="yes"
 fi
 
@@ -302,7 +316,7 @@ if [ -z "${APIHOST}" ]; then
 	APIHOST="$(hostname | tr -d '\n')"
 fi
 if [ "${APIPORT}" -eq 0 ]; then
-	if [ -n "${HTTPS_ENV}" ]; then
+	if [ "${HTTPS_ENV}" = "yes" ]; then
 		APIPORT=443
 	else
 		APIPORT=3000
@@ -320,7 +334,7 @@ if [ "${DEBUG_ENV_LEVEL}" -ge 4 ]; then
 	echo "***************"
 fi
 
-if ! NODE_PATH="${NODE_PATH}" NODE_DEBUG="${DEBUG_ENV_PARAM}" APIHOST="${APIHOST}" APIPORT="${APIPORT}" HTTPS_ENV="${HTTPS_ENV}" node "${DEBUG_OPTION}" "tests/${CMD_PREFIX}${COMMAND}${CMD_SUFFIX}"; then
+if ! /bin/sh -c "NODE_PATH=${NODE_PATH} NODE_DEBUG=${DEBUG_ENV_PARAM} APIHOST=${APIHOST} APIPORT=${APIPORT} HTTPS_ENV=${HTTPS_ENV} node ${DEBUG_OPTION} tests/${CMD_PREFIX}${COMMAND}${CMD_SUFFIX}"; then
 	EXIT_CODE="$?"
 	echo "[ERROR] Failed to run command with exit code : ${EXIT_CODE}"
 	exit "${EXIT_CODE}"

package/tests/manual_userdata_get.js

@@ -76,6 +76,7 @@ function getV1UserData(registerpath, is_gzip)
 		if(null !== cacerts.ca){
 			options.ca = cacerts.ca;
 		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
 		options.agent	= new https.Agent(options);
 		httpobj			= https;
 	}else{

package/tests/manual_usertoken_gethead.js

@@ -65,6 +65,7 @@ function headV1UserTokens(token, method)
 		if(null !== cacerts.ca){
 			options.ca = cacerts.ca;
 		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
 		options.agent	= new https.Agent(options);
 		httpobj			= https;
 	}else{

package/tests/manual_usertoken_postput.js

@@ -131,6 +131,7 @@ function postV1UserTokens(method, token, othertoken, user, passwd, tenant)
 		if(null !== cacerts.ca){
 			options.ca = cacerts.ca;
 		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
 		options.agent	= new https.Agent(options);
 		httpobj			= https;
 	}else{

package/tests/manual_version_get.js

@@ -64,6 +64,7 @@ function getV1Version(is_top)
 		if(null !== cacerts.ca){
 			options.ca = cacerts.ca;
 		}
+		options.rejectUnauthorized	= false;			// always insecure for this manual test
 		options.agent	= new https.Agent(options);
 		httpobj			= https;
 	}else{

package/tests/test.sh

@@ -45,6 +45,7 @@ COMMANDS="
 	resource
 	policy
 	role
+	tenant
 	service
 	acr
 	userdata
@@ -82,6 +83,7 @@ PrintUsage()
 	echo "  resource            : Resource API test"
 	echo "  policy              : Policy API test"
 	echo "  role                : Role API test"
+	echo "  tenant              : Tenant API test"
 	echo "  service             : Service API test"
 	echo "  acr                 : Accessing Cross Role(ACR) API test"
 	echo "  userdata            : Get userdata for openstack API test"