Skip to content

Commit 04d1960

Browse files
author
nicola
committed
Merge branch 'master' of https://github.com/linkeddata/ldnode
2 parents cda7759 + dfcd07e commit 04d1960

6 files changed

Lines changed: 144 additions & 83 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ npm run test-(acl|formats|params|patch)
149149
<tr>
150150
<th align="left">Nicola Greco</th>
151151
<td><a href="https://github.com/nicola">GitHub/nicola</a></td>
152-
<td><a href="http://twitter.com/nicola">Twitter/@nicola</a></td>
152+
<td><a href="http://twitter.com/nicolagreco">Twitter/@nicolagreco</a></td>
153153
<td><a href="https://nicola.databox.me/profile/card#me">webid</a></td>
154154
</tr>
155155
<tr>

‎lib/handlers/error.js‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,24 @@ var fs = require('fs');
55

66
function errorPageHandler(err, req, res, next) {
77
var ldp = req.app.locals.ldp;
8-
if (!ldp.noErrorPages) {
9-
var errorPage = ldp.errorPages +
10-
err.status.toString() + '.html';
11-
fs.readFile(errorPage, 'utf8', function(readErr, text) {
12-
if (readErr) {
13-
defaultErrorHandler(err, res);
14-
} else {
15-
res.status(err.status);
16-
res.send(text);
17-
}
18-
});
19-
} else {
20-
defaultErrorHandler(err, res);
8+
9+
// If noErrorPages is set,
10+
// then use built-in express default error handler
11+
if (ldp.noErrorPages) {
12+
return next(err);
2113
}
22-
}
2314

24-
function defaultErrorHandler(err, res) {
25-
res.status(err.status);
26-
res.send(err.message);
15+
// Check if error page exists
16+
var errorPage = ldp.errorPages + err.status.toString() + '.html';
17+
fs.readFile(errorPage, 'utf8', function(readErr, text) {
18+
if (readErr) {
19+
return next();
20+
}
21+
22+
res.status(err.status);
23+
res.header('Content-Type', 'text/html');
24+
res.send(text);
25+
});
2726
}
2827

2928
exports.handler = errorPageHandler;

‎lib/login.js‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,11 @@ function loginHandler(req, res, next) {
2020
var verifAgent = new webid.VerificationAgent(certificate);
2121
verifAgent.verify(function(err, result) {
2222
if (err) {
23-
var message;
24-
switch (err) {
25-
case 'certificateProvidedSAN':
26-
message = 'No valide Certificate Alternative Name in your certificate';
27-
break;
28-
case 'profileWellFormed':
29-
message = 'Can\'t load your foaf file (RDF may not be valid)';
30-
break;
31-
case 'falseWebID':
32-
message = 'Your certificate public key is not the one of the FOAF file';
33-
break;
34-
case 'profileAllKeysWellFormed':
35-
message = "Certificate public key does not match the one found in the WebID profile.";
36-
break;
37-
default:
38-
message = "Unknown WebID error";
39-
break;
40-
}
41-
debug("Error processing certificate: " + message);
23+
debug("Error processing certificate: " + err);
4224
setEmptySession(req);
4325
var authError = new Error();
4426
authError.status = 403;
45-
authError.message = message;
27+
authError.message = err;
4628
return next(authError);
4729
} else {
4830
req.session.userId = result;
@@ -53,7 +35,7 @@ function loginHandler(req, res, next) {
5335
}
5436
});
5537
} else {
56-
debug("Empty certificate");
38+
debug("No client certificate found in the request. Did the user click on a cert?");
5739
setEmptySession(req);
5840
next();
5941
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"request": "^2.58.0",
4949
"response-time": "^2.3.1",
5050
"string": "^3.3.0",
51-
"webid": "^0.2.2"
51+
"webid": "^0.2.4"
5252
},
5353
"devDependencies": {
5454
"chai": "^3.0.0",

‎test/errors.js‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,47 @@ var ldnode = require('../index');
1717
var ACL = require('../lib/acl').ACL;
1818
var ns = require('../lib/vocab/ns.js').ns;
1919

20-
describe('Error page tests', function() {
21-
var errorAddress = 'http://localhost:3457/test/';
20+
describe('Error pages', function() {
2221

23-
var errorLdp = ldnode.createServer({
22+
// LDP with error pages
23+
var errorLdp = ldnode({
2424
root: __dirname + '/resources',
2525
errorPages: __dirname + '/resources/errorPages'
2626
});
27-
errorLdp.listen(3457);
27+
var errorServer = supertest(errorLdp);
2828

29-
var errorServer = supertest(errorAddress);
30-
31-
// Instance of server with error pages flag set to false
32-
var noErrorAddress = 'http://localhost:3458/test/';
33-
34-
var noErrorLdp = ldnode.createServer({
29+
// LDP with no error pages
30+
var noErrorLdp = ldnode({
3531
root: __dirname + '/resources',
3632
noErrorPages: true
3733
});
38-
noErrorLdp.listen(3458);
39-
40-
var noErrorServer = supertest(errorAddress);
41-
34+
var noErrorServer = supertest(noErrorLdp);
35+
36+
function defaultErrorPage(filepath, expected) {
37+
var handler = function (res) {
38+
var errorFile = read(filepath);
39+
if (res.text === errorFile && !expected){
40+
console.log("Not default text");
41+
}
42+
};
43+
return handler;
44+
}
45+
46+
describe('noErrorPages', function () {
47+
var file404 = 'errorPages/404.html';
48+
it('Should return 404 express default page', function(done) {
49+
noErrorServer.get('/non-existent-file.html')
50+
.expect(defaultErrorPage(file404, false))
51+
.expect(404, done);
52+
});
53+
});
4254

43-
describe('Error page test', function() {
55+
describe('errorPages set', function() {
4456
var file404 = 'errorPages/404.html';
45-
function defaultErrorPage(filepath, expected) {
46-
var handler = function (res) {
47-
var errorFile = read(filepath);
48-
if (res.text === errorFile && !expected){
49-
console.log("Not default text");
50-
}
51-
};
52-
return handler;
53-
}
54-
it('Should return 404 custom page if flag set to true',
55-
function(done) {
56-
errorServer.get('non-existent-file.html')
57-
.expect(defaultErrorPage(file404, true))
58-
.expect(404, done);
59-
});
60-
it('Should return 404 default page if flag set to false',
61-
function(done) {
62-
noErrorServer.get('non-existent-file.html')
63-
.expect(defaultErrorPage(file404, false))
64-
.expect(404, done);
65-
});
57+
it('Should return 404 custom page if exists', function(done) {
58+
errorServer.get('/non-existent-file.html')
59+
.expect(defaultErrorPage(file404, true))
60+
.expect(404, done);
61+
});
6662
});
6763
});

‎test/ldp.js‎

Lines changed: 91 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var rm = require('./test-utils').rm;
88
var write = require('./test-utils').write;
99
var cp = require('./test-utils').cp;
1010
var read = require('./test-utils').read;
11+
var fs = require('fs');
1112

1213
describe('LDP', function () {
1314
var ldp = new LDP();
@@ -83,26 +84,109 @@ describe('LDP', function () {
8384
});
8485

8586
describe('listContainer', function () {
86-
it('should ldp:contains the same amount of files in dir', function(done) {
87+
it('should inherit type if file is .ttl', function(done) {
88+
write('@prefix dcterms: <http://purl.org/dc/terms/>.' +
89+
'@prefix o: <http://example.org/ontology>.' +
90+
'<> a <http://www.w3.org/ns/ldp#MagicType> ;' +
91+
' dcterms:title "This is a magic type" ;' +
92+
' o:limit 500000.00 .', 'sampleContainer/magicType.ttl');
93+
8794
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', function (err, data) {
95+
var graph = $rdf.graph();
96+
$rdf.parse(
97+
data,
98+
graph,
99+
'https://server.tld/sampleContainer',
100+
'text/turtle');
101+
102+
var statements = graph
103+
.each(
104+
$rdf.sym('https://server.tld/magicType.ttl'),
105+
ns.rdf('type'),
106+
undefined)
107+
.map(function(d) {
108+
return d.uri;
109+
});
110+
111+
assert.equal(statements.length, 2);
112+
assert.isAbove(statements.indexOf('http://www.w3.org/ns/ldp#MagicType'), -1);
113+
assert.isAbove(statements.indexOf('http://www.w3.org/ns/posix/stat#File'), -1);
114+
115+
rm('sampleContainer/magicType.ttl');
116+
done();
117+
});
118+
});
119+
120+
it('should not inherit type of BasicContainer/Container if type is File', function(done) {
121+
write('@prefix dcterms: <http://purl.org/dc/terms/>.' +
122+
'@prefix o: <http://example.org/ontology>.' +
123+
'<> a <http://www.w3.org/ns/ldp#Container> ;' +
124+
' dcterms:title "This is a container" ;' +
125+
' o:limit 500000.00 .', 'sampleContainer/containerFile.ttl');
126+
127+
write('@prefix dcterms: <http://purl.org/dc/terms/>.' +
128+
'@prefix o: <http://example.org/ontology>.' +
129+
'<> a <http://www.w3.org/ns/ldp#BasicContainer> ;' +
130+
' dcterms:title "This is a container" ;' +
131+
' o:limit 500000.00 .', 'sampleContainer/basicContainerFile.ttl');
88132

133+
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', function (err, data) {
89134
var graph = $rdf.graph();
90135
$rdf.parse(
91136
data,
92137
graph,
93138
'https://server.tld/sampleContainer',
94139
'text/turtle');
95140

96-
var statements = graph.each(
97-
undefined,
98-
ns.ldp('contains'),
141+
var basicContainerStatements = graph.each(
142+
$rdf.sym('https://server.tld/basicContainerFile.ttl'),
143+
ns.rdf('type'),
99144
undefined);
100145

101-
assert.notEqual(graph.statements.length, 0);
102-
assert.equal(statements.length, 8);
103-
assert.notOk(err);
146+
assert.equal(basicContainerStatements.length, 1);
147+
148+
var containerStatements = graph.each(
149+
$rdf.sym('https://server.tld/containerFile.ttl'),
150+
ns.rdf('type'),
151+
undefined);
152+
153+
assert.equal(containerStatements.length, 1);
154+
155+
basicContainerStatements.forEach(function(statement) {
156+
assert.equal(statement.uri, ns.stat('File').uri);
157+
});
158+
159+
containerStatements.forEach(function(statement) {
160+
assert.equal(statement.uri, ns.stat('File').uri);
161+
});
162+
163+
rm('sampleContainer/containerFile.ttl');
164+
rm('sampleContainer/basicContainerFile.ttl');
104165
done();
105166
});
106167
});
168+
169+
it('should ldp:contains the same amount of files in dir', function(done) {
170+
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', function (err, data) {
171+
fs.readdir(__dirname + '/resources/sampleContainer/', function(err, files) {
172+
var graph = $rdf.graph();
173+
$rdf.parse(
174+
data,
175+
graph,
176+
'https://server.tld/sampleContainer',
177+
'text/turtle');
178+
179+
var statements = graph.each(
180+
undefined,
181+
ns.ldp('contains'),
182+
undefined);
183+
184+
assert.notEqual(graph.statements.length, 0);
185+
assert.equal(statements.length, files.length);
186+
assert.notOk(err);
187+
done();
188+
});
189+
});
190+
});
107191
});
108192
});

0 commit comments

Comments
 (0)