Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion bin/http-server
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ var colors = require('colors/safe'),
httpServer = require('../lib/http-server'),
portfinder = require('portfinder'),
opener = require('opener'),
fs = require('fs');

fs = require('fs'),
url = require('url');
var argv = require('minimist')(process.argv.slice(2), {
alias: {
tls: 'ssl'
Expand Down Expand Up @@ -160,6 +162,16 @@ function listen(port) {
}
}

if (proxy) {
try {
new url.URL(proxy)
}
catch (err) {
logger.info(colors.red('Error: Invalid proxy url'));
process.exit(1);
}
}

if (tls) {
options.https = {
cert: argv.C || argv.cert || 'cert.pem',
Expand Down
13 changes: 13 additions & 0 deletions test/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,16 @@ test('setting mimeTypes via cli - directly', (t) => {
});
});
});

test('--proxy requires you to specify a protocol', (t) => {
t.plan(1);

const options = ['.', '--proxy', 'google.com'];
const server = startServer(options);

tearDown(server, t);

server.on('exit', (code) => {
t.equal(code, 1);
});
});