@@ -11,13 +11,15 @@ var file = require('./fileStore.js');
1111var logging = require ( './logging.js' ) ;
1212var options = require ( './options.js' ) ;
1313
14- var ns = require ( './vocab/ns.js' ) ;
14+ var ns = require ( './vocab/ns.js' ) . ns ;
1515var rdfVocab = require ( './vocab/rdf.js' ) ;
1616
1717var aclExtension = ".acl" ;
1818
1919function allow ( mode , req , res ) {
20- var origin = req . get ( 'Origin' ) ;
20+ var origin = req . get ( 'origin' ) ;
21+ origin = origin ? origin : '' ;
22+
2123 var accessType = "accessTo" ;
2224
2325 var filepath = file . uriToFilename ( req . path ) ;
@@ -40,46 +42,51 @@ function allow(mode, req, res) {
4042 var aclData ;
4143 var aclGraph = $rdf . graph ( ) ;
4244 try {
43- aclData = fs . readFileSync ( pathAcl ) ;
44- $rdf . parse ( aclData , aclGraph , pathAclUri , 'text/turtle' ) ;
45+ aclData = fs . readFileSync ( pathAcl , { encoding : 'utf8' } ) ;
46+ $rdf . parse ( aclData , aclGraph , pathUri , 'text/turtle' ) ;
4547 } catch ( parseErr ) {
48+ logging . log ( "ACL -- Error parsing ACL policy: " + parseErr ) ;
4649 //Resetting graph to prevent the code from taking the next if brach.
4750 aclGraph = $rdf . graph ( ) ;
4851 }
4952
53+
5054 if ( aclGraph . statements . length > 0 ) {
5155 logging . log ( "ACL -- Found policies in " + pathAcl ) ;
52- var controlStatements = aclGraph . any ( undefined , ns . acl ( "mode" ) ,
56+ var controlStatements = aclGraph . each ( undefined , ns . acl ( "mode" ) ,
5357 ns . acl ( "Control" ) ) ;
54- controlStatements . forEach ( function ( controlElem ) {
55- var accessStatements = aclGraph . any ( controlElem . subject ,
58+ for ( var controlIndex in controlStatements ) {
59+ var controlElem = controlStatements [ controlIndex ] ;
60+ var accessStatements = aclGraph . each ( controlElem ,
5661 ns . acl ( accessType ) , aclGraph . sym ( pathUri ) ) ;
57- accessStatements . forEach ( function ( accessElem , accessIndex ) {
58- var ownerStatements = aclGraph . any ( accessElem . subject ,
62+ for ( var accessIndex in accessStatements ) {
63+ var accessElem = accessStatements [ accessIndex ] ;
64+ var ownerStatements = aclGraph . each ( accessElem ,
5965 ns . acl ( "owner" ) , aclGraph . sym ( req . session . userId ) ) ;
60- ownerStatements . forEach ( function ( ownerElem ) {
66+ for ( var ownerIndex in ownerStatements ) {
6167 logging . log ( "ACL -- " + mode + " access allowed (as owner)" +
6268 " for: " + req . session . userId ) ;
6369 return {
6470 status : 200 ,
6571 err : null
6672 } ;
67- } ) ;
68- var agentStatements = aclGraph . any ( controlElem . subject ,
73+ }
74+ var agentStatements = aclGraph . each ( controlElem ,
6975 ns . acl ( "agent" ) , aclGraph . sym ( req . session . userId ) ) ;
70- agentStatements . forEach ( function ( agentElem ) {
76+ for ( var agentIndex in agentStatements ) {
7177 logging . log ( "ACL -- " + mode + " access allowed (as agent)" +
7278 " for: " + req . session . userId ) ;
7379 return {
7480 status : 200 ,
7581 err : null
7682 } ;
77- } ) ;
78- var agentClassStatements = aclGraph . any ( controlElem . subject ,
83+ }
84+ var agentClassStatements = aclGraph . each ( controlElem ,
7985 ns . acl ( "agentClass" ) , undefined ) ;
80- agentClassStatements . forEach ( function ( agentClassElem ) {
86+ for ( var agentClassIndex in agentClassStatements ) {
87+ var agentClassElem = agentClassStatements [ agentClassIndex ] ;
8188 logging . log ( "ACL -- Found agentClass policy" ) ;
82- if ( agentClassElem . object . sameTerm ( ns . foaf ( "Agent" ) ) ) {
89+ if ( agentClassElem . sameTerm ( ns . foaf ( "Agent" ) ) ) {
8390 logging . log ( "ACL -- " + mode +
8491 " access allowed as FOAF agent" ) ;
8592 return {
@@ -88,53 +95,63 @@ function allow(mode, req, res) {
8895 } ;
8996 }
9097
91- var groupURI = rdfVocab . debrack ( agentClassElem . object . toString ( ) ) ;
98+ var groupURI = rdfVocab . debrack ( agentClassElem . toString ( ) ) ;
9299 var groupGraph = $rdf . graph ( ) ;
93100 var groupFetcher = $rdf . fetcher ( groupGraph , 3000 , false ) ;
94101 groupFetcher . nowOrWhenFetched ( groupURI , null , function ( ok , err ) { } ) ;
95- var typeStatements = groupGraph . any ( agentClassElem . object ,
102+ var typeStatements = groupGraph . each ( agentClassElem ,
96103 ns . rdf ( "type" ) , ns . foaf ( "Group" ) ) ;
97104 if ( groupGraph . statements . length > 0 &&
98105 typeStatements . length > 0 ) {
99- var memberStatements = groupGraph . any (
100- agentClassElem . object , ns . foaf ( "member" ) ,
106+ var memberStatements = groupGraph . each (
107+ agentClassElem , ns . foaf ( "member" ) ,
101108 groupGraph . sym ( req . session . userId ) ) ;
102- memberStatements . forEach ( function ( memberElem ) {
109+ for ( var memberIndex in memberStatements ) {
103110 logging . log ( "ACL -- " + req . session . userId +
104111 " listed as member of the group " + groupURI ) ;
105112 return {
106113 status : 200 ,
107114 err : null
108115 } ;
109- } ) ;
116+ }
110117 }
111- } ) ;
112- } ) ;
113- } ) ;
118+ }
119+ }
120+ }
114121
115- var modeStatements = aclGraph . any ( undefined , ns . acl ( "mode" ) , ns . acl ( mode ) ) ;
116- modeStatements . forEach ( function ( modeElem ) {
122+ var modeStatements = aclGraph . each ( undefined , ns . acl ( "mode" ) , ns . acl ( mode ) ) ;
123+ for ( var modeIndex in modeStatements ) {
124+ var modeElem = modeStatements [ modeIndex ] ;
117125 logging . log ( "ACL -- Found " + accessType + " policy for <" + mode + ">" ) ;
118-
119- var accessTypeStatements = aclGraph . any ( modeElem . subject , ns . acl ( accessType ) ,
126+ var accessTypeStatements = aclGraph . each ( modeElem , ns . acl ( accessType ) ,
120127 aclGraph . sym ( pathUri ) ) ;
121- accessTypeStatements . forEach ( function ( accessTypeElem ) {
122- var origins = aclGraph . any ( modeElem . subject , ns . acl ( "origin" ) , undefined ) ;
128+ for ( var accessTypeIndex in accessTypeStatements ) {
129+ var accessTypeElem = accessTypeStatements [ accessTypeIndex ] ;
130+ var origins = aclGraph . each ( modeElem , ns . acl ( "origin" ) , undefined ) ;
131+ var originValue ;
123132 if ( origin . length > 0 && origins . length > 0 ) {
124133 logging . log ( "ACL -- Origin set to: " + rdfVocab . brack ( origin ) ) ;
125- origins . forEach ( function ( originsElem ) {
126- if ( rdfVocab . brack ( origin ) === originsElem . object . toString ( ) ) {
134+ for ( var originsIndex in origins ) {
135+ var originsElem = origins [ originsIndex ] ;
136+ if ( rdfVocab . brack ( origin ) === originsElem . toString ( ) ) {
127137 logging . log ( "ACL -- Found policy for origin: " +
128- originsElem . object . toString ( ) ) ;
129- return allowOrigin ( mode , req , res , aclGraph , accessTypeElem ) ;
138+ originsElem . toString ( ) ) ;
139+ originValue = allowOrigin ( mode , req , res , aclGraph , modeElem ) ;
140+ if ( originValue ) {
141+ return originValue ;
142+ }
130143 }
131- } ) ;
144+ }
145+ continue ;
132146 } else {
133147 logging . log ( "ACL -- No origin found, moving on." ) ;
134148 }
135- return allowOrigin ( mode , req , res , aclGraph , accessTypeElem ) ;
136- } ) ;
137- } ) ;
149+ originValue = allowOrigin ( mode , req , res , aclGraph , modeElem ) ;
150+ if ( originValue ) {
151+ return originValue ;
152+ }
153+ }
154+ }
138155
139156 if ( req . session . userId . length === 0 || req . session . identified === false ) {
140157 logging . log ( "ACL -- Authentication required" ) ;
@@ -178,54 +195,59 @@ function allow(mode, req, res) {
178195 } ;
179196}
180197
181- function allowOrigin ( mode , req , res , aclGraph , triple ) {
198+ function allowOrigin ( mode , req , res , aclGraph , subject ) {
182199 logging . log ( "ACL -- In allow origin" ) ;
183- var ownerStatements = aclGraph . any ( triple . subject , ns . acl ( "owner" ) ,
200+ var ownerStatements = aclGraph . each ( subject , ns . acl ( "owner" ) ,
184201 aclGraph . sym ( req . session . userId ) ) ;
185- ownerStatements . forEach ( function ( ownerElem ) {
202+ for ( var ownerIndex in ownerStatements ) {
186203 logging . log ( "ACL -- " + mode + " access allowed (as owner) for: " + req . session . userId ) ;
187204 return {
188205 status : 200 ,
189206 err : null
190207 } ;
191- } ) ;
192- var agentStatements = aclGraph . any ( triple . subject , ns . acl ( "agent" ) ,
208+ }
209+ var agentStatements = aclGraph . each ( subject , ns . acl ( "agent" ) ,
193210 aclGraph . sym ( req . session . userId ) ) ;
194- agentStatements . forEach ( function ( agentElem ) {
211+ logging . log ( subject ) ;
212+ logging . log ( ns . acl ( "agent" ) ) ;
213+ logging . log ( aclGraph . sym ( req . session . userId ) ) ;
214+ logging . log ( "agentStatements " + agentStatements ) ;
215+ for ( var agentIndex in agentStatements ) {
195216 logging . log ( "ACL -- " + mode + " access allowed (as agent) for: " + req . session . userId ) ;
196217 return {
197218 status : 200 ,
198219 return : null
199220 } ;
200- } ) ;
201- var agentClassStatements = aclGraph . any ( triple . subject , ns . acl ( "agentClass" ) , undefined ) ;
202- agentClassStatements . forEach ( function ( agentClassElem ) {
221+ }
222+ var agentClassStatements = aclGraph . each ( subject , ns . acl ( "agentClass" ) , undefined ) ;
223+ for ( var agentClassIndex in agentClassStatements ) {
224+ var agentClassElem = agentClassStatements [ agentClassIndex ] ;
203225 //Check for FOAF groups
204226 logging . log ( "ACL -- Found agentClass policy" ) ;
205- if ( agentClassElem . object . sameTerm ( ns . foaf ( "Agent" ) ) ) {
227+ if ( agentClassElem . sameTerm ( ns . foaf ( "Agent" ) ) ) {
206228 logging . log ( "ACL -- " + mode + " allowed access as FOAF agent" ) ;
207229 return {
208230 status : 200 ,
209231 err : null
210232 } ;
211233 }
212- var groupURI = rdfVocab . debrack ( agentClassElem . object . toString ( ) ) ;
234+ var groupURI = rdfVocab . debrack ( agentClassElem . toString ( ) ) ;
213235 var groupGraph = $rdf . graph ( ) ;
214236 var groupFetcher = $rdf . fetcher ( groupGraph , 3000 , false ) ;
215237 groupFetcher . nowOrWhenFetched ( groupURI , null , function ( ok , err ) { } ) ;
216- var typeStatements = groupGraph . any ( agentClassElem . object , ns . rdf ( "type" ) , ns . foaf ( "Group" ) ) ;
238+ var typeStatements = groupGraph . each ( agentClassElem , ns . rdf ( "type" ) , ns . foaf ( "Group" ) ) ;
217239 if ( groupGraph . statements . length > 0 && typeStatements . length > 0 ) {
218- var memberStatements = groupGraph . any ( agentClassElem . object , ns . foaf ( "member" ) ,
240+ var memberStatements = groupGraph . each ( agentClassElem , ns . foaf ( "member" ) ,
219241 groupGraph . sym ( req . session . userId ) ) ;
220- memberStatements . forEach ( function ( memberElem ) {
242+ for ( var memberIndex in memberStatements ) {
221243 logging . log ( "ACL -- " + req . session . userId + " listed as member of the group " + groupURI ) ;
222244 return {
223245 status : 200 ,
224246 err : null
225247 } ;
226- } ) ;
248+ }
227249 }
228- } ) ;
250+ }
229251}
230252
231253function allowIfACLEnabled ( mode , req , res , next ) {
0 commit comments