k2hr3-api 1.0.10 → 1.0.12

package/config/keystone_v2.json

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -34,7 +34,10 @@
 }
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/config/keystone_v3.json

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -34,7 +34,10 @@
 }
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/basicipcheck.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -367,7 +367,10 @@ exports.checkAddressesAlive = function(ipdatas, chkipconfig)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/cacerts.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -61,7 +61,10 @@ function loadCACert()
 exports.ca = loadCACert();
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/dbglogging.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -142,7 +142,10 @@ exports.dump = function(obj)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/dummyuserapi.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -757,7 +757,10 @@ exports.getUserTenantList = function(unscopedtoken, userid, callback)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/ipwatch.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -370,7 +370,10 @@ exports.watchAddressesAlive = function(oneshotCB)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3acrutil.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -508,9 +508,11 @@ exports.getACRSendVerify = function(token, user, passwd, tenant, verifyurl, call
 	return rawACRSendVerify(token, user, passwd, tenant, verifyurl, callback);
 };
 
-
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3apiutil.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -1485,7 +1485,10 @@ exports.checkMakeDir = function(path)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3cliutil.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -182,7 +182,10 @@ exports.inputObjectData = function(is_string, callback)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3config.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -805,7 +805,10 @@ exports.chkipType	= chkipconfigType;
 exports.r3ApiConfig	= R3ApiConfig;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3cryptutil.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2018 Yahoo! Japan Corporation.
