Skip to content

Commit cde19b9

Browse files
committed
Merge pull request #113 from deiu/master
Set acl and describedBy (meta) Link headers for all requests.
2 parents bf6836a + d3bf69d commit cde19b9

4 files changed

Lines changed: 85 additions & 44 deletions

File tree

‎lib/handlers/get.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,6 @@ function get(req, res, includeBody) {
5757
debug('HEAD -- ' + req.originalUrl);
5858
}
5959

60-
// Add ACL and Meta Link in header
61-
var aclLink = utils.getResourceLink(
62-
filename, uri,
63-
ldp.root, ldp.suffixAcl,
64-
ldp.suffixMeta);
65-
66-
var metaLink = utils.getResourceLink(
67-
filename, uri,
68-
ldp.root, ldp.suffixMeta,
69-
ldp.suffixAcl);
70-
71-
header.addLink(res, aclLink, 'acl');
72-
header.addLink(res, metaLink, 'describedBy');
73-
7460
// Get resource or container
7561
ldp.get(filename, uri, includeBody, function(err, data, container) {
7662

‎lib/header.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var path = require('path');
44
var S = require('string');
55
var Negotiator = require('negotiator');
66
var metadata = require('./metadata.js');
7+
var ldp = require('./ldp.js');
78
var utils = require('./utils.js');
89
var ldpVocab = require('./vocab/ldp.js');
910

@@ -30,6 +31,7 @@ function addLinks(res, fileMetadata) {
3031
}
3132

3233
function linksHandler(req, res, next) {
34+
var uri = utils.uriBase(req);
3335
var ldp = req.app.locals.ldp;
3436
var filename = utils.uriToFilename(req.url, ldp.root);
3537

@@ -45,6 +47,22 @@ function linksHandler(req, res, next) {
4547
} else {
4648
fileMetadata.isResource = true;
4749
}
50+
51+
// Add ACL and Meta Link in header
52+
var aclLink = utils.getResourceLink(
53+
filename, uri,
54+
ldp.root, ldp.suffixAcl,
55+
ldp.suffixMeta);
56+
57+
var metaLink = utils.getResourceLink(
58+
filename, uri,
59+
ldp.root, ldp.suffixMeta,
60+
ldp.suffixAcl);
61+
62+
addLink(res, utils.uriRelative(aclLink), 'acl');
63+
addLink(res, utils.uriRelative(metaLink), 'describedBy');
64+
65+
4866
addLinks(res, fileMetadata);
4967
next();
5068
}

‎lib/utils.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ function uriBase(req) {
4242
return uriAbs(req) + (req.baseUrl || '');
4343
}
4444

45+
function uriRelative(uri) {
46+
var relative = path.basename(uri);
47+
return relative;
48+
}
49+
4550
function getResourceLink(filename, uri, base, suffix, otherSuffix) {
4651
var link = filenameToBaseUri(filename, uri, base);
4752
if (S(link).endsWith(suffix)) {
@@ -76,6 +81,7 @@ exports.uriToFilename = uriToFilename;
7681
exports.uriToRelativeFilename = uriToRelativeFilename;
7782
exports.filenameToBaseUri = filenameToBaseUri;
7883
exports.uriAbs = uriAbs;
84+
exports.uriRelative = uriRelative;
7985
exports.uriBase = uriBase;
8086
exports.getResourceLink = getResourceLink;
8187
exports.formatDateTime = formatDateTime;

‎test/http.js‎

Lines changed: 61 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ describe('HTTP APIs', function() {
1515
};
1616
var getLink = function(res, rel) {
1717
var links = res.headers.link.split(',');
18-
for (var linkIndex in links) {
19-
var link = links[linkIndex];
18+
for (var i in links) {
19+
var link = links[i];
2020
var parsedLink = li.parse(link);
21-
for (var linkRel in parsedLink) {
22-
if (linkRel == rel) {
23-
return parsedLink[rel];
24-
}
21+
if (parsedLink[rel]) {
22+
return parsedLink[rel];
2523
}
2624
}
2725
return undefined;
@@ -31,23 +29,25 @@ describe('HTTP APIs', function() {
3129
var link = getLink(res, rel);
3230
if (link) {
3331
if (link !== value) {
34-
console.log("Not same value");
32+
console.log("Not same value:", value, '!=', link);
3533
}
3634
} else {
37-
console.log("Header does not exist");
35+
console.log(rel, "header does not exist:", link);
3836
}
3937
};
4038
return handler;
4139
};
4240

4341
var address = 'http://localhost:3457';
44-
var ldp = ldnode.createServer({
42+
var ldpServer = ldnode.createServer({
4543
root: __dirname + '/resources',
4644
});
47-
ldp.listen(3457);
45+
ldpServer.listen(3457);
4846

49-
var server = supertest(address);
47+
var suffixAcl = ".acl";
48+
var suffixMeta = ".meta";
5049

50+
var server = supertest(address);
5151

5252
describe('GET Root container', function() {
5353
it('should have Access-Control-Allow-Origin as the req.Origin', function(done) {
@@ -82,26 +82,40 @@ describe('HTTP APIs', function() {
8282
.end(done);
8383
});
8484

85-
it('should have Access-Control-Allow-Origin on OPTIONS', function(done) {
85+
it('should have Access-Control-Allow-Origin', function(done) {
8686
server.options('/sampleContainer/example1.ttl')
8787
.set('Origin', 'http://example.com')
8888
.expect('Access-Control-Allow-Origin', 'http://example.com')
8989
.end(done);
9090
});
9191

92-
it('should have set Link as resource in OPTIONS', function(done) {
92+
it('should have set acl and describedBy Links for resource', function(done) {
93+
server.options('/sampleContainer/example1.ttl')
94+
.expect(hasHeader('acl', 'example1.ttl' + suffixAcl))
95+
.expect(hasHeader('describedBy', 'example1.ttl' + suffixMeta))
96+
.end(done);
97+
});
98+
99+
it('should have set Link as resource', function(done) {
93100
server.options('/sampleContainer/example1.ttl')
94101
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
95102
.end(done);
96103
});
97104

98-
it('should have set Link as Container/BasicContainer in OPTIONS', function(done) {
105+
it('should have set Link as Container/BasicContainer', function(done) {
99106
server.options('/sampleContainer/')
100107
.set('Origin', 'http://example.com')
101108
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
102109
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
103110
.end(done);
104111
});
112+
113+
it('should have set acl and describedBy Links for container', function(done) {
114+
server.options('/sampleContainer/')
115+
.expect(hasHeader('acl', suffixAcl))
116+
.expect(hasHeader('describedBy', suffixMeta))
117+
.end(done);
118+
});
105119
});
106120

107121
describe('GET API', function() {
@@ -124,36 +138,48 @@ describe('HTTP APIs', function() {
124138
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
125139
.expect(200, done);
126140
});
141+
it('should have set acl and describedBy Links for resource', function(done) {
142+
server.get('/sampleContainer/example1.ttl')
143+
.expect(hasHeader('acl', 'example1.ttl' + suffixAcl))
144+
.expect(hasHeader('describedBy', 'example1.ttl' + suffixMeta))
145+
.end(done);
146+
});
127147

128148
it('should have set Link as Container/BasicContainer', function(done) {
129149
server.head('/sampleContainer/')
130150
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
131151
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
132152
.expect(200, done);
133153
});
134-
it('Should return 404 for non-existent resource', function(done) {
154+
it('should return 404 for non-existent resource', function(done) {
135155
server.get('/invalidfile.foo')
136156
.expect(404, done);
137157
});
138-
it('Should return basic container link for directories', function(done) {
158+
it('should return basic container link for directories', function(done) {
139159
server.get('/')
140160
.expect('Link', /http:\/\/www.w3.org\/ns\/ldp#BasicContainer/)
141161
.expect(200, done);
142162
});
143-
it('Should return resource link for files', function(done) {
163+
it('should return resource link for files', function(done) {
144164
server.get('/hello.html')
145165
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
146166
.expect(200, done);
147167
});
148-
it('Should have glob support', function(done) {
168+
it('should have glob support', function(done) {
149169
server.get('/sampleContainer/example*')
150170
.expect('content-type', /text\/turtle/)
151171
.expect(200, done);
152172
});
173+
174+
it('should have set acl and describedBy Links for container', function(done) {
175+
server.get('/sampleContainer/')
176+
.expect(hasHeader('acl', suffixAcl))
177+
.expect(hasHeader('describedBy', suffixMeta))
178+
.end(done);
179+
});
153180
});
154181

155182
describe('HEAD API', function() {
156-
157183
it('should have Access-Control-Allow-Origin as Origin', function(done) {
158184
server.head('/sampleContainer/example1.ttl')
159185
.set('Origin', 'http://example.com')
@@ -172,25 +198,26 @@ describe('HTTP APIs', function() {
172198
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
173199
.expect(200, done);
174200
});
201+
it('should have set acl and describedBy Links for resource', function(done) {
202+
server.get('/sampleContainer/example1.ttl')
203+
.expect(hasHeader('acl', 'example1.ttl' + suffixAcl))
204+
.expect(hasHeader('describedBy', 'example1.ttl' + suffixMeta))
205+
.end(done);
206+
});
175207

176208
it('should have set Link as Container/BasicContainer', function(done) {
177209
server.get('/sampleContainer/')
178210
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
179-
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
211+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
180212
.expect(200, done);
181213
});
182214

183-
it('Should return meta header', function(done) {
184-
server.head('/')
185-
.expect(hasHeader('\'describedBy\'', address + '/' + '.meta'))
186-
.expect(200, done);
187-
});
188-
it('Should return acl header', function(done) {
189-
server.head('/')
190-
.expect(hasHeader('\'acl\'', address + '/' + '.acl'))
191-
.expect(200, done);
215+
it('should have set acl and describedBy Links for container', function(done) {
216+
server.get('/sampleContainer/')
217+
.expect(hasHeader('acl', suffixAcl))
218+
.expect(hasHeader('describedBy', suffixMeta))
219+
.end(done);
192220
});
193-
194221
});
195222

196223
describe('PUT API', function() {
@@ -207,6 +234,8 @@ describe('HTTP APIs', function() {
207234
server.put('/foo/bar/baz.ttl')
208235
.send(putRequestBody)
209236
.set('content-type', 'text/turtle')
237+
.expect(hasHeader('describedBy', 'baz.ttl' + suffixMeta))
238+
.expect(hasHeader('acl', 'baz.ttl' + suffixAcl))
210239
.expect(function() {
211240
fs.unlinkSync(__dirname + '/resources/foo/bar/baz.ttl');
212241
fs.rmdirSync(__dirname + '/resources/foo/bar/');
@@ -245,6 +274,8 @@ describe('HTTP APIs', function() {
245274
.set('content-type', 'text/turtle')
246275
.set('slug', 'post-resource-1')
247276
.expect('location', address + '/post-resource-1.ttl')
277+
.expect(hasHeader('describedBy', suffixMeta))
278+
.expect(hasHeader('acl', suffixAcl))
248279
.expect(201, done);
249280
});
250281
it('Should reject requests to existing resources', function(done) {

0 commit comments

Comments
 (0)