From 9aa3853bcf3c89a37bff268ecea3d2c8ad8342e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Dahlgren?= <bjorn@dahlgren.at>
Date: Sat, 21 Nov 2015 12:41:32 +0100
Subject: [PATCH] Improved file handling of mission files Fixes #19

---
 public/js/tpl/missions/list_item.html |  2 +-
 routes/missions.js                    | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/js/tpl/missions/list_item.html b/public/js/tpl/missions/list_item.html
index 30432e2..49ecff6 100644
--- a/public/js/tpl/missions/list_item.html
+++ b/public/js/tpl/missions/list_item.html
@@ -1,5 +1,5 @@
 <td style="width: 100%;">
-  <a href='/api/missions/<%-name%>'><%-name%></a>
+  <a href='/api/missions/<%-encodeURI(name)%>'><%-name%></a>
 </td>
 <td>
   <button type="button" class="btn btn-danger btn-xs delete">
diff --git a/routes/missions.js b/routes/missions.js
index f7826a4..9345398 100644
--- a/routes/missions.js
+++ b/routes/missions.js
@@ -1,10 +1,14 @@
 var fs = require('fs');
+var path = require('path');
 
 var config = require('./../config');
 
+function missionsPath() {
+  return path.join(config.path, 'mpmissions');
+}
+
 exports.index = function(req, res){
-  var path = config.path + '/mpmissions';
-  fs.readdir(path, function (err, files) {
+  fs.readdir(missionsPath(), function (err, files) {
     if (err) {
       res.send(err);
     } else {
@@ -22,31 +26,29 @@ exports.create = function(req, res){
   var missionFile = req.files.mission;
 
   fs.readFile(missionFile.path, function (err, data) {
-    var newPath = config.path + '/mpmissions/' + missionFile.name.toLowerCase();
-    fs.writeFile(newPath, data, function (err) {
+    var filename = decodeURI(missionFile.name.toLowerCase());
+    fs.writeFile(path.join(missionsPath(), filename), data, function (err) {
       res.json(missionFile);
     });
   });
 };
 
 exports.show = function(req, res){
-  var path = config.path + '/mpmissions/' + req.params.mission;
-
+  var filename = req.params.mission;
   if (req.params.format) {
-    path += '.' + req.params.format;
+    filename += '.' + req.params.format;
   }
 
-  res.download(path);
+  res.download(path.join(missionsPath(), encodeURI(filename)), decodeURI(filename));
 };
 
 exports.destroy = function(req, res){
-  var path = config.path + '/mpmissions/' + req.params.mission;
-
+  var filename = req.params.mission;
   if (req.params.format) {
-    path += '.' + req.params.format;
+    filename += '.' + req.params.format;
   }
 
-  fs.unlink(path, function (err) {
+  fs.unlink(path.join(missionsPath(), filename), function (err) {
     if (err) {
       res.json(500, {success: false});
     } else {