gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1302 from tanis2000/tanis2000-1273

Browse Source 
Fixes #1273 (URL validation when submitting news)
This commit is contained in:
Berkeley Martinez
2015-08-01 16:37:01 -07:00
parent 1b15f28320 d80fe7ff43
commit 1b948ed4af
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/boot/story.js
View File

@ -9,6 +9,7 @@ var Rx = require('rx'),
saveUser = require('../utils/rx').saveUser, saveUser = require('../utils/rx').saveUser,
saveInstance = require('../utils/rx').saveInstance, saveInstance = require('../utils/rx').saveInstance,
MongoClient = mongodb.MongoClient, MongoClient = mongodb.MongoClient,
validator = require('validator'),
secrets = require('../../config/secrets'); secrets = require('../../config/secrets');
var foundationDate = 1413298800000; var foundationDate = 1413298800000;
@ -262,9 +263,8 @@ module.exports = function(app) {
return next(new Error('Must be logged in')); return next(new Error('Must be logged in'));
} }
var url = req.body.data.url; var url = req.body.data.url;
var cleanURL = cleanData(url);
if (cleanURL !== url) { if (!validator.isURL(url)) {
req.flash('errors', { req.flash('errors', {
msg: "The URL you submitted doesn't appear valid" msg: "The URL you submitted doesn't appear valid"
}); });

4
server/boot/user.js
View File

@ -426,7 +426,7 @@ module.exports = function(app) {
{ {
where: { where: {
resetPasswordToken: req.params.token, resetPasswordToken: req.params.token,
resetPasswordExpires: Date.now() resetPasswordExpires: { gte: Date.now() }
} }
}, },
function(err, user) { function(err, user) {
@ -463,7 +463,7 @@ module.exports = function(app) {
{ {
where: { where: {
resetPasswordToken: req.params.token, resetPasswordToken: req.params.token,
resetPasswordExpires: Date.now() resetPasswordExpires: { gte: Date.now() }
} }
}, },
function(err, user) { function(err, user) {