Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add temporary logging

Browse source
This commit is contained in:
Joseph Canero 2017-10-03 16:35:24 -04:00
parent 9b673638e3
commit 79f1b26983
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/serve_style.js
View file

@ -85,6 +85,8 @@ module.exports = function (options, repo, params, id, reportTiles, reportFont) {
app.get('/' + id + '/style.json', function (req, res, next) { app.get('/' + id + '/style.json', function (req, res, next) {
var fixUrl = function (url, opt_nokey, opt_nostyle) { var fixUrl = function (url, opt_nokey, opt_nostyle) {
console.log("URL:", url);
console.log("current options:", options);
if (!url || (typeof url !== 'string') || (url.indexOf('local://') !== 0 && !isWhitelistedUrl(url))) { if (!url || (typeof url !== 'string') || (url.indexOf('local://') !== 0 && !isWhitelistedUrl(url))) {
return url; return url;
} }
@ -97,18 +99,33 @@ module.exports = function (options, repo, params, id, reportTiles, reportFont) {
queryParams[options.auth.keyName] = req.query[options.auth.keyName]; queryParams[options.auth.keyName] = req.query[options.auth.keyName];
} }
console.log("params:", queryParams);
if (url.indexOf('local://') === 0) { if (url.indexOf('local://') === 0) {
var query = querystring.stringify(queryParams); var query = querystring.stringify(queryParams);
if (query.length) { if (query.length) {
query = '?' + query; query = '?' + query;
} }
console.log(url.replace(
'local://', req.protocol + '://' + req.headers.host + '/') + query);
return url.replace( return url.replace(
'local://', req.protocol + '://' + req.headers.host + '/') + query; 'local://', req.protocol + '://' + req.headers.host + '/') + query;
} else { // whitelisted url. might have existing parameters } else { // whitelisted url. might have existing parameters
var parsedUrl = nodeUrl.parse(url); var parsedUrl = nodeUrl.parse(url);
console.log("parsed url:", parsedUrl);
var parsedQS = querystring.parse(url.query); var parsedQS = querystring.parse(url.query);
console.log("parsedQS:", parsedQS);
var newParams = Object.assign(parsedQS, queryParams); var newParams = Object.assign(parsedQS, queryParams);
console.log("newParams:", newParams);
parsedUrl.search = querystring.stringify(parsedQS); parsedUrl.search = querystring.stringify(parsedQS);
console.log("new parsed url:", parsedUrl);
console.log(url.format(parsedUrl));
return url.format(parsedUrl); return url.format(parsedUrl);
} }
}; };

2
src/server.js
View file

@ -71,6 +71,8 @@ function start(opts) {
options.auth.keyName = options.auth.keyName || 'key'; options.auth.keyName = options.auth.keyName || 'key';
options.auth.keyDomains = options.auth.keyDomains || []; options.auth.keyDomains = options.auth.keyDomains || [];
console.log("options:", options);
var paths = options.paths || {}; var paths = options.paths || {};
options.paths = paths; options.paths = paths;
paths.root = path.resolve( paths.root = path.resolve(