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
16 changes: 16 additions & 0 deletions bin/lib/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,22 @@ module.exports = [
when: (answers) => {
return answers.useApiApps
}
},
{ // copied from name: 'owner'
name: 'redirect-http-from',
help: 'HTTP port or \',\'-separated ports to redirect to the solid server port (e.g. "80,8080").',
prompt: false,
validate: function (value) {
if (!value.match(/^[0-9]+(,[0-9]+)*$/)) {
return 'direct-port(s) must be a comma-separated list of integers.'
}
let list = value.split(/,/).map(v => parseInt(v))
let bad = list.find(v => { return v < 1 || v > 65535 })
if (bad.length) {
return 'redirect-http-from port(s) ' + bad + ' out of range'
}
return true
}
}
]

Expand Down
18 changes: 18 additions & 0 deletions lib/create-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,24 @@ function createServer (argv, app) {
server = https.createServer(credentials, app)
}

// Look for port or list of ports to redirect to argv.port
if ('redirectHTTPFrom' in argv) {
const redirectHTTPFroms = argv.redirectHTTPFrom.constructor === Array
? argv.redirectHTTPFrom
: [argv.redirectHTTPFrom]
const portStr = argv.port === 443 ? '' : ':' + argv.port
redirectHTTPFroms.forEach(redirectHTTPFrom => {
debug.settings('will redirect from port ' + redirectHTTPFrom + ' to port ' + argv.port)
let redirectingServer = express()
redirectingServer.get('*', function (req, res) {
let host = req.headers.host.split(':') // ignore port
debug.server(host, '=> https://' + host + portStr + req.url)
res.redirect('https://' + host + portStr + req.url)
})
redirectingServer.listen(redirectHTTPFrom)
})
}

// Setup Express app
if (ldp.live) {
var solidWs = SolidWs(server, ldpApp)
Expand Down