Merge pull request #18 from llaske/fix/11

Allow special characters in deployment description

api/controller/deployments.js

@@ -4,6 +4,7 @@ var Helm = require("nodejs-helm").Helm,
 	nodemailer = require('nodemailer'),
 	fs = require('fs'),
 	mongo = require('mongodb'),
+	validator = require('validator'),
 	exec = require('child_process').exec;
 
 var db;
@@ -123,6 +124,7 @@ exports.findById = function(req, res) {
 		collection.findOne({
 			'_id': new mongo.ObjectID(req.params.did)
 		}, function(err, item) {
+			item.deployment_description = validator.unescape(item.deployment_description);
 			res.send(item);
 		});
 	});
@@ -228,7 +230,7 @@ exports.getAllDeployments = function(query, options, callback) {
 					insensitive: { "$toLower": "$name" }
 				}
 			},
-			{ 
+			{
 				$sort: {
 					"insensitive": 1
 				}
@@ -455,7 +457,7 @@ exports.updateDeployment = function(req, res) {
 
 	var did = req.params.did;
 	var deployment = JSON.parse(req.body.deployment);
-    
+
 	deployment.timestamp = +new Date(); // Update timestamp
 	delete deployment.school_short_name; // Disable school_short_name change
 	delete deployment.deployed; // Disable deployed state change
@@ -666,7 +668,7 @@ exports.updateStatus = function(req, res) {
 										  </div>`,
 											subject: statusTitle
 										};
-					
+
 										var smtpTransporter = nodemailer.createTransport({
 											port: smtp_port,
 											host: smtp_host,

dashboard/controller/deployments/editDeployment.js

@@ -1,6 +1,7 @@
 // include libraries
 var superagent = require('superagent'),
 	common = require('../../../helper/common'),
+	validator = require('validator'),
 	regexValidate = require('../../../helper/regexValidate');
 
 var deployments = require('./index');
@@ -9,7 +10,7 @@ module.exports = function editDeployment(req, res) {
 	if (req.params.did) {
 		if (req.method == 'POST') {
 			// validate
-    
+
 			delete req.body.school_short_name;
 			delete req.body.deployed;
 			delete req.body.status;
@@ -70,13 +71,11 @@ module.exports = function editDeployment(req, res) {
 				delete req.body.device_info;
 			}
 
-			req.body.deployment_description = req.body.deployment_description ? req.body.deployment_description.trim() : '';
-			if (req.body.deployment_description) {
-				req.assert('deployment_description', {text: 'deployment-description-invalid'}).matches(regexValidate('deployment-description'));
-			} else {
+			req.body.deployment_description = req.body.deployment_description ? validator.escape(req.body.deployment_description.trim()) : '';
+			if (!req.body.deployment_description) {
 				delete req.body.deployment_description;
 			}
-  
+
 			if (Object.keys(req.body).length === 0) {
 				req.flash('errors', {
 					msg: {
@@ -149,7 +148,7 @@ module.exports = function editDeployment(req, res) {
 							}
 						});
 						return res.redirect('/deployments');
-					} 
+					}
 				});
 		}
 	} else {

dashboard/controller/deployments/requestDeployment.js

@@ -1,5 +1,6 @@
 // include libraries
 var superagent = require('superagent'),
+	validator = require('validator'),
 	common = require('../../../helper/common'),
 	regexValidate = require('../../../helper/regexValidate');
 
@@ -37,12 +38,11 @@ module.exports = function requestDeployment(req, res) {
 		req.body.device_info = req.body.device_info ? req.body.device_info.trim() : '';
 		req.assert('device_info', {text: 'device-info-invalid'}).matches(regexValidate('devices'));
 
-		req.body.deployment_description = req.body.deployment_description ? req.body.deployment_description.trim() : '';
-		req.assert('deployment_description', {text: 'deployment-description-invalid'}).matches(regexValidate('deployment-description'));
+		req.body.deployment_description = req.body.deployment_description ? validator.escape(req.body.deployment_description.trim()) : '';
 
 		// get errors
 		var errors = req.validationErrors();
-        
+
 		if (!errors) {
 			superagent
 				.post(common.getAPIUrl(req) + 'api/v1/deployments')

helper/regexValidate.js

@@ -18,8 +18,6 @@ module.exports = function(type) {
 		return /^en$|^es$|^fr$|^hi$/;
 	case "address":
 		return /^[^!@$^%+={}|<>?"`;:&]+$/;
-	case "deployment-description":
-		return /^[^@$^%+={}|<>"'`;:&]{3,1024}$/i;
 	case "number":
 		return /^[0-9]+$/i;
 	case "devices":