@@ -27,9 +27,10 @@ function allow(mode, req, res) {
2727 var depth = relativePath . split ( '/' ) ;
2828
2929 for ( var i = 0 ; i < depth . length ; i ++ ) {
30- var pathAcl = filepath + aclExtension ;
30+ var pathAcl = S ( filepath ) . endsWith ( aclExtension ) ?
31+ filepath : filepath + aclExtension ;
3132 var pathUri = file . filenameToBaseUri ( filepath ) ;
32- var pathAclUri = file . filenameToBaseUri ( filepath + aclExtension ) ;
33+ var pathAclUri = file . filenameToBaseUri ( pathAcl ) ;
3334
3435 if ( ! fs . existsSync ( filepath ) || ! fs . existsSync ( pathAcl ) ) {
3536 continue ;
@@ -57,10 +58,36 @@ function allow(mode, req, res) {
5758 ns . acl ( "Control" ) ) ;
5859 for ( var controlIndex in controlStatements ) {
5960 var controlElem = controlStatements [ controlIndex ] ;
61+
6062 var accessStatements = aclGraph . each ( controlElem ,
6163 ns . acl ( accessType ) , aclGraph . sym ( pathUri ) ) ;
6264 for ( var accessIndex in accessStatements ) {
6365 var accessElem = accessStatements [ accessIndex ] ;
66+
67+ var originsControl = aclGraph . each ( modeElem , ns . acl ( "origin" ) , undefined ) ;
68+ var originControlValue ;
69+ if ( origin . length > 0 && originsControl . length > 0 ) {
70+ logging . log ( "ACL -- Origin set to: " + rdfVocab . brack ( origin ) ) ;
71+ for ( var originsControlIndex in originsControl ) {
72+ var originsControlElem = originsControl [ originsControlIndex ] ;
73+ if ( rdfVocab . brack ( origin ) === originsControlElem . toString ( ) ) {
74+ logging . log ( "ACL -- Found policy for origin: " +
75+ originsControlElem . toString ( ) ) ;
76+ originControlValue = allowOrigin ( mode , req , res , aclGraph , controlElem ) ;
77+ if ( originControlValue ) {
78+ return originControlValue ;
79+ }
80+ }
81+ }
82+ continue ;
83+ } else {
84+ logging . log ( "ACL -- No origin found, moving on." ) ;
85+ }
86+ originControlValue = allowOrigin ( mode , req , res , aclGraph , controlElem ) ;
87+ if ( originControlValue ) {
88+ return originControlValue ;
89+ }
90+
6491 var ownerStatements = aclGraph . each ( accessElem ,
6592 ns . acl ( "owner" ) , aclGraph . sym ( req . session . userId ) ) ;
6693 for ( var ownerIndex in ownerStatements ) {
@@ -71,6 +98,7 @@ function allow(mode, req, res) {
7198 err : null
7299 } ;
73100 }
101+
74102 var agentStatements = aclGraph . each ( controlElem ,
75103 ns . acl ( "agent" ) , aclGraph . sym ( req . session . userId ) ) ;
76104 for ( var agentIndex in agentStatements ) {
@@ -81,6 +109,7 @@ function allow(mode, req, res) {
81109 err : null
82110 } ;
83111 }
112+
84113 var agentClassStatements = aclGraph . each ( controlElem ,
85114 ns . acl ( "agentClass" ) , undefined ) ;
86115 for ( var agentClassIndex in agentClassStatements ) {
0 commit comments