cbsecurity updates

coldbox-modules · Dec 14, 2024 · fa8e173 · fa8e173
1 parent 952e273
commit fa8e173
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -54,20 +54,24 @@ component {
 			"notificationsFrom" : getSystemSetting( "STACHEBOX_NOTIFICATIONS_FROM", "no-reply@stachebox.io" ),
 			// The cbSecurity configuration overrides for this module
 			"cbsecurity" : {
-				"userService" : "UserService@stachebox",
-				// Module Relocation when an invalid access is detected, instead of each rule declaring one.
-				"invalidAuthenticationEvent" 	: "stachebox:api.v1.BaseAPIHandler.onAuthenticationFailure",
-				// Default Auhtentication Action: override or redirect when a user has not logged in
-				"defaultAuthenticationAction"	: "override",
-				// Module override event when an invalid access is detected, instead of each rule declaring one.
-				"invalidAuthorizationEvent"		: "stachebox:api.v1.BaseAPIHandler.onAuthorizationFailure",
-				// Default Authorization Action: override or redirect when a user does not have enough permissions to access something
-				"defaultAuthorizationAction"	: "override",
-				"validator" : "JWTService@cbsecurity",
-				// You can define your security rules here
-				"rules"							: [],
+				"authentication" : {
+					"userService" : "UserService@stachebox"
+				},
+				"firewall" : {
+					// Module Relocation when an invalid access is detected, instead of each rule declaring one.
+					"invalidAuthenticationEvent" 	: "stachebox:api.v1.BaseAPIHandler.onAuthenticationFailure",
+					// Default Auhtentication Action: override or redirect when a user has not logged in
+					"defaultAuthenticationAction"	: "override",
+					// Module override event when an invalid access is detected, instead of each rule declaring one.
+					"invalidAuthorizationEvent"		: "stachebox:api.v1.BaseAPIHandler.onAuthorizationFailure",
+					// Default Authorization Action: override or redirect when a user does not have enough permissions to access something
+					"defaultAuthorizationAction"	: "override"
+				},
 				"jwt" : {
-					"expiration"       : 20
+					"validator" : "JWTService@cbsecurity",
+					"expiration"       : 120,
+					"enableRefreshTokens" : true,
+					"enableAutoRefreshValidator" : true
 				}
 			},
 			// the cbauth overrides for this module

diff --git a/interceptors/Stachebox.cfc b/interceptors/Stachebox.cfc
@@ -53,7 +53,7 @@ component{
 
 	function ensureUserIndex(){
 
-		if( findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.userService ) && !searchClient.indexExists( variables.moduleSettings.usersIndex ) ){
+		if( findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.authentication.userService ) && !searchClient.indexExists( variables.moduleSettings.usersIndex ) ){
 			getInstance( "IndexBuilder@cbelasticsearch" )
 				.new(
 					name=variables.moduleSettings.usersIndex,
@@ -66,7 +66,7 @@ component{
 	}
 
 	function ensureTokenReporter(){
-		if( findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.userService ) ){
+		if( findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.authentication.userService ) ){
 			var reporterUsername = moduleSettings.tokenReporter;
 			if( isNull( userService.retrieveUserByUsername( reporterUsername ) ) ){
 				var logoFile = expandPath( '/stachebox/includes/images/stachebox-icon.png' );
@@ -89,7 +89,7 @@ component{
 
 	function ensureDefaultAdminUser(){
 		if(
-			findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.userService )
+			findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.authentication.userService )
 			&&
 			len( variables.moduleSettings.adminEmail )
 			&& isNull( userService.retrieveUserByUsername( variables.moduleSettings.adminEmail ) )
@@ -141,7 +141,7 @@ component{
 		var javaURI = createObject( "java", "java.net.URI" );
 		var basePath = javaURI.create( event.getSESBaseURL() ).getPath();
 		var stacheboxBasePath = basePath & "stachebox";
-		var loginUrl = !findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.userService )
+		var loginUrl = !findNoCase( "@stachebox", variables.moduleSettings.cbsecurity.authentication.userService )
 							? cbSecuritySettings.keyExists( "invalidAuthenticationEvent" ) ? cbSecuritySettings.invalidAuthenticationEvent : stacheboxBasePath & "/login"
 							: stacheboxBasePath & "/login";
 
@@ -155,7 +155,7 @@ component{
 				"isStandalone" : moduleSettings.isStandalone,
 				"logIndexPattern" : moduleSettings.logIndexPattern,
 				"beatsIndexPattern" : moduleSettings.beatsIndexPattern,
-				"internalSecurity" :  javacast( "boolean", findNoCase( "@stachebox",  moduleSettings.cbsecurity.userService ) ),
+				"internalSecurity" :  javacast( "boolean", findNoCase( "@stachebox",  moduleSettings.cbsecurity.authentication.userService ) ),
 				"loginURL" :  loginUrl,
 				"i18nLocales" : locales,
 				"projects" : settingServce.getByName( "projects" ).getMemento().value.reduce(