diff --git a/server.js b/server.js index 91ce0d3..8e13604 100755 --- a/server.js +++ b/server.js @@ -65,20 +65,11 @@ try { var newMessages = ""; app.set('view engine', 'ejs'); -app.use(function(req, res, next) { - var ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress; - if (req.headers['cf-connecting-ip']) { - next(); - } else { - res.status(404); - res.end(); - logger.Log("[BLOCK]: " + req.connection.remoteAddress + " blocked, " + req.url, logger.GetColor("redbg")); - } -}); app.use(function(req, res, next) { res.on('finish', function() { - if (res.statusCode != 404 && req.connection.remoteAddress != "::1") - Log(req); + if (res.statusCode != 404 && req.connection.remoteAddress != "::1"){ + // Log(req); + } else Log(req, true); }); @@ -124,7 +115,6 @@ app.get('/static', function(req, res) { }); app.post('/postquestions', function(req, res) { - //res.redirect('back'); var log = "Questions posted! "; if (req.body.data_field == undefined) { res.render('submitted', { @@ -231,10 +221,12 @@ app.get('/sanityCheck', function(req, res) { app.get('/scriptgit', function(req, res) { res.redirect("https://gitlab.com/YourFriendlyNeighborhoodDealer/moodle-test-userscript"); + res.end(); }); app.get('/servergit', function(req, res) { res.redirect("https://gitlab.com/YourFriendlyNeighborhoodDealer/question-node-server"); + res.end(); }); app.get('*', function(req, res) { diff --git a/utils.js b/utils.js new file mode 100644 index 0000000..b61d506 --- /dev/null +++ b/utils.js @@ -0,0 +1,67 @@ +module.exports = { + ReadFile: ReadFile, + WriteFile: WriteFile, + writeFileAsync: WriteFileAsync, + AppendToFile: AppendToFile, + Beep: Beep, + WriteBackup: WriteBackup +}; + +var fs = require('fs'); + +var logger = require('./logger.js'); + +const recievedFile = "stats/recieved"; +const publicFile = "public/data/public"; +const staticFile = "public/data/static"; +const manFile = "public/man.html"; +const logFile = "stats/logs"; + +function ReadFile(name) { + return fs.readFileSync(name, "utf8"); +} + +function WriteFile(content, path) { + fs.writeFileSync(path, content); +} + +function WriteFileAsync(content, path) { + fs.writeFile(path, content, function(err) { + if (err) { + logger.Log("[ERR ]: Error writing file: " + path + " (sync)", logger.GetColor("redbg")); + } + }); +} + +function AppendToFile(data, file) { + fs.appendFile(file, "\n" + data, function(err) { + if (err) + logger.Log("[ERR ]: Error writing log file: " + path + " (sync)", logger.GetColor("redbg")); + }); +} + +function Beep() { + try { + process.stdout.write('\x07'); + } catch (e) { + console.log("error beepin"); + } +} + +function WriteBackup() { + try { + WriteFileAsync(ReadFile(recievedFile), 'public/backs/recieved_' + new Date().toString()); + //logger.Log('[SAVE]: New questions backup wrote'); + + } catch (e) { + logger.Log("[ERR ]: Error backing up recieved file!", logger.GetColor("redbg")); + console.log(e); + } + try { + WriteFileAsync(ReadFile(publicFile), 'public/backs/public_' + new Date().toString()); + //logger.Log('[SAVE]: Public questions backup wrote'); + } catch (e) { + logger.Log("[ERR ]: Error backing up public file!", logger.GetColor("redbg"), true); + console.log(e); + } +}