azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove always-empty first entry in req.url.path_list

Browse Source 
rhyme pro 😎
This commit is contained in:
jomo 2015-04-20 01:10:39 +02:00
parent 0b687d8f8e
commit d025a3004d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/routes/avatars.js
View File

@ -26,7 +26,7 @@ function handle_default(img_status, userId, size, def, callback) {
// GET avatar request // GET avatar request
module.exports = function(req, callback) { module.exports = function(req, callback) {
var userId = (req.url.path_list[2] || "").split(".")[0]; var userId = (req.url.path_list[1] || "").split(".")[0];
var size = parseInt(req.url.query.size) || config.default_size; var size = parseInt(req.url.query.size) || config.default_size;
var def = req.url.query.default; var def = req.url.query.default;
var helm = req.url.query.hasOwnProperty("helm"); var helm = req.url.query.hasOwnProperty("helm");

4
lib/routes/renders.js
View File

@ -22,7 +22,7 @@ var human_status = {
// GET render request // GET render request
module.exports = function(req, res) { module.exports = function(req, res) {
var start = new Date(); var start = new Date();
var raw_type = (req.url.path_list[2] || ""); var raw_type = (req.url.path_list[1] || "");
var rid = req.id; var rid = req.id;
// validate type // validate type
@ -36,7 +36,7 @@ module.exports = function(req, res) {
} }
var body = raw_type === "body"; var body = raw_type === "body";
var userId = (req.url.path_list[3] || "").split(".")[0]; var userId = (req.url.path_list[2] || "").split(".")[0];
var def = req.url.query.default; var def = req.url.query.default;
var scale = parseInt(req.url.query.scale) || config.default_scale; var scale = parseInt(req.url.query.scale) || config.default_scale;
var helm = req.url.query.hasOwnProperty("helm"); var helm = req.url.query.hasOwnProperty("helm");

2
lib/routes/skins.js
View File

@ -8,7 +8,7 @@ var lwip = require("lwip");
// GET skin request // GET skin request
module.exports = function(req, res) { module.exports = function(req, res) {
var start = new Date(); var start = new Date();
var userId = (req.url.path_list[2] || "").split(".")[0]; var userId = (req.url.path_list[1] || "").split(".")[0];
var def = req.url.query.default; var def = req.url.query.default;
var etag = null; var etag = null;
var rid = req.id; var rid = req.id;

7
lib/server.js
View File

@ -46,14 +46,14 @@ function request_id() {
function path_list(pathname) { function path_list(pathname) {
// remove trailing and double slashes + other junk // remove trailing and double slashes + other junk
// FIXME: also accepts relative paths?
pathname = path.resolve(pathname); pathname = path.resolve(pathname);
var list = pathname.split("/"); var list = pathname.split("/");
list.shift();
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
// URL decode // URL decode
list[i] = querystring.unescape(list[i]); list[i] = querystring.unescape(list[i]);
} }
logging.debug("path:", list);
return list; return list;
} }
@ -65,8 +65,9 @@ function requestHandler(req, res) {
req.id = request_id(); req.id = request_id();
req.start = Date.now(); req.start = Date.now();
var local_path = req.url.path_list[1]; var local_path = req.url.path_list[0];
logging.log(req.id, req.method, req.url.href); logging.log(req.id, req.method, req.url.href);
logging.debug(req.id, req.url.path_list);
if (req.method === "GET" || req.method === "HEAD") { if (req.method === "GET" || req.method === "HEAD") {
try { try {
switch (local_path) { switch (local_path) {