mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-12-08 20:48:48 +00:00
Implemented recaptcha
This commit is contained in:
@@ -3,125 +3,136 @@ var router = express.Router();
|
||||
var path = require('path');
|
||||
|
||||
router.use(function(req, res, next) {
|
||||
next(); // make sure we go to the next routes and don't stop here
|
||||
next(); // make sure we go to the next routes and don't stop here
|
||||
});
|
||||
|
||||
router.route('/api/frontpages').get(function(req, res) {
|
||||
db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
|
||||
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify({channels: docs, viewers: tot[0].total_users}));
|
||||
});
|
||||
});
|
||||
db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
|
||||
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify({channels: docs, viewers: tot[0].total_users}));
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
router.route('/api/list/:channel_name').get(function(req, res) {
|
||||
res.header("Access-Control-Allow-Origin", "*");
|
||||
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
|
||||
res.header("Access-Control-Allow-Origin", "*");
|
||||
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
|
||||
|
||||
var channel_name = req.params.channel_name;
|
||||
db.collection(channel_name).find({views: {$exists: false}}, {start: 1, end: 1, added: 1, id: 1, title: 1, votes: 1, duration: 1, type: 1, _id: 0}, function(err, docs) {
|
||||
if(docs.length > 0) {
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify(docs));
|
||||
} else {
|
||||
/*res.status(404);
|
||||
res.send(404);*/
|
||||
res.status(404).redirect("/404");
|
||||
}
|
||||
});
|
||||
var channel_name = req.params.channel_name;
|
||||
db.collection(channel_name).find({views: {$exists: false}}, {start: 1, end: 1, added: 1, id: 1, title: 1, votes: 1, duration: 1, type: 1, _id: 0}, function(err, docs) {
|
||||
if(docs.length > 0) {
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify(docs));
|
||||
} else {
|
||||
/*res.status(404);
|
||||
res.send(404);*/
|
||||
res.status(404).redirect("/404");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
router.route('/api/conf/:channel_name').get(function(req, res) {
|
||||
var channel_name = req.params.channel_name;
|
||||
db.collection(channel_name).find({views: {$exists: true}}, {
|
||||
addsongs: 1,
|
||||
adminpass: 1,
|
||||
allvideos: 1,
|
||||
frontpage: 1,
|
||||
longsongs: 1,
|
||||
removeplay: 1,
|
||||
shuffle: 1,
|
||||
skip: 1,
|
||||
startTime: 1,
|
||||
userpass: 1,
|
||||
vote: 1,
|
||||
_id: 0
|
||||
}, function(err, docs) {
|
||||
if(docs.length > 0) {
|
||||
var conf = docs[0];
|
||||
if(conf.adminpass != "") {
|
||||
conf.adminpass = true;
|
||||
} else {
|
||||
conf.adminpass = false;
|
||||
}
|
||||
if(conf.userpass != "") {
|
||||
conf.userpass = true;
|
||||
} else {
|
||||
conf.userpass = false;
|
||||
}
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify(conf));
|
||||
} else {
|
||||
/*res.status(404);
|
||||
res.send(404);*/
|
||||
res.status(404).redirect("/404");
|
||||
}
|
||||
});
|
||||
var channel_name = req.params.channel_name;
|
||||
db.collection(channel_name).find({views: {$exists: true}}, {
|
||||
addsongs: 1,
|
||||
adminpass: 1,
|
||||
allvideos: 1,
|
||||
frontpage: 1,
|
||||
longsongs: 1,
|
||||
removeplay: 1,
|
||||
shuffle: 1,
|
||||
skip: 1,
|
||||
startTime: 1,
|
||||
userpass: 1,
|
||||
vote: 1,
|
||||
_id: 0
|
||||
}, function(err, docs) {
|
||||
if(docs.length > 0) {
|
||||
var conf = docs[0];
|
||||
if(conf.adminpass != "") {
|
||||
conf.adminpass = true;
|
||||
} else {
|
||||
conf.adminpass = false;
|
||||
}
|
||||
if(conf.userpass != "") {
|
||||
conf.userpass = true;
|
||||
} else {
|
||||
conf.userpass = false;
|
||||
}
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
res.send(JSON.stringify(conf));
|
||||
} else {
|
||||
/*res.status(404);
|
||||
res.send(404);*/
|
||||
res.status(404).redirect("/404");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
router.route('/api/imageblob').post(function(req, res) {
|
||||
var Jimp = require("jimp");
|
||||
Jimp.read('https://img.youtube.com/vi/' + req.body.id + '/mqdefault.jpg', function (err, image) {
|
||||
if (err) console.log(err);
|
||||
image.blur(50)
|
||||
.write(path.join(pathThumbnails, '/public/assets/images/thumbnails/' + req.body.id + '.jpg'), function(e, r) {
|
||||
res.send(req.body.id + ".jpg");
|
||||
});
|
||||
});
|
||||
var Jimp = require("jimp");
|
||||
Jimp.read('https://img.youtube.com/vi/' + req.body.id + '/mqdefault.jpg', function (err, image) {
|
||||
if (err) console.log(err);
|
||||
image.blur(50)
|
||||
.write(path.join(pathThumbnails, '/public/assets/images/thumbnails/' + req.body.id + '.jpg'), function(e, r) {
|
||||
res.send(req.body.id + ".jpg");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
var nodemailer = require('nodemailer');
|
||||
try {
|
||||
var mailconfig = require(path.join(__dirname, '../config/mailconfig.js'));
|
||||
var mailconfig = require(path.join(__dirname, '../config/mailconfig.js'));
|
||||
var recaptcha_config = require(path.join(__dirname, '../config/recaptcha.js'));
|
||||
var Recaptcha = require('express-recaptcha');
|
||||
var RECAPTCHA_SITE_KEY = recaptcha_config.site;
|
||||
var RECAPTCHA_SECRET_KEY = recaptcha_config.key;
|
||||
var recaptcha = new Recaptcha(RECAPTCHA_SITE_KEY, RECAPTCHA_SECRET_KEY);
|
||||
|
||||
router.route('/api/mail').post(function(req, res) {
|
||||
let transporter = nodemailer.createTransport(mailconfig);
|
||||
router.route('/api/mail').post(recaptcha.middleware.verify, function(req, res) {
|
||||
if(req.recaptcha.error == null) {
|
||||
let transporter = nodemailer.createTransport(mailconfig);
|
||||
|
||||
transporter.verify(function(error, success) {
|
||||
if (error) {
|
||||
res.sendStatus(500);
|
||||
return;
|
||||
} else {
|
||||
var from = req.body.from;
|
||||
var message = req.body.message;
|
||||
var msg = {
|
||||
from: 'no-reply@zoff.no',
|
||||
to: 'contact@zoff.no',
|
||||
subject: 'ZOFF: Contact form webpage',
|
||||
text: message,
|
||||
html: message,
|
||||
replyTo: from
|
||||
}
|
||||
transporter.sendMail(msg, (error, info) => {
|
||||
if (error) {
|
||||
res.send("failed");
|
||||
return;
|
||||
}
|
||||
res.send("success");
|
||||
transporter.close();
|
||||
transporter.verify(function(error, success) {
|
||||
if (error) {
|
||||
res.sendStatus(500);
|
||||
return;
|
||||
} else {
|
||||
var from = req.body.from;
|
||||
var message = req.body.message;
|
||||
var msg = {
|
||||
from: 'no-reply@zoff.no',
|
||||
to: 'contact@zoff.no',
|
||||
subject: 'ZOFF: Contact form webpage',
|
||||
text: message,
|
||||
html: message,
|
||||
replyTo: from
|
||||
}
|
||||
transporter.sendMail(msg, (error, info) => {
|
||||
if (error) {
|
||||
res.send("failed");
|
||||
transporter.close();
|
||||
return;
|
||||
}
|
||||
res.send("success");
|
||||
transporter.close();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
res.send("failed");
|
||||
return;
|
||||
}
|
||||
});
|
||||
} catch(e) {
|
||||
console.log("Mail not setup and wont work");
|
||||
console.log("Seems you forgot to create a mailconfig.js in /server/config/. Have a look at the mailconfig.example.js.");
|
||||
router.route('/api/mail').post(function(req, res) {
|
||||
console.log("Someone tried to send a mail, but the mailsystem hasn't been enabled..")
|
||||
res.send("failed");
|
||||
return;
|
||||
});
|
||||
console.log("Mail is not configured and wont work");
|
||||
console.log("Seems you forgot to create a mailconfig.js in /server/config/. Have a look at the mailconfig.example.js.");
|
||||
router.route('/api/mail').post(function(req, res) {
|
||||
console.log("Someone tried to send a mail, but the mailsystem hasn't been enabled..")
|
||||
res.send("failed");
|
||||
return;
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = router;
|
||||
|
||||
@@ -2,8 +2,30 @@ var express = require('express');
|
||||
var router = express.Router();
|
||||
var path = require('path');
|
||||
var year = new Date().getYear()+1900;
|
||||
var path = require('path');
|
||||
|
||||
router.use(function(req, res, next) {
|
||||
try {
|
||||
var Recaptcha = require('express-recaptcha');
|
||||
var recaptcha_config = require(path.join(path.join(__dirname, '../config/'), 'recaptcha.js'));
|
||||
var RECAPTCHA_SITE_KEY = recaptcha_config.site;
|
||||
var RECAPTCHA_SECRET_KEY = recaptcha_config.key;
|
||||
var recaptcha = new Recaptcha(RECAPTCHA_SITE_KEY, RECAPTCHA_SECRET_KEY);
|
||||
} catch(e) {
|
||||
console.log("Error - missing file");
|
||||
console.log("Seems you forgot to create the file recaptcha.js in /server/config/. Have a look at recaptcha.example.js.");
|
||||
var recaptcha = {
|
||||
middleware: {
|
||||
render: (req, res, next) => {
|
||||
res.recaptcha = ""
|
||||
next()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
router.use(recaptcha.middleware.render, function(req, res, next) {
|
||||
next(); // make sure we go to the next routes and don't stop here
|
||||
});
|
||||
|
||||
@@ -19,6 +41,7 @@ router.route('/').post(function(req, res, next){
|
||||
root(req, res, next);
|
||||
});
|
||||
|
||||
|
||||
function root(req, res, next) {
|
||||
try{
|
||||
var url = req.headers['x-forwarded-host'] ? req.headers['x-forwarded-host'] : req.headers.host.split(":")[0];
|
||||
@@ -30,7 +53,8 @@ function root(req, res, next) {
|
||||
if(subdomain[0] == "remote") {
|
||||
var data = {
|
||||
year: year,
|
||||
javascript_file: "remote.min.js"
|
||||
javascript_file: "remote.min.js",
|
||||
captcha: res.recaptcha
|
||||
}
|
||||
res.render('layouts/remote', data);
|
||||
} else if(subdomain[0] == "www") {
|
||||
@@ -39,7 +63,9 @@ function root(req, res, next) {
|
||||
var data = {
|
||||
year: year,
|
||||
javascript_file: "main.min.js",
|
||||
captcha: res.recaptcha
|
||||
}
|
||||
console.log(data.recaptcha);
|
||||
res.render('layouts/frontpage', data);
|
||||
}
|
||||
} catch(e) {
|
||||
@@ -59,7 +85,8 @@ function channel(req, res, next) {
|
||||
if(subdomain[0] == "remote") {
|
||||
var data = {
|
||||
year: year,
|
||||
javascript_file: "remote.min.js"
|
||||
javascript_file: "remote.min.js",
|
||||
captcha: res.recaptcha
|
||||
}
|
||||
res.render('layouts/remote', data);
|
||||
} else if(subdomain.length >= 2 && subdomain[0] == "www") {
|
||||
@@ -74,8 +101,11 @@ function channel(req, res, next) {
|
||||
title: "404: File Not Found",
|
||||
list_name: capitalizeFirstLetter(req.params.channel_name),
|
||||
year: year,
|
||||
javascript_file: "main.min.js"
|
||||
javascript_file: "main.min.js",
|
||||
captcha: res.recaptcha,
|
||||
}
|
||||
|
||||
|
||||
if(req.params.channel_name == "404") {
|
||||
res.status(404);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user