Merge pull request #21 from michaelborn/patch/module-settings-rules-source-load

feat: Add support for JSON/XML/model rules source when loading rules …

Author: lmajano

interceptors/Security.cfc

@@ -99,12 +99,20 @@ component accessors="true" extends="coldbox.system.Interceptor" {
 		param arguments.settings.defaultAuthorizationAction  = "";
 		param arguments.settings.validator                   = "";
 
+		// Verify setting configurations
+		variables.rulesLoader.rulesSourceChecks( arguments.settings );
+
 		// Store configuration in this firewall
 		variables.securityModules[ arguments.module ] = arguments.settings;
 
 		// Process Module Rules
 		arguments.settings.rules = variables.rulesLoader.normalizeRules( arguments.settings.rules, module );
 
+		// Load Rules if we have a ruleSource
+		if ( arguments.settings.rulesSource.len() ) {
+			arguments.settings.rules = variables.rulesLoader.loadRules( arguments.settings );
+		}
+
 		// prepend them so the don't interfere with MAIN rules
 		// one by one as I don't see a way to prepend the whole array at once
 		for ( var i = arguments.settings.rules.len(); i >= 1; i-- ){

test-harness/tests/specs/unit/SecurityTest.cfc

@@ -204,7 +204,55 @@ component extends="coldbox.system.testing.BaseInterceptorTest" interceptor="cbse
 
 					expect( security.getProperty( "rules", [] ) ).toHaveLength( 1 );
 				} );
-            } );
+			} );
+			
+			describe( "module setting load", function() {
+				beforeEach( function(currentSpec){
+					settings.rules = [];
+					settings.validator = "tests.resources.security";
+					security.$property( propertyName = "securityModules", mock = {} );
+					security.$property( propertyName = "log", mock = { info : function() {} });
+					security
+						.$( "getInstance" )
+						.$args( settings.validator )
+						.$results( wirebox.getInstance( settings.validator ) );
+					security.setProperties( settings );
+				} );
+
+				it( "can load JSON Rules based on module settings", function(){
+					expect( security.getProperty( "rules", [] ) ).toHaveLength( 0 );
+					var source = expandPath( "/tests/resources/security.json.cfm" );
+					mockController.$( "locateFilePath", source );
+
+					// initiate cbSecurity's module registration rule parsing
+					security.registerModule( "myTestModule", { rules : source } );
+
+					expect( security.getProperty( "rules", [] ) ).toHaveLength( 2 );
+				} );
+
+				it( "can load XML Rules based on module settings", function(){
+					var source   = expandPath( "/tests/resources/security.xml.cfm" );
+					mockController.$( "locateFilePath", source );
+
+					// initiate cbSecurity's module registration rule parsing
+					security.registerModule( "myTestModule", { rules : source } );
+
+					expect( security.getProperty( "rules", [] ) ).toHaveLength( 3 );
+				} );
+
+				it( "can load model Rules based on module settings", function(){
+					var moduleSettings = {
+						rules           : "model",
+						rulesModel      : "tests.resources.security",
+						rulesModelMethod: "getSecurityRules"
+					};
+
+					// initiate cbSecurity's module registration rule parsing
+					security.registerModule( "myTestModule", moduleSettings );
+
+					expect( security.getProperty( "rules", [] ) ).toHaveLength( 1 );
+				} );
+			});
 
 		} );
 	}