KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding timeout for usual get-requests when not authenticated with a token

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-10-02 15:03:27 +02:00
parent b537aa1af6
commit aa74a10305
2 changed files with 222 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/public/assets/js/frontpage.js
View File

@@ -283,7 +283,10 @@ var Frontpage = {
Frontpage.frontpage_function(); Frontpage.frontpage_function();
/*Helper.ajax({ /*Helper.ajax({
url: add + "/api/frontpages", url: add + "/api/frontpages",
method: "get", method: "POST",
data: {
token: zoff_api_token,
},
success: function(response){ success: function(response){
response = JSON.parse(response); response = JSON.parse(response);
Frontpage.frontpage_function(response.results); Frontpage.frontpage_function(response.results);

192
server/routing/client/api.js
View File

@@ -88,6 +88,10 @@ router.route('/api/frontpages').get(function(req, res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
checkTimeout(guid, res, false, "GET", function() {
Frontpage.get_frontpage_lists(function(err, docs) { Frontpage.get_frontpage_lists(function(err, docs) {
//db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) { //db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) { db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
@@ -98,6 +102,47 @@ router.route('/api/frontpages').get(function(req, res) {
}); });
}); });
}); });
});
router.route('/api/frontpages').post(function(req, res) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"});
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
var token = "";
if(req.body.hasOwnProperty("token")) {
token = req.body.token;
}
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
token_db.collection("api_token").find({token: token}, function(err, token_docs) {
var authorized = false;
var origin;
try {
origin = req.headers.referer.split("/")[2];
} catch(e) { origin = ""; }
if(token_docs.length == 1 && token_docs[0].token == token && (token_docs[0].origin == "*" || origin.indexOf(token_docs[0].origin) > -1)) {
authorized = true;
}
checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "POST", function() {
Frontpage.get_frontpage_lists(function(err, docs) {
//db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
var to_return = error.no_error;
to_return.results = {channels: docs, viewers: tot[0].total_users.length};
res.status(200).send(to_return);
return;
});
});
});
})
});
});
router.route('/api/generate_name').get(function(req, res) { router.route('/api/generate_name').get(function(req, res) {
Functions.generate_channel_name(res); Functions.generate_channel_name(res);
@@ -177,10 +222,10 @@ router.route('/api/list/:channel_name/:video_id').delete(function(req, res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "DELETE", function() { checkTimeout(guid, res, authorized, "DELETE", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "DELETE", function(err, docs) { //updateTimeout(guid, res, authorized, "DELETE", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
validateLogin(adminpass, userpass, channel_name, "delete", res, function(exists) { validateLogin(adminpass, userpass, channel_name, "delete", res, function(exists) {
if(!exists) { if(!exists) {
@@ -204,16 +249,16 @@ router.route('/api/list/:channel_name/:video_id').delete(function(req, res) {
io.to(channel_name).emit("channel", {type:"deleted", value: video_id}); io.to(channel_name).emit("channel", {type:"deleted", value: video_id});
if(!dont_increment) { if(!dont_increment) {
db.collection("frontpage_lists").update({_id: channel_name, count: {$gt: 0}}, {$inc: {count: -1}, $set:{accessed: Functions.get_time()}}, {upsert: true}, function(err, docs){ db.collection("frontpage_lists").update({_id: channel_name, count: {$gt: 0}}, {$inc: {count: -1}, $set:{accessed: Functions.get_time()}}, {upsert: true}, function(err, docs){
updateTimeout(guid, res, authorized, "DELETE", function(err, docs) { //updateTimeout(guid, res, authorized, "DELETE", function(err, docs) {
res.status(200).send(error.no_error); res.status(200).send(error.no_error);
return; return;
}); //});
}); });
} else { } else {
updateTimeout(guid, res, authorized, "DELETE", function(err, docs) { //updateTimeout(guid, res, authorized, "DELETE", function(err, docs) {
res.status(200).send(error.no_error); res.status(200).send(error.no_error);
return; return;
}); //});
} }
}); });
} }
@@ -332,10 +377,10 @@ router.route('/api/conf/:channel_name').put(function(req, res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "CONFIG", function() { checkTimeout(guid, res, authorized, "CONFIG", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "CONFIG", function(err, docs) { //updateTimeout(guid, res, authorized, "CONFIG", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
validateLogin(adminpass, userpass, channel_name, "config", res, function(exists, conf) { validateLogin(adminpass, userpass, channel_name, "config", res, function(exists, conf) {
if(!exists && conf.length == 0) { if(!exists && conf.length == 0) {
@@ -383,12 +428,12 @@ router.route('/api/conf/:channel_name').put(function(req, res) {
if(authorized) { if(authorized) {
incrementToken(token); incrementToken(token);
} }
updateTimeout(guid, res, authorized, "CONFIG", function(err, docs) { //updateTimeout(guid, res, authorized, "CONFIG", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
to_return.results = [obj]; to_return.results = [obj];
res.status(200).send(to_return); res.status(200).send(to_return);
return; return;
}); //});
}); });
}); });
}); });
@@ -458,10 +503,10 @@ router.route('/api/list/:channel_name/:video_id').put(function(req,res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "PUT", function() { checkTimeout(guid, res, authorized, "PUT", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "PUT", function(err, docs) { //updateTimeout(guid, res, authorized, "PUT", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
validateLogin(adminpass, userpass, channel_name, "vote", res, function(exists) { validateLogin(adminpass, userpass, channel_name, "vote", res, function(exists) {
if(!exists) { if(!exists) {
@@ -484,12 +529,12 @@ router.route('/api/list/:channel_name/:video_id').put(function(req,res) {
} }
io.to(channel_name).emit("channel", {type: "vote", value: video_id, time: Functions.get_time()}); io.to(channel_name).emit("channel", {type: "vote", value: video_id, time: Functions.get_time()});
List.getNextSong(channel_name, undefined, function() { List.getNextSong(channel_name, undefined, function() {
updateTimeout(guid, res, authorized, "PUT", function(err, docs) { //updateTimeout(guid, res, authorized, "PUT", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
to_return.results = song; to_return.results = song;
res.status(200).send(to_return); res.status(200).send(to_return);
return; return;
}); //});
}); });
}); });
} }
@@ -507,22 +552,20 @@ router.route('/api/list/:channel_name/__np__').post(function(req, res) {
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
try { try {
if(!req.body.hasOwnProperty('userpass')) {
throw "Wrong format";
}
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]); var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
var userpass;
if(req.body.hasOwnProperty("userpass")) {
req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64"); req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64");
var userpass = req.body.userpass; userpass = req.body.userpass;
} else {
userpass = "";
}
var token = ""; var token = "";
if(req.body.hasOwnProperty("token")) { if(req.body.hasOwnProperty("token")) {
token = req.body.token; token = req.body.token;
} }
if(typeof(userpass) != "string") {
throw "Wrong format";
}
} catch(e) { } catch(e) {
var result = { var result = {
userpass: { userpass: {
@@ -552,10 +595,10 @@ router.route('/api/list/:channel_name/__np__').post(function(req, res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "POST", function() { checkTimeout(guid, res, authorized, "POST", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
db.collection(channel_name).find({now_playing: true}, projects.toShowChannel, function(err, list) { db.collection(channel_name).find({now_playing: true}, projects.toShowChannel, function(err, list) {
if(list.length > 0) { if(list.length > 0) {
@@ -570,7 +613,7 @@ router.route('/api/list/:channel_name/__np__').post(function(req, res) {
res.status(403).send(error.not_authenticated); res.status(403).send(error.not_authenticated);
return; return;
} }
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
if(list[0].source == undefined) { if(list[0].source == undefined) {
list[0].source = "youtube"; list[0].source = "youtube";
@@ -581,7 +624,7 @@ router.route('/api/list/:channel_name/__np__').post(function(req, res) {
to_return.results = list; to_return.results = list;
res.status(200).send(to_return); res.status(200).send(to_return);
return; return;
}); //});
}); });
} else { } else {
res.status(404).send(error.not_found.list); res.status(404).send(error.not_found.list);
@@ -619,8 +662,13 @@ router.route('/api/list/:channel_name/:video_id').post(function(req,res) {
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]); var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
var userpass;
if(req.body.hasOwnProperty("userpass")) {
req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64"); req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64");
var userpass = req.body.userpass; userpass = req.body.userpass;
} else {
userpass = "";
}
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
var video_id = req.params.video_id; var video_id = req.params.video_id;
if(!fetch_only) { if(!fetch_only) {
@@ -691,10 +739,10 @@ router.route('/api/list/:channel_name/:video_id').post(function(req,res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "POST", function() { checkTimeout(guid, res, authorized, "POST", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
var type = fetch_only ? "fetch_song" : "add"; var type = fetch_only ? "fetch_song" : "add";
validateLogin(adminpass, userpass, channel_name, type, res, function(exists, conf, authenticated) { validateLogin(adminpass, userpass, channel_name, type, res, function(exists, conf, authenticated) {
@@ -804,7 +852,10 @@ router.route('/api/list/:channel_name').get(function(req, res) {
}, },
{ "$sort" : { "now_playing" : -1, "votes": -1, "added": 1, "title": 1 } } { "$sort" : { "now_playing" : -1, "votes": -1, "added": 1, "title": 1 } }
], function(err, docs) { ], function(err, docs) {
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
//db.collection(channel_name).find({views: {$exists: false}}, projects.toShowChannel, function(err, docs) { //db.collection(channel_name).find({views: {$exists: false}}, projects.toShowChannel, function(err, docs) {
checkTimeout(guid, res, false, "GET", function() {
if(docs.length > 0) { if(docs.length > 0) {
db.collection(channel_name + "_settings").find({ id: "config" }, function(err, conf) { db.collection(channel_name + "_settings").find({ id: "config" }, function(err, conf) {
if(conf.length == 0) { if(conf.length == 0) {
@@ -823,12 +874,16 @@ router.route('/api/list/:channel_name').get(function(req, res) {
} }
}); });
}); });
});
router.route('/api/list/:channel_name/:video_id').get(function(req, res) { router.route('/api/list/:channel_name/:video_id').get(function(req, res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
checkTimeout(guid, res, false, "GET", function() {
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
var video_id = req.params.video_id; var video_id = req.params.video_id;
var searchQuery = {id: video_id}; var searchQuery = {id: video_id};
@@ -861,12 +916,16 @@ router.route('/api/list/:channel_name/:video_id').get(function(req, res) {
}); });
}); });
}); });
});
router.route('/api/conf/:channel_name').get(function(req, res) { router.route('/api/conf/:channel_name').get(function(req, res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
checkTimeout(guid, res, false, "GET", function() {
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
db.collection(channel_name + "_settings").aggregate([ db.collection(channel_name + "_settings").aggregate([
{ {
@@ -902,6 +961,7 @@ router.route('/api/conf/:channel_name').get(function(req, res) {
} }
}); });
}); });
});
router.route('/api/conf/:channel_name').post(function(req, res) { router.route('/api/conf/:channel_name').post(function(req, res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
@@ -909,9 +969,6 @@ router.route('/api/conf/:channel_name').post(function(req, res) {
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
try { try {
if(!req.body.hasOwnProperty('userpass')) {
throw "Wrong format"
}
var token = ""; var token = "";
if(req.body.hasOwnProperty("token")) { if(req.body.hasOwnProperty("token")) {
token = req.body.token; token = req.body.token;
@@ -919,11 +976,12 @@ router.route('/api/conf/:channel_name').post(function(req, res) {
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]); var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
var userpass;
if(req.body.hasOwnProperty("userpass")) {
req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64"); req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64");
var userpass = req.body.userpass; userpass = req.body.userpass;
} else {
if(typeof(userpass) != "string") { userpass = "";
throw "Wrong format";
} }
} catch(e) { } catch(e) {
var result = { var result = {
@@ -955,10 +1013,10 @@ router.route('/api/conf/:channel_name').post(function(req, res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "POST", function() { checkTimeout(guid, res, authorized, "POST", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "DELETE", function(err, docs) { //updateTimeout(guid, res, authorized, "DELETE", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
db.collection(channel_name + "_settings").aggregate([ db.collection(channel_name + "_settings").aggregate([
{ {
@@ -985,11 +1043,11 @@ router.route('/api/conf/:channel_name').post(function(req, res) {
if(authorized) { if(authorized) {
incrementToken(token); incrementToken(token);
} }
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
to_return.results = [conf]; to_return.results = [conf];
res.status(200).send(to_return); res.status(200).send(to_return);
}); //});
} else if(docs.length > 0 && docs[0].userpass != userpass) { } else if(docs.length > 0 && docs[0].userpass != userpass) {
res.status(403).send(error.not_authenticated); res.status(403).send(error.not_authenticated);
return; return;
@@ -1010,24 +1068,31 @@ function checkOveruseApiToken(authorized, token_docs, res, callback) {
callback(); callback();
return; return;
} }
db.collection("timeout_api").find({guid: token_docs[0].token}, function(e, doc) { db.collection("timeout_api").find({guid: token_docs[0].token}, function(e, doc) {
if(doc.length == 1) { if(doc.length == 1) {
var this_doc = doc[0]; var this_doc = doc[0];
var date = new Date(this_doc[0].createdAt); var date = new Date(this_doc.createdAt);
date.setSeconds(date.getSeconds() + 1); date.setSeconds(date.getSeconds() + 1);
var now = new Date(); var now = new Date();
var retry_in = (date.getTime() - now.getTime()) / 1000; var retry_in = (date.getTime() - now.getTime()) / 1000;
if(this_doc.used > token_docs[0].limit && retry_in > 0) { if(this_doc.used >= token_docs[0].limit && retry_in > 0) {
res.header({'Retry-After': retry_in}); res.header({'Retry-After': retry_in});
res.status(429).send(error.tooMany); res.status(429).send(error.tooMany);
return; return;
} else { } else {
db.collection("timeout_api").update({guid: token_docs[0].token}, {$inc: {used: 1}}, function(e, d) { var updateElement = {};
if(retry_in <= 0) {
updateElement["$set"] = {createdAt: new Date(), used: 1};
} else {
updateElement["$inc"] = {used: 1};
}
db.collection("timeout_api").update({guid: token_docs[0].token}, updateElement, function(e, d) {
callback(); callback();
}); });
} }
} else { } else {
db.collection("timeout_api").insert({guid: token_docs[0].token, used: 0, createdAt: new Date(), type: "ALL"}, function(e, d) { db.collection("timeout_api").update({guid: token_docs[0].token}, {$set: {guid: token_docs[0].token, createdAt: new Date(), type: "ALL"}, $inc: {used: 1}}, {upsert: true}, function(e, d) {
callback(); callback();
}); });
} }
@@ -1039,10 +1104,6 @@ router.route('/api/list/:channel_name').post(function(req, res) {
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
try { try {
if(!req.body.hasOwnProperty('userpass')) {
throw "Wrong format";
}
var token = ""; var token = "";
if(req.body.hasOwnProperty("token")) { if(req.body.hasOwnProperty("token")) {
token = req.body.token; token = req.body.token;
@@ -1050,12 +1111,17 @@ router.route('/api/list/:channel_name').post(function(req, res) {
var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]); var guid = Functions.hash_pass(req.get('User-Agent') + ip + req.headers["accept-language"]);
var channel_name = cleanChannelName(req.params.channel_name); var channel_name = cleanChannelName(req.params.channel_name);
var userpass;
if(req.body.hasOwnProperty("userpass")) {
req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64"); req.body.userpass = req.body.userpass == "" ? "" : crypto.createHash('sha256').update(req.body.userpass, 'utf8').digest("base64");
var userpass = req.body.userpass; userpass = req.body.userpass;
} else {
if(typeof(userpass) != "string") { userpass = "";
throw "Wrong format";
} }
/*if(typeof(userpass) != "string") {
throw "Wrong format";
}*/
} catch(e) { } catch(e) {
var result = { var result = {
userpass: { userpass: {
@@ -1088,10 +1154,10 @@ router.route('/api/list/:channel_name').post(function(req, res) {
checkOveruseApiToken(authorized, token_docs, res, function() { checkOveruseApiToken(authorized, token_docs, res, function() {
checkTimeout(guid, res, authorized, "POST", function() { checkTimeout(guid, res, authorized, "POST", function() {
if(token != "" && !authorized) { if(token != "" && !authorized) {
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
res.status(400).send(error.wrong_token); res.status(400).send(error.wrong_token);
return; return;
}); //});
} else { } else {
db.collection(channel_name).aggregate([ db.collection(channel_name).aggregate([
{ {
@@ -1113,12 +1179,12 @@ router.route('/api/list/:channel_name').post(function(req, res) {
if(authorized) { if(authorized) {
incrementToken(token); incrementToken(token);
} }
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
to_return.results = list; to_return.results = list;
res.status(200).send(to_return); res.status(200).send(to_return);
return; return;
}); //});
}); });
} else { } else {
res.status(404).send(error.not_found.list); res.status(404).send(error.not_found.list);
@@ -1343,7 +1409,17 @@ function checkTimeout(guid, res, authorized, type, callback) {
return; return;
} }
} }
var now_date = new Date();
db.collection("timeout_api").update({type: type, guid: guid}, {
$set: {
"createdAt": now_date,
type: type,
guid: guid,
},
}, {upsert: true}, function(err, docs) {
callback(); callback();
return;
});
}); });
} }
@@ -1391,7 +1467,7 @@ function postEnd(channel_name, configs, new_song, guid, res, authenticated, auth
io.to(channel_name).emit("conf", configs); io.to(channel_name).emit("conf", configs);
} }
List.getNextSong(channel_name, undefined, function() { List.getNextSong(channel_name, undefined, function() {
updateTimeout(guid, res, authorized, "POST", function(err, docs) { //updateTimeout(guid, res, authorized, "POST", function(err, docs) {
var to_return = error.no_error; var to_return = error.no_error;
if(!authenticated) { if(!authenticated) {
to_return = error.not_authenticated; to_return = error.not_authenticated;
@@ -1400,7 +1476,7 @@ function postEnd(channel_name, configs, new_song, guid, res, authenticated, auth
to_return.results = [new_song]; to_return.results = [new_song];
res.status(authenticated ? 200 : 403).send(to_return); res.status(authenticated ? 200 : 403).send(to_return);
return; return;
}); //});
}); });
} }