ColdBox 8 support

Author: lmajano

changelog.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - BoxLang certification
 - Github Actions updates
+- ColdBox 8 Support and certification
 
 ## [3.4.3] - 2024-05-09
 

interceptors/Security.cfc

@@ -200,11 +200,11 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	/**
 	 * Listen to module loadings, so we can do module rule registrations
 	 *
-	 * @event        
+	 * @event
 	 * @interceptData
-	 * @rc           
-	 * @prc          
-	 * @buffer       
+	 * @rc
+	 * @prc
+	 * @buffer
 	 */
 	function postModuleLoad( event, interceptData, rc, prc, buffer ){
 		// Is this a cbSecurity Module & not registered
@@ -223,11 +223,11 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	/**
 	 * Listen to module unloadings, so we can do module rule cleanups
 	 *
-	 * @event        
+	 * @event
 	 * @interceptData
-	 * @rc           
-	 * @prc          
-	 * @buffer       
+	 * @rc
+	 * @prc
+	 * @buffer
 	 */
 	function postModuleUnload( event, interceptData, rc, prc, buffer ){
 		// Is the module registered?
@@ -246,11 +246,11 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	/**
 	 * Our firewall kicks in at preProcess
 	 *
-	 * @event        
+	 * @event
 	 * @interceptData
-	 * @rc           
-	 * @prc          
-	 * @buffer       
+	 * @rc
+	 * @prc
+	 * @buffer
 	 */
 	function preProcess( event, interceptData, rc, prc, buffer ){
 		// Add SecureView() into the requestcontext
@@ -290,9 +290,9 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	/**
 	 * Process handler annotation based security rules.
 	 *
-	 * @event        
+	 * @event
 	 * @interceptData
-	 * @currentEvent 
+	 * @currentEvent
 	 */
 	function processAnnotationRules(
 		required event,
@@ -777,19 +777,16 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 	 * @event The event object
 	 */
 	private function saveSecuredUrl( required event ){
-		var securedUrl = arguments.event.getFullUrl();
-
-		if ( arguments.event.isSES() ) {
-			securedURL = arguments.event.buildLink(
-				to          = event.getCurrentRoutedURL(),
-				queryString = CGI.QUERY_STRING,
-				translate   = false
-			);
-		}
+		// Create secured URL
+		var securedURL = arguments.event.buildLink(
+			to          : event.getCurrentRoutedURL(),
+			queryString : CGI.QUERY_STRING,
+			translate   : false
+		);
 
 		// Flash it and place it in RC as well
-		flash.put( "_securedUrl", securedUrl );
-		arguments.event.setValue( "_securedUrl", securedUrl );
+		flash.put( "_securedUrl", securedURL );
+		arguments.event.setValue( "_securedUrl", securedURL );
 	}
 
 	/**

interceptors/SecurityHeaders.cfc

@@ -104,7 +104,7 @@ component extends="coldbox.system.Interceptor" {
 		if ( variables.settings.securityHeaders.secureSSLRedirects.enabled && !arguments.event.isSSL() ) {
 			// Debug
 			if ( log.canDebug() ) {
-				log.debug( "Non-SSL URI detected (#event.getFullUrl()#), redirecting in ssl" );
+				log.debug( "Non-SSL URI detected (#event.getUrl()#), redirecting in ssl" );
 			}
 			variables.dbLogger.log(
 				action   : "redirect",
@@ -113,7 +113,7 @@ component extends="coldbox.system.Interceptor" {
 				host     : variables.cbSecurity.getRealHost(),
 				userId   : variables.cbSecurity.isLoggedIn() ? variables.cbSecurity.getUser().getId() : ""
 			);
-			relocate( url: arguments.event.getFullUrl(), ssl: true );
+			relocate( url: arguments.event.getUrl(), ssl: true );
 			return;
 		}