Skip to content

Commit 50dfc55

Browse files
committed
Merge pull request #11 from DullReferenceException/abs-cert-path-fix
Fix cert path resolution with absolute paths
2 parents 2f096ba + ba38856 commit 50dfc55

File tree

3 files changed

+24
-8
lines changed

3 files changed

+24
-8
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ results
1313

1414
npm-debug.log
1515
node_modules
16+
17+
.idea

index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ module.exports = function createServers(options, listening) {
146146
//
147147
// Load default SSL key, cert and ca(s).
148148
//
149-
key: fs.readFileSync(path.join(ssl.root, ssl.key)),
150-
cert: fs.readFileSync(path.join(ssl.root, ssl.cert)),
149+
key: fs.readFileSync(path.resolve(ssl.root, ssl.key)),
150+
cert: fs.readFileSync(path.resolve(ssl.root, ssl.cert)),
151151
ca: ssl.ca && ssl.ca.map(
152152
function (file) {
153-
return fs.readFileSync(path.join(ssl.root, file));
153+
return fs.readFileSync(path.resolve(ssl.root, file));
154154
}
155155
),
156156
//

test/create-servers-test.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,25 @@ test('only https', function (t) {
4444
},
4545
handler: fend
4646
}, function (err, servers) {
47-
console.dir(err);
47+
t.error(err);
48+
t.equals(typeof servers, 'object');
49+
t.equals(typeof servers.https, 'object');
50+
servers.https.close();
51+
});
52+
});
53+
54+
test('absolute cert path resolution', function (t) {
55+
t.plan(3);
56+
createServers({
57+
log: console.log,
58+
https: {
59+
port: 3456,
60+
root: '/',
61+
cert: path.resolve(__dirname, 'fixtures', 'agent2-cert.pem'),
62+
key: path.resolve(__dirname, 'fixtures', 'agent2-key.pem')
63+
},
64+
handler: fend
65+
}, function (err, servers) {
4866
t.error(err);
4967
t.equals(typeof servers, 'object');
5068
t.equals(typeof servers.https, 'object');
@@ -65,7 +83,6 @@ test('http && https', function (t) {
6583
},
6684
handler: fend
6785
}, function (err, servers) {
68-
console.dir(err);
6986
t.error(err);
7087
t.equals(typeof servers, 'object');
7188
t.equals(typeof servers.http, 'object');
@@ -115,7 +132,6 @@ test('http && https with different handlers', function (t) {
115132
key: 'agent2-key.pem'
116133
},
117134
}, function (err, servers) {
118-
console.dir(err);
119135
t.error(err);
120136
t.equals(typeof servers, 'object');
121137
t.equals(typeof servers.http, 'object');
@@ -131,7 +147,6 @@ test('http && https with different handlers', function (t) {
131147
http: '9876',
132148
handler: fend
133149
}, function (err, servers) {
134-
console.dir(err);
135150
t.error(err);
136151
t.equals(typeof servers, 'object');
137152
t.equals(typeof servers.http, 'object');
@@ -149,7 +164,6 @@ test('http && https with different handlers', function (t) {
149164
},
150165
handler: fend
151166
}, function (err, servers) {
152-
console.dir(err);
153167
t.error(err);
154168
t.equals(typeof servers, 'object');
155169
t.equals(typeof servers.http, 'object');

0 commit comments

Comments
 (0)