Skip to content

Commit 4217079

Browse files
author
nicola
committed
alignigng ldpfs with master
2 parents 47cca0d + d350079 commit 4217079

3 files changed

Lines changed: 143 additions & 33 deletions

File tree

‎index.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var debug = require('./logging').settings;
1717
var debugSubscription = require('./logging').subscription;
1818
var debugServer = require('./logging').server;
1919
var uuid = require('node-uuid');
20+
var cors = require('cors');
2021

2122
// ldnode dependencies
2223
var acl = require('./acl.js');
@@ -163,11 +164,25 @@ function routes () {
163164

164165
// Convert json-ld and nquads to turtle
165166
router.use('/*', parse.parseHandler);
167+
166168
// Add links headers
167169
router.use(header.linksHandler);
170+
168171
// Add response time
169172
router.use(responseTime());
170173

174+
// Setting CORS
175+
router.use(cors({
176+
methods: [
177+
'OPTIONS', 'HEAD', 'GET',
178+
'PATCH', 'POST', 'PUT', 'DELETE'
179+
],
180+
exposedHeaders: 'User, Location, Link, Vary, Last-Modified, Content-Length',
181+
credentials: true,
182+
maxAge: 1728000,
183+
origin: true
184+
}));
185+
171186
// HTTP methods handlers
172187
router.get('/*', getHandler.handler);
173188
router.head('/*', getHandler.headHandler);

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ldnode",
33
"description": "Linked Data Platform",
4-
"version": "0.2.7",
4+
"version": "0.2.8",
55
"author": {
66
"name": "Tim Berners-Lee",
77
"email": "timbl@w3.org"
@@ -26,6 +26,7 @@
2626
"dependencies": {
2727
"acl": "^0.4.7",
2828
"async": "^1.3.0",
29+
"cors": "^2.7.1",
2930
"debug": "^2.2.0",
3031
"express": "^4.13.1",
3132
"express-session": "^1.11.3",

‎test/http.js‎

Lines changed: 126 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,39 @@ var S = require('string');
77
var li = require('li');
88

99
describe('HTTP APIs', function() {
10+
11+
var emptyResponse = function(res) {
12+
if (res.text.length !== 0) {
13+
error("Not empty response");
14+
}
15+
};
16+
var getLink = function(res, rel) {
17+
var links = res.headers.link.split(',');
18+
for (var linkIndex in links) {
19+
var link = links[linkIndex];
20+
var parsedLink = li.parse(link);
21+
for (var linkRel in parsedLink) {
22+
if (linkRel == rel) {
23+
return parsedLink[rel];
24+
}
25+
}
26+
}
27+
return undefined;
28+
};
29+
var hasHeader = function(rel, value) {
30+
var handler = function(res) {
31+
var link = getLink(res, rel);
32+
if (link) {
33+
if (link !== value) {
34+
error("Not same value");
35+
}
36+
} else {
37+
error("Header does not exist");
38+
}
39+
};
40+
return handler;
41+
};
42+
1043
var address = 'http://localhost:3457';
1144
var ldp = ldnode.createServer({
1245
root: __dirname + '/resources',
@@ -15,7 +48,15 @@ describe('HTTP APIs', function() {
1548

1649
var server = supertest(address);
1750

51+
1852
describe('GET Root container', function() {
53+
it('should have Access-Control-Allow-Origin as the req.Origin', function(done) {
54+
server.get('/')
55+
.set('Origin', 'http://example.com')
56+
.expect('Access-Control-Allow-Origin', 'http://example.com')
57+
.expect(200, done);
58+
});
59+
1960
it('Should exists', function(done) {
2061
server.get('/')
2162
.expect(200, done);
@@ -27,7 +68,69 @@ describe('HTTP APIs', function() {
2768
});
2869
});
2970

71+
describe('OPTIONS API', function (){
72+
73+
it('should have an empty response', function(done) {
74+
server.options('/sampleContainer/example1.ttl')
75+
.expect(emptyResponse)
76+
.end(done);
77+
});
78+
79+
it('should return 204 on success', function(done) {
80+
server.options('/sampleContainer/example1.ttl')
81+
.expect(204)
82+
.end(done);
83+
});
84+
85+
it('should have Access-Control-Allow-Origin on OPTIONS', function(done) {
86+
server.options('/sampleContainer/example1.ttl')
87+
.set('Origin', 'http://example.com')
88+
.expect('Access-Control-Allow-Origin', 'http://example.com')
89+
.end(done);
90+
});
91+
92+
it('should have set Link as resource in OPTIONS', function(done) {
93+
server.options('/sampleContainer/example1.ttl')
94+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel='type'/)
95+
.end(done);
96+
});
97+
98+
it('should have set Link as Container/BasicContainer in OPTIONS', function(done) {
99+
server.options('/sampleContainer/')
100+
.set('Origin', 'http://example.com')
101+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel='type'/)
102+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel='type'/)
103+
.end(done);
104+
});
105+
});
106+
30107
describe('GET API', function() {
108+
it('should have Access-Control-Allow-Origin as Origin on containers', function(done) {
109+
server.get('/sampleContainer')
110+
.set('Origin', 'http://example.com')
111+
.expect('Access-Control-Allow-Origin', 'http://example.com')
112+
.expect(200, done);
113+
});
114+
115+
it('should have Access-Control-Allow-Origin as Origin on resources', function(done) {
116+
server.get('/sampleContainer/example1.ttl')
117+
.set('Origin', 'http://example.com')
118+
.expect('Access-Control-Allow-Origin', 'http://example.com')
119+
.expect(200, done);
120+
});
121+
122+
it('should have set Link as resource', function(done) {
123+
server.get('/sampleContainer/example1.ttl')
124+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel='type'/)
125+
.expect(200, done);
126+
});
127+
128+
it('should have set Link as Container/BasicContainer', function(done) {
129+
server.head('/sampleContainer/')
130+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel='type'/)
131+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel='type'/)
132+
.expect(200, done);
133+
});
31134
it('Should return 404 for non-existent resource', function(done) {
32135
server.get('/invalidfile.foo')
33136
.expect(404, done);
@@ -39,7 +142,7 @@ describe('HTTP APIs', function() {
39142
});
40143
it('Should return resource link for files', function(done) {
41144
server.get('/hello.html')
42-
.expect('Link', /http:\/\/www.w3.org\/ns\/ldp#Resource/)
145+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel='type'/)
43146
.expect(200, done);
44147
});
45148
it('Should have glob support', function(done) {
@@ -50,42 +153,33 @@ describe('HTTP APIs', function() {
50153
});
51154

52155
describe('HEAD API', function() {
53-
var emptyResponse = function(res) {
54-
if (res.text.length !== 0) {
55-
error("Not empty response");
56-
}
57-
};
58-
var getLink= function(res, rel) {
59-
var links = res.headers.link.split(',');
60-
for (var linkIndex in links) {
61-
var link = links[linkIndex];
62-
var parsedLink = li.parse(link);
63-
for (var linkRel in parsedLink) {
64-
if (linkRel == rel) {
65-
return parsedLink[rel];
66-
}
67-
}
68-
}
69-
return undefined;
70-
};
71-
var hasHeader = function(rel, value) {
72-
var handler = function(res) {
73-
var link = getLink(res, rel);
74-
if (link) {
75-
if (link !== value) {
76-
error("Not same value");
77-
}
78-
} else {
79-
error("Header does not exist");
80-
}
81-
};
82-
return handler;
83-
};
156+
157+
it('should have Access-Control-Allow-Origin as Origin', function(done) {
158+
server.head('/sampleContainer/example1.ttl')
159+
.set('Origin', 'http://example.com')
160+
.expect('Access-Control-Allow-Origin', 'http://example.com')
161+
.expect(200, done);
162+
});
163+
84164
it('Should return empty response body', function(done) {
85165
server.head('/patch-5-initial.ttl')
86166
.expect(emptyResponse)
87167
.expect(200, done);
88168
});
169+
170+
it('should have set Link as Resource', function(done) {
171+
server.head('/sampleContainer/example1.ttl')
172+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel='type'/)
173+
.expect(200, done);
174+
});
175+
176+
it('should have set Link as Container/BasicContainer', function(done) {
177+
server.get('/sampleContainer/')
178+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel='type'/)
179+
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel='type'/)
180+
.expect(200, done);
181+
});
182+
89183
it('Should return meta header', function(done) {
90184
server.head('/')
91185
.expect(hasHeader('\'describedBy\'', address + '/' + '.meta'))

0 commit comments

Comments
 (0)