github.com
/
verdaccio
mirror of https://github.com/verdaccio/verdaccio.git
1
0
Fork 0
Code Releases Wiki Activity

Merge pull request #254 from gbtechhub/fix-lb 

fix running behind of loadbalancer with TLS termination
This commit is contained in:
Juan Picado @jotadeveloper 2017-07-18 20:56:40 +02:00 committed by GitHub
parent 44dfb877f5 7df6948fe6
commit 4829e5286e
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/index-web.js
View File

@ -45,8 +45,7 @@ module.exports = function(config, auth, storage) {
template = Handlebars.compile(fs.readFileSync(require.resolve('./GUI/index.hbs'), 'utf8')); template = Handlebars.compile(fs.readFileSync(require.resolve('./GUI/index.hbs'), 'utf8'));
} }
app.get('/', function(req, res, next) { app.get('/', function(req, res, next) {
let proto = req.get('X-Forwarded-Proto') || req.protocol; let base = Utils.combineBaseUrl(Utils.getWebProtocol(req), req.get('host'), config.url_prefix);
let base = Utils.combineBaseUrl(proto, req.get('host'), config.url_prefix);
res.setHeader('Content-Type', 'text/html'); res.setHeader('Content-Type', 'text/html');
storage.get_local(function(err, packages) { storage.get_local(function(err, packages) {
@ -111,17 +110,13 @@ module.exports = function(config, auth, storage) {
res.cookies.set('token', auth.aes_encrypt(str).toString('base64')); res.cookies.set('token', auth.aes_encrypt(str).toString('base64'));
} }
let base = config.url_prefix let base = Utils.combineBaseUrl(Utils.getWebProtocol(req), req.get('host'), config.url_prefix);
? config.url_prefix.replace(/\/$/, '')
: req.protocol + '://' + req.get('host');
res.redirect(base); res.redirect(base);
}); });
}); });
app.post('/-/logout', function(req, res, next) { app.post('/-/logout', function(req, res, next) {
let base = config.url_prefix let base = Utils.combineBaseUrl(Utils.getWebProtocol(req), req.get('host'), config.url_prefix);
? config.url_prefix.replace(/\/$/, '')
: req.protocol + '://' + req.get('host');
res.cookies.set('token', ''); res.cookies.set('token', '');
res.redirect(base); res.redirect(base);
}); });

12
lib/utils.js
View File

@ -120,7 +120,7 @@ function filter_tarball_urls(pkg, req, config) {
return _url; return _url;
} }
const filename = URL.parse(_url).pathname.replace(/^.*\//, ''); const filename = URL.parse(_url).pathname.replace(/^.*\//, '');
const base = combineBaseUrl(req.protocol, req.headers.host, config.url_prefix); const base = combineBaseUrl(getWebProtocol(req), req.headers.host, config.url_prefix);
return `${base}/${pkg.name.replace(/\//g, '%2f')}/-/${filename}`; return `${base}/${pkg.name.replace(/\//g, '%2f')}/-/${filename}`;
}; };
@ -314,6 +314,15 @@ function parseInterval(interval) {
return result; return result;
} }
/**
* Detect running protocol (http or https)
* @param {*} req
* @return {String}
*/
function getWebProtocol(req) {
return req.get('X-Forwarded-Proto') || req.protocol;
}
module.exports.parseInterval = parseInterval; module.exports.parseInterval = parseInterval;
module.exports.semver_sort = semverSort; module.exports.semver_sort = semverSort;
module.exports.parse_address = parse_address; module.exports.parse_address = parse_address;
@ -326,3 +335,4 @@ module.exports.validate_metadata = validate_metadata;
module.exports.is_object = isObject; module.exports.is_object = isObject;
module.exports.validate_name = validate_name; module.exports.validate_name = validate_name;
module.exports.validate_package = validate_package; module.exports.validate_package = validate_package;
module.exports.getWebProtocol = getWebProtocol;