Skip to content

Commit dfd0466

Browse files
authored
Merge pull request #13 from wpdebruin/development
prepend so no interference with main rules
2 parents 7a6fd64 + 37c3ab5 commit dfd0466

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

interceptors/Security.cfc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ component accessors="true" extends="coldbox.system.Interceptor" {
9696
// Process Module Rules
9797
arguments.settings.rules = variables.rulesLoader.normalizeRules( arguments.settings.rules, module );
9898

99-
// Append them
100-
arrayAppend(
101-
getProperty( "rules" ),
102-
arguments.settings.rules,
103-
true
104-
);
99+
// prepend them so the don't interfere with MAIN rules
100+
// one by one as I don't see a way to prepend the whole array at once
101+
for ( var i = arguments.settings.rules.len(); i >= 1; i-- ){
102+
arrayPrepend(
103+
getProperty( "rules" ),
104+
arguments.settings.rules[i]
105+
);
106+
}
105107

106108
// Log it
107109
log.info( "+ Registered module (#arguments.module#) with cbSecurity" );

test-harness/modules_app/mod1/ModuleConfig.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ component {
3434
"invalidAuthorizationEvent" : "mod1:secure.auth",
3535
// You can define your security rules here or externally via a source
3636
"rules" : [
37-
{ "secureList" : "mod1:home" },
38-
{ "secureList" : "mod1/modOverride", "match" : "url", "action" : "override" }
37+
{ "secureList" : "mod1/modOverride", "match" : "url", "action" : "override" },
38+
{ "secureList" : "mod1:home" }
3939
]
4040
}
4141
};

0 commit comments

Comments
 (0)