change exception type and test cases label

Author: michaeloffner

.github/workflows/main.yml

@@ -72,7 +72,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: guard-lex-${{ matrix.lucee.version }}
+          name: esapi-lex-${{ matrix.lucee.version }}
           path: target/*.lex
 
       - name: Checkout Lucee
@@ -91,7 +91,7 @@ jobs:
           luceeVersionQuery: ${{ matrix.lucee.query }}
           extensionDir: ${{ github.workspace }}/target
         env:
-          testLabels: guard
+          testLabels: esapi
           testAdditional: ${{ github.workspace }}/tests
           LUCEE_ADMIN_PASSWORD: admin
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.lucee</groupId>
     <artifactId>esapi-extension</artifactId>
-    <version>3.0.0.9-ALPHA</version>
+    <version>3.0.0.10-ALPHA</version>
     <packaging>pom</packaging>
     <name>Guard Extension</name>
 

source/java/src/org/lucee/extension/guard/util/Canonicalize.java

@@ -87,8 +87,10 @@ private static boolean isSafe(char c) {
 	 * @param throwOnMultiple Throw exception if multiple encoding detected
 	 * @return Canonicalized string
 	 * @throws UnsupportedEncodingException
+	 * @throws RuntimeException
+	 * @throws PageException
 	 */
-	public static String canonicalize(String input, boolean throwOnMultiple) throws UnsupportedEncodingException {
+	public static String canonicalize(String input, boolean throwOnMultiple) throws PageException {
 		if (input == null || input.isEmpty()) {
 			return input;
 		}
@@ -136,7 +138,8 @@ public static String canonicalize(String input, boolean throwOnMultiple) throws
 
 		// Check if multiple encoding was detected
 		if (throwOnMultiple && multipleEncodingDetected) {
-			throw new SecurityException("Multiple encoding layers detected in input: " + input);
+			throw CFMLEngineFactory.getInstance().getExceptionUtil()
+					.createSecurityException("Multiple encoding layers detected in input: " + input);
 		}
 		return simplify(util.replace(working, placeholder, "+", false, true));
 	}

tests/Canonicalize.cfc

@@ -1,4 +1,4 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="guard" {
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="esapi" {
 
     function run( testResults , testBox ) {
         describe( title = "Guard: Canonicalize", body = function() {

tests/ESAPIDecode.cfc

@@ -1,4 +1,4 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="guard"{
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="esapi" {
 	function run( testResults , testBox ) {
 		describe( "test case for guardDecode", function() {
 			it(title = "Checking guardDecode with decodeFrom='html'", body = function( currentSpec ) {

tests/LDEV4009.cfc

@@ -1,4 +1,4 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="guard"{
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="esapi" {
 
 	function run( testResults, testBox ) {
 		describe("Testcase for LDEV-4009", function() {

tests/LDEV4743.cfc

@@ -1,4 +1,4 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="guard" {
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="esapi" {
 	function run( testResults , testBox ) {
 		describe( title='Testcase for LDEV-4743' , body=function() {
 

tests/SanitizeHtml.cfc

@@ -1,4 +1,4 @@
-component extends="org.lucee.cfml.test.LuceeTestCase" labels="guard" {
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="esapi" {
 
     function run( testResults , testBox ) {
         describe( title = "Testcase for sanitizeHTML member function", body = function() {