+ * Copyright 2018 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -243,7 +243,10 @@ exports.r3Gunzip = function(bin, callback)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3dkc.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -11565,7 +11565,10 @@ exports.getAllUsers = function()
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3extdata.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2018 Yahoo! Japan Corporation.
+ * Copyright 2018 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -189,7 +189,10 @@ var ExtdataProcess = (function()
 exports.extdataProcess = ExtdataProcess;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3keys.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -224,7 +224,10 @@ exports.getK2hr3Keys = function(user, tenant, service)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3resutil.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -91,7 +91,10 @@ exports.errResponse = function(req, res, status, msgbody, strType)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3template.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -6914,7 +6914,10 @@ var K2hr3TemplateEngine = (function()
 exports.r3template = K2hr3TemplateEngine;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3tokens.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -2703,7 +2703,10 @@ exports.checkToken = function(req, is_scoped, is_user)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k2hr3userdata.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2018 Yahoo! Japan Corporation.
+ * Copyright 2018 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -37,7 +37,7 @@ var	EmptyScriptContents = [
 	'#',
 	'# K2HR3 Frontend Web Application',
 	'#',
-	'# Copyright(C) 2018 Yahoo! Japan Corporation.',
+	'# Copyright(C) 2018 Yahoo Japan Corporation.',
 	'#',
 	'# K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers',
 	'# common management information for the cloud.',
@@ -303,7 +303,10 @@ var UserdataProcess = (function()
 exports.userdataProcess = UserdataProcess;
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/k8soidc.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -37,12 +37,13 @@
 //
 //	{
 //		'k8soidc': {
-//			'audience':		'<client id for open id connect>',
-//			'issuer':		'<issue url for open id connect>',
-//			'usernamekey':	'<user name key name in token>',
-//			'k8sapi_url':	'<kubernetes api url>',
-//			'k8s_ca_path':	'<CA cert file path for kubernetes api url>',
-//			'k8s_sa_token':	'<Service account token for kubernetes>'
+//			'audience':			'<client id for open id connect>',
+//			'issuer':			'<issue url for open id connect>',
+//			'usernamekey':		'<user name key name in token>',
+//			'k8sapi_url':		'<kubernetes api url>',
+//			'k8s_ca_path':		'<CA cert file path for kubernetes api url>',
+//			'k8s_sa_token':		'<Service account token for kubernetes>'
+//			'unscopedtoken_exp':'<Expire limit for unscoped Token created from oidc>'
 //		}
 //	}
 //
@@ -75,6 +76,12 @@
 //		API. If you're running the K2HR3 API inside a Kubernetes pod,
 //		it's '/var/run/secrets/kubernetes.io/serviceaccount/token'.
 //		This key and value are required.
+//	[unscopedtoken_exp]
+//		Specifies the expiration date of the Unscoped token created by
+//		OIDC. This value is specified in seconds(s).
+//		If this value does not exist or is less than or equal to 0,
+//		the default value will be used. The default value is the same
+//		as the OIDC token expiration date.
 //
 //------------------------------------------------------------------------
 
@@ -115,6 +122,7 @@ var	oidc_username		= null;
 var	k8s_api_url			= null;
 var	k8s_ca_cert			= null;
 var	k2hr3_k8s_sa_token	= null;
+var	unscopedtoken_exp	= 0;			// Expire limit for unscoped Token created from oidc(default is 0 means as same as oidc limit)
 
 (function()
 {
@@ -123,12 +131,17 @@ var	k2hr3_k8s_sa_token	= null;
 	oidc_config	= apiConf.getOtherObject('k8soidc');
 
 	if(apiutil.isSafeEntity(oidc_config)){
-		oidc_audience	= oidc_config.audience;
-		oidc_issuer		= oidc_config.issuer;
-		oidc_username	= oidc_config.usernamekey;
-		k8s_api_url		= oidc_config.k8sapi_url;
-		k8s_ca_cert		= oidc_config.k8s_ca_path;
-		k2hr3_k8s_sa_token = fs.readFileSync(oidc_config.k8s_sa_token, 'utf8');
+		oidc_audience		= oidc_config.audience;
+		oidc_issuer			= oidc_config.issuer;
+		oidc_username		= oidc_config.usernamekey;
+		k8s_api_url			= oidc_config.k8sapi_url;
+		k8s_ca_cert			= oidc_config.k8s_ca_path;
+		k2hr3_k8s_sa_token	= fs.readFileSync(oidc_config.k8s_sa_token, 'utf8');
+
+		// unscopedtoken_exp must be number
+		if(apiutil.isSafeEntity(oidc_config.unscopedtoken_exp) && !isNaN(oidc_config.unscopedtoken_exp) && 0 < oidc_config.unscopedtoken_exp){
+			unscopedtoken_exp = oidc_config.unscopedtoken_exp;
+		}
 	}
 }());
 
@@ -186,8 +199,12 @@ function rawCreateUserTokenByK8sUser(user, user_id, tenant, expire_limit)
 	if(!apiutil.isSafeString(tenant)){
 		tenant = null;
 	}
-	if(!apiutil.isSafeEntity(expire_limit) || isNaN(expire_limit)){							// expire_limit must be number or null(undefined)
-		expire_limit = 24 * 60 * 60;														// default 24H
+	if(0 < unscopedtoken_exp){
+		expire_limit = unscopedtoken_exp;													// override expire limit by config
+	}else{
+		if(!apiutil.isSafeEntity(expire_limit) || isNaN(expire_limit) || expire_limit <= 0){
+			expire_limit = 24 * 60 * 60;													// default 24H
+		}
 	}
 
 	var	dkcobj			= k2hr3.getK2hdkc(true, false);										// use permanent object(need to clean)
@@ -799,7 +816,15 @@ function rawGetUserUnscopedTokenK8s(token, callback)
 
 		// core seed
 		var	user_id_uuid4	= apiutil.cvtNumberStringToUuid4(userid, 10);		// payload.sub is decimal string
-		var	expire_limit	= (new Date(payload['exp'] * 1000)).toISOString();	// payload['exp'] is a unixtime, convert to UTC ISO 8601
+		var	expire_limit;
+		if(apiutil.isSafeEntity(payload['exp']) && !isNaN(payload['exp'])){
+			expire_limit	= payload['exp'] - apiutil.getUnixtime();
+			if(expire_limit <= 0){
+				expire_limit= 24 * 60 * 60;										// default 24H
+			}
+		}else{
+			expire_limit	= 24 * 60 * 60;										// default 24H
+		}
 
 		// create token
 		var	resobj			= rawCreateUserTokenByK8sUser(lower_username, user_id_uuid4, null, expire_limit);

package/lib/openstackapiv2.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -756,7 +756,10 @@ exports.getUserTenantList = function(unscopedtoken, userid, callback)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/openstackapiv3.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -1023,7 +1023,10 @@ exports.getUserTenantList = function(unscopedtoken, userid, callback)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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/lib/openstackep.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -544,7 +544,10 @@ exports.getKeystoneEndpoint = function(callback, is_v3, is_test, timeout)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * 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
  */