mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Modules now return a function which creates app-s, qmining module auth handle
This commit is contained in:
MrFry
parent
b5f9ede2cf
commit
a03f56028a
12 changed files with 1046 additions and 990 deletions
|
|
@ -3,7 +3,7 @@ const utils = require('../utils/utils.js')
|
|||
const dbtools = require('../utils/dbtools.js')
|
||||
|
||||
module.exports = function (options) {
|
||||
const { authDB, jsonResponse, exceptions } = options
|
||||
const { userDB, jsonResponse, exceptions } = options
|
||||
|
||||
const renderLogin = (res) => {
|
||||
if (jsonResponse) {
|
||||
|
|
@ -23,6 +23,12 @@ module.exports = function (options) {
|
|||
return req.url === exc
|
||||
})
|
||||
|
||||
// TODO Allowing all urls with _next in it, but not in params
|
||||
if (req.url.split('?')[0].includes('_next')) {
|
||||
next()
|
||||
return
|
||||
}
|
||||
|
||||
if (isException) {
|
||||
logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1)
|
||||
next()
|
||||
|
|
@ -35,7 +41,7 @@ module.exports = function (options) {
|
|||
return
|
||||
}
|
||||
|
||||
const user = GetUserBySessionID(authDB, sessionID, req)
|
||||
const user = GetUserBySessionID(userDB, sessionID, req)
|
||||
|
||||
if (!user) {
|
||||
logger.DebugLog(`No user:${req.url}`, 'auth', 1)
|
||||
|
|
@ -50,15 +56,15 @@ module.exports = function (options) {
|
|||
|
||||
logger.DebugLog(`ID #${user.id}: ${req.url}`, 'auth', 1)
|
||||
|
||||
UpdateAccess(authDB, user, ip, sessionID)
|
||||
UpdateAccess(userDB, user, ip, sessionID)
|
||||
|
||||
dbtools.Update(authDB, 'sessions', {
|
||||
dbtools.Update(userDB, 'sessions', {
|
||||
lastAccess: utils.GetDateString()
|
||||
}, {
|
||||
id: sessionID
|
||||
})
|
||||
|
||||
dbtools.Update(authDB, 'users', {
|
||||
dbtools.Update(userDB, 'users', {
|
||||
lastIP: ip,
|
||||
lastAccess: utils.GetDateString()
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -30,10 +30,5 @@
|
|||
"path": "./modules/stuff/stuff.js",
|
||||
"name": "stuff",
|
||||
"urls": [ "stuff.frylabs.net" ]
|
||||
},
|
||||
"old": {
|
||||
"path": "./modules/old/old.js",
|
||||
"name": "old",
|
||||
"urls": [ "qmining.tk", "www.qmining.tk" ]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
const express = require('express')
|
||||
const bodyParser = require('body-parser')
|
||||
const busboy = require('connect-busboy')
|
||||
const cookieParser = require('cookie-parser')
|
||||
const uuidv4 = require('uuid/v4') // TODO: deprecated, but imports are not supported
|
||||
const fs = require('fs')
|
||||
const app = express()
|
||||
|
|
@ -44,7 +43,6 @@ const versionFile = 'public/version'
|
|||
const passwordFile = 'data/dataEditorPasswords.json'
|
||||
const dataEditsLog = 'stats/dataEdits'
|
||||
const dailyDataCountFile = 'stats/dailyDataCount'
|
||||
const usersDBPath = 'data/dbs/users.db'
|
||||
const usersDbBackupPath = 'data/dbs/backup'
|
||||
|
||||
const maxVeteranPwGetCount = 5
|
||||
|
|
@ -52,54 +50,51 @@ const addPWPerDay = 3 // every x day a user can give a pw
|
|||
const maxPWCount = 2 // maximum pw give opportunities a user can have at once
|
||||
const daysAfterUserGetsPWs = 2 // days after user gets pw-s
|
||||
|
||||
if (!utils.FileExists(usersDBPath)) {
|
||||
throw new Error('No user DB exists yet! please run utils/dbSetup.js first!')
|
||||
}
|
||||
const authDB = dbtools.GetDB(usersDBPath)
|
||||
let userDB
|
||||
let url
|
||||
|
||||
const cookieSecret = uuidv4()
|
||||
app.use(cookieParser(cookieSecret))
|
||||
app.use(bodyParser.urlencoded({
|
||||
function GetApp () {
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '10mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '10mb'
|
||||
}))
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
}))
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/api/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(auth({
|
||||
authDB: authDB,
|
||||
])
|
||||
app.use(auth({
|
||||
userDB: userDB,
|
||||
jsonResponse: true,
|
||||
exceptions: [
|
||||
'/favicon.ico',
|
||||
'/login',
|
||||
'/getveteranpw'
|
||||
]
|
||||
}))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
}))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 50000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
}))
|
||||
|
||||
var data = actions.LoadJSON(dataFile)
|
||||
var version = ''
|
||||
var motd = ''
|
||||
var data = actions.LoadJSON(dataFile)
|
||||
var version = ''
|
||||
var motd = ''
|
||||
|
||||
function LoadVersion () {
|
||||
function LoadVersion () {
|
||||
version = utils.ReadFile(versionFile)
|
||||
}
|
||||
}
|
||||
|
||||
function LoadMOTD () {
|
||||
function LoadMOTD () {
|
||||
motd = utils.ReadFile(motdFile)
|
||||
}
|
||||
}
|
||||
|
||||
function Load () {
|
||||
function Load () {
|
||||
utils.WatchFile(motdFile, (newData) => {
|
||||
logger.Log(`Motd changed: ${newData.replace(/\/n/g, '')}`)
|
||||
LoadMOTD()
|
||||
|
|
@ -111,13 +106,13 @@ function Load () {
|
|||
|
||||
LoadVersion()
|
||||
LoadMOTD()
|
||||
}
|
||||
}
|
||||
|
||||
Load()
|
||||
Load()
|
||||
|
||||
// -------------------------------------------------------------
|
||||
// -------------------------------------------------------------
|
||||
|
||||
app.post('/getpw', function (req, res) {
|
||||
app.post('/getpw', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
|
||||
const requestingUser = req.session.user
|
||||
|
|
@ -131,7 +126,7 @@ app.post('/getpw', function (req, res) {
|
|||
return
|
||||
}
|
||||
|
||||
dbtools.Update(authDB, 'users', {
|
||||
dbtools.Update(userDB, 'users', {
|
||||
avaiblePWRequests: requestingUser.avaiblePWRequests - 1,
|
||||
pwRequestCount: requestingUser.pwRequestCount + 1
|
||||
}, {
|
||||
|
|
@ -139,7 +134,7 @@ app.post('/getpw', function (req, res) {
|
|||
})
|
||||
|
||||
const pw = uuidv4()
|
||||
const insertRes = dbtools.Insert(authDB, 'users', {
|
||||
const insertRes = dbtools.Insert(userDB, 'users', {
|
||||
pw: pw,
|
||||
created: utils.GetDateString()
|
||||
})
|
||||
|
|
@ -151,13 +146,13 @@ app.post('/getpw', function (req, res) {
|
|||
pw: pw,
|
||||
remaining: requestingUser.avaiblePWRequests - 1
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/getveteranpw', function (req, res) {
|
||||
app.post('/getveteranpw', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress
|
||||
|
||||
const tries = dbtools.Select(authDB, 'veteranPWRequests', {
|
||||
const tries = dbtools.Select(userDB, 'veteranPWRequests', {
|
||||
ip: ip
|
||||
})[0]
|
||||
|
||||
|
|
@ -170,7 +165,7 @@ app.post('/getveteranpw', function (req, res) {
|
|||
logger.Log(`Too many veteran PW requests from ${ip}!`, logger.GetColor('cyan'))
|
||||
return
|
||||
} else {
|
||||
dbtools.Update(authDB, 'veteranPWRequests', {
|
||||
dbtools.Update(userDB, 'veteranPWRequests', {
|
||||
count: tries.count + 1,
|
||||
lastDate: utils.GetDateString()
|
||||
}, {
|
||||
|
|
@ -178,7 +173,7 @@ app.post('/getveteranpw', function (req, res) {
|
|||
})
|
||||
}
|
||||
} else {
|
||||
dbtools.Insert(authDB, 'veteranPWRequests', {
|
||||
dbtools.Insert(userDB, 'veteranPWRequests', {
|
||||
ip: ip,
|
||||
lastDate: utils.GetDateString()
|
||||
})
|
||||
|
|
@ -194,14 +189,14 @@ app.post('/getveteranpw', function (req, res) {
|
|||
return
|
||||
}
|
||||
|
||||
const user = dbtools.Select(authDB, 'users', {
|
||||
const user = dbtools.Select(userDB, 'users', {
|
||||
oldCID: oldUserID
|
||||
})[0]
|
||||
|
||||
if (user) {
|
||||
if (user.pwGotFromCID === 0) {
|
||||
logger.Log(`Sent password to veteran user #${user.id}`, logger.GetColor('cyan'))
|
||||
dbtools.Update(authDB, 'users', {
|
||||
dbtools.Update(userDB, 'users', {
|
||||
pwGotFromCID: 1
|
||||
}, {
|
||||
id: user.id
|
||||
|
|
@ -225,13 +220,13 @@ app.post('/getveteranpw', function (req, res) {
|
|||
msg: 'no such CID'
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/login', (req, res) => {
|
||||
app.post('/login', (req, res) => {
|
||||
logger.LogReq(req)
|
||||
const pw = req.body.pw
|
||||
const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress
|
||||
const user = dbtools.Select(authDB, 'users', {
|
||||
const user = dbtools.Select(userDB, 'users', {
|
||||
pw: pw
|
||||
})[0]
|
||||
|
||||
|
|
@ -239,20 +234,20 @@ app.post('/login', (req, res) => {
|
|||
const sessionID = uuidv4()
|
||||
|
||||
// FIXME: Users now can only log in in one session, this might be too strict.
|
||||
const existingSessions = dbtools.Select(authDB, 'sessions', {
|
||||
const existingSessions = dbtools.Select(userDB, 'sessions', {
|
||||
userID: user.id
|
||||
})
|
||||
|
||||
if (existingSessions.length > 0) {
|
||||
logger.Log(`Multiple sessions ( ${existingSessions.length} ) for #${user.id}, deleting olds`, logger.GetColor('cyan'))
|
||||
existingSessions.forEach((sess) => {
|
||||
dbtools.Delete(authDB, 'sessions', {
|
||||
dbtools.Delete(userDB, 'sessions', {
|
||||
id: sess.id
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
dbtools.Update(authDB, 'users', {
|
||||
dbtools.Update(userDB, 'users', {
|
||||
loginCount: user.loginCount + 1,
|
||||
lastIP: ip,
|
||||
lastLogin: utils.GetDateString()
|
||||
|
|
@ -260,7 +255,7 @@ app.post('/login', (req, res) => {
|
|||
id: user.id
|
||||
})
|
||||
|
||||
dbtools.Insert(authDB, 'sessions', {
|
||||
dbtools.Insert(userDB, 'sessions', {
|
||||
id: sessionID,
|
||||
ip: ip,
|
||||
userID: user.id,
|
||||
|
|
@ -268,7 +263,10 @@ app.post('/login', (req, res) => {
|
|||
})
|
||||
|
||||
// TODO: cookie age
|
||||
res.cookie('sessionID', sessionID)
|
||||
res.cookie('sessionID', sessionID, {
|
||||
domain: '.frylabs.net', // TODO: use url. url: "https://api.frylabs.net"
|
||||
sameSite: 'none'
|
||||
})
|
||||
|
||||
res.json({
|
||||
result: 'success',
|
||||
|
|
@ -282,46 +280,46 @@ app.post('/login', (req, res) => {
|
|||
msg: 'invalid pw'
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/logout', (req, res) => {
|
||||
app.post('/logout', (req, res) => {
|
||||
logger.LogReq(req)
|
||||
const sessionID = req.cookies.sessionID
|
||||
|
||||
// removing session from db
|
||||
dbtools.Delete(authDB, 'sessions', {
|
||||
dbtools.Delete(userDB, 'sessions', {
|
||||
id: sessionID
|
||||
})
|
||||
// TODO: remove old sessions every once in a while
|
||||
res.clearCookie('sessionID').json({
|
||||
result: 'success'
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
app.get('/', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
res.redirect('https://www.youtube.com/watch?v=ieqGJgqiXFk')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/postfeedbackfile', function (req, res) {
|
||||
app.post('/postfeedbackfile', function (req, res) {
|
||||
UploadFile(req, res, uloadFiles, (fn) => {
|
||||
res.json({ success: true })
|
||||
})
|
||||
|
||||
logger.LogReq(req)
|
||||
logger.Log('New feedback file', logger.GetColor('bluebg'), true)
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/postfeedback', function (req, res) {
|
||||
app.post('/postfeedback', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
logger.Log('New feedback message', logger.GetColor('bluebg'), true)
|
||||
utils.AppendToFile(utils.GetDateString() + ':\n' + JSON.stringify(req.body), msgFile)
|
||||
res.json({ success: true })
|
||||
})
|
||||
})
|
||||
|
||||
function UploadFile (req, res, path, next) {
|
||||
function UploadFile (req, res, path, next) {
|
||||
try {
|
||||
var fstream
|
||||
req.pipe(req.busboy)
|
||||
|
|
@ -347,32 +345,32 @@ function UploadFile (req, res, path, next) {
|
|||
logger.Log(`Unable to upload file!`, logger.GetColor('redbg'))
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
app.route('/fosuploader').post(function (req, res, next) {
|
||||
app.route('/fosuploader').post(function (req, res, next) {
|
||||
UploadFile(req, res, uloadFiles, (fn) => {
|
||||
res.redirect('/f/' + fn)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
app.route('/badtestsender').post(function (req, res, next) {
|
||||
app.route('/badtestsender').post(function (req, res, next) {
|
||||
UploadFile(req, res, recivedFiles, (fn) => {
|
||||
res.redirect('back')
|
||||
})
|
||||
logger.LogReq(req)
|
||||
})
|
||||
})
|
||||
|
||||
app.get('/allqr.txt', function (req, res) {
|
||||
app.get('/allqr.txt', function (req, res) {
|
||||
res.set('Content-Type', 'text/plain')
|
||||
res.send(data.toString())
|
||||
res.end()
|
||||
logger.LogReq(req)
|
||||
})
|
||||
})
|
||||
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// API
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// API
|
||||
|
||||
app.post('/uploaddata', (req, res) => {
|
||||
app.post('/uploaddata', (req, res) => {
|
||||
// body: JSON.stringify({
|
||||
// newData: data,
|
||||
// count: getCount(data),
|
||||
|
|
@ -436,9 +434,9 @@ app.post('/uploaddata', (req, res) => {
|
|||
console.error(e)
|
||||
res.json({ status: respStatuses.error, msg: e.message })
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
app.post('/isAdding', function (req, res) {
|
||||
app.post('/isAdding', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
|
||||
// automatically saves to dataFile every n write
|
||||
|
|
@ -453,9 +451,9 @@ app.post('/isAdding', function (req, res) {
|
|||
success: result !== -1,
|
||||
newQuestions: result
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
app.get('/ask', function (req, res) {
|
||||
app.get('/ask', function (req, res) {
|
||||
if (Object.keys(req.query).length === 0) {
|
||||
logger.DebugLog(`No query params`, 'ask', 1)
|
||||
res.json({
|
||||
|
|
@ -492,26 +490,26 @@ app.get('/ask', function (req, res) {
|
|||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
function getSimplreRes () {
|
||||
function getSimplreRes () {
|
||||
return {
|
||||
subjects: data.length,
|
||||
questions: data.Subjects.reduce((acc, subj) => {
|
||||
return acc + subj.length
|
||||
}, 0)
|
||||
}
|
||||
}
|
||||
function getDetailedRes () {
|
||||
}
|
||||
function getDetailedRes () {
|
||||
return data.Subjects.map((subj) => {
|
||||
return {
|
||||
name: subj.Name,
|
||||
count: subj.length
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
app.get('/datacount', function (req, res) {
|
||||
app.get('/datacount', function (req, res) {
|
||||
logger.LogReq(req)
|
||||
if (req.query.detailed === 'all') {
|
||||
res.json({
|
||||
|
|
@ -523,9 +521,9 @@ app.get('/datacount', function (req, res) {
|
|||
} else {
|
||||
res.json(getSimplreRes())
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
app.get('/infos', function (req, res) {
|
||||
app.get('/infos', function (req, res) {
|
||||
let result = {
|
||||
result: 'success'
|
||||
}
|
||||
|
|
@ -539,19 +537,19 @@ app.get('/infos', function (req, res) {
|
|||
result.motd = motd
|
||||
}
|
||||
res.json(result)
|
||||
})
|
||||
})
|
||||
|
||||
// -------------------------------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------------------------
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
function ExportDailyDataCount () {
|
||||
function ExportDailyDataCount () {
|
||||
logger.Log('Saving daily data count ...')
|
||||
utils.AppendToFile(JSON.stringify({
|
||||
date: utils.GetDateString(),
|
||||
|
|
@ -559,14 +557,14 @@ function ExportDailyDataCount () {
|
|||
questionCOunt: data.Subjects.reduce((acc, subj) => {
|
||||
return acc + subj.Questions.length
|
||||
}, 0),
|
||||
userCount: dbtools.TableInfo(authDB, 'users').dataCount
|
||||
userCount: dbtools.TableInfo(userDB, 'users').dataCount
|
||||
}), dailyDataCountFile)
|
||||
}
|
||||
}
|
||||
|
||||
function BackupDB () {
|
||||
function BackupDB () {
|
||||
logger.Log('Backing up auth DB ...')
|
||||
utils.CreatePath(usersDbBackupPath, true)
|
||||
authDB.backup(`${usersDbBackupPath}/users.${utils.GetDateString().replace(/ /g, '_')}.db`)
|
||||
userDB.backup(`${usersDbBackupPath}/users.${utils.GetDateString().replace(/ /g, '_')}.db`)
|
||||
.then(() => {
|
||||
logger.Log('Auth DB backup complete!')
|
||||
})
|
||||
|
|
@ -574,10 +572,10 @@ function BackupDB () {
|
|||
logger.Log('Auth DB backup failed!', logger.GetColor('redbg'))
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function IncrementAvaiblePWs () {
|
||||
const users = dbtools.SelectAll(authDB, 'users')
|
||||
function IncrementAvaiblePWs () {
|
||||
const users = dbtools.SelectAll(userDB, 'users')
|
||||
const today = new Date()
|
||||
const getDayDiff = (dateString) => {
|
||||
let msdiff = today - new Date(dateString)
|
||||
|
|
@ -595,24 +593,30 @@ function IncrementAvaiblePWs () {
|
|||
}
|
||||
|
||||
if (dayDiff % addPWPerDay === 0) {
|
||||
dbtools.Update(authDB, 'users', {
|
||||
dbtools.Update(userDB, 'users', {
|
||||
avaiblePWRequests: u.avaiblePWRequests + 1
|
||||
}, {
|
||||
id: u.id
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
exports.app = app
|
||||
exports.cleanup = () => {
|
||||
logger.Log('Closing Auth DB')
|
||||
authDB.close()
|
||||
}
|
||||
exports.dailyAction = () => {
|
||||
function DailyActions () {
|
||||
ExportDailyDataCount()
|
||||
BackupDB()
|
||||
IncrementAvaiblePWs()
|
||||
}
|
||||
|
||||
return {
|
||||
DailyActions: DailyActions,
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
logger.Log('API module started', logger.GetColor('yellow'))
|
||||
exports.name = 'API'
|
||||
exports.getApp = GetApp
|
||||
exports.setup = (data) => {
|
||||
userDB = data.userDB
|
||||
url = data.url
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,30 +26,31 @@ const app = express()
|
|||
const utils = require('../../utils/utils.js')
|
||||
const logger = require('../../utils/logger.js')
|
||||
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
function GetApp () {
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/dataEditor/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(express.static('modules/dataEditor/public'))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
])
|
||||
app.use(express.static('modules/dataEditor/public'))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 10000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '5mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '5mb'
|
||||
}))
|
||||
}))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
function AddHtmlRoutes (files) {
|
||||
function AddHtmlRoutes (files) {
|
||||
const routes = files.reduce((acc, f) => {
|
||||
if (f.includes('html')) {
|
||||
acc.push(f.split('.')[0])
|
||||
|
|
@ -65,24 +66,28 @@ function AddHtmlRoutes (files) {
|
|||
res.redirect(`${route}.html`)
|
||||
})
|
||||
})
|
||||
}
|
||||
AddHtmlRoutes(utils.ReadDir('modules/dataEditor/public'))
|
||||
}
|
||||
AddHtmlRoutes(utils.ReadDir('modules/dataEditor/public'))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
app.get('/', function (req, res) {
|
||||
res.end('hai')
|
||||
logger.LogReq(req)
|
||||
})
|
||||
})
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
return {
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
logger.Log('DataEditor module started', logger.GetColor('yellow'))
|
||||
exports.name = 'Data editor'
|
||||
exports.getApp = GetApp
|
||||
|
|
|
|||
|
|
@ -25,49 +25,54 @@ const bodyParser = require('body-parser')
|
|||
const busboy = require('connect-busboy')
|
||||
const app = express()
|
||||
|
||||
const logger = require('../../utils/logger.js')
|
||||
// const logger = require('../../utils/logger.js')
|
||||
// const utils = require('../utils/utils.js')
|
||||
// const actions = require('../utils/actions.js')
|
||||
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
function GetApp () {
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/main/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 10000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '5mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '5mb'
|
||||
}))
|
||||
}))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
app.get('/', function (req, res) {
|
||||
res.render('main', {
|
||||
siteurl: url
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
return {
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
exports.name = 'Main'
|
||||
exports.getApp = GetApp
|
||||
exports.setup = (x) => {
|
||||
url = x.url
|
||||
}
|
||||
|
||||
logger.Log('Main module started', logger.GetColor('yellow'))
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
/* ----------------------------------------------------------------------------
|
||||
|
||||
Question Server
|
||||
GitLab: <https://gitlab.com/MrFry/mrfrys-node-server>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
------------------------------------------------------------------------- */
|
||||
|
||||
let url = ''
|
||||
const express = require('express')
|
||||
const app = express()
|
||||
|
||||
const logger = require('../../utils/logger.js')
|
||||
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
res.redirect(url + req.url)
|
||||
})
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
res.redirect(url + req.url)
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
res.redirect(url + req.url)
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
exports.setup = (x) => {
|
||||
url = x.url
|
||||
}
|
||||
|
||||
logger.Log('Old module started', logger.GetColor('yellow'))
|
||||
|
|
@ -23,49 +23,58 @@ const bodyParser = require('body-parser')
|
|||
const busboy = require('connect-busboy')
|
||||
const app = express()
|
||||
|
||||
const reqlogger = require('../../middlewares/reqlogger.middleware.js')
|
||||
const utils = require('../../utils/utils.js')
|
||||
const logger = require('../../utils/logger.js')
|
||||
const auth = require('../../middlewares/auth.middleware.js')
|
||||
|
||||
let donateURL = ''
|
||||
let userDB
|
||||
|
||||
try {
|
||||
donateURL = utils.ReadFile('./data/donateURL')
|
||||
} catch (e) {
|
||||
logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
|
||||
}
|
||||
|
||||
app.use(bodyParser.urlencoded({
|
||||
function GetApp () {
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '5mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '5mb'
|
||||
}))
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
}))
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/qmining/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(reqlogger())
|
||||
app.use(express.static('modules/qmining/public'))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
])
|
||||
app.use(auth({
|
||||
userDB: userDB,
|
||||
jsonResponse: false,
|
||||
exceptions: [
|
||||
'/favicon.ico'
|
||||
]
|
||||
}))
|
||||
app.use(express.static('modules/qmining/public'))
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 10000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
}))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// REDIRECTS
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
// REDIRECTS
|
||||
// --------------------------------------------------------------
|
||||
|
||||
// to be backwards compatible
|
||||
app.get('/ask', function (req, res) {
|
||||
// to be backwards compatible
|
||||
app.get('/ask', function (req, res) {
|
||||
logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
|
||||
res.redirect(`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`)
|
||||
})
|
||||
})
|
||||
|
||||
const simpleRedirects = [
|
||||
const simpleRedirects = [
|
||||
{
|
||||
from: '/dataeditor',
|
||||
to: 'https://dataeditor.frylabs.net'
|
||||
|
|
@ -123,9 +132,9 @@ const simpleRedirects = [
|
|||
from: '/irc',
|
||||
to: 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining'
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
simpleRedirects.forEach((redirect) => {
|
||||
simpleRedirects.forEach((redirect) => {
|
||||
app.get(redirect.from, function (req, res) {
|
||||
if (!redirect.nolog) {
|
||||
logger.LogReq(req)
|
||||
|
|
@ -133,11 +142,11 @@ simpleRedirects.forEach((redirect) => {
|
|||
logger.DebugLog(`Qmining module ${redirect.from} redirect`, 'infos', 1)
|
||||
res.redirect(`${redirect.to}`)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
function AddHtmlRoutes (files) {
|
||||
function AddHtmlRoutes (files) {
|
||||
const routes = files.reduce((acc, f) => {
|
||||
if (f.includes('html')) {
|
||||
acc.push(f.split('.')[0])
|
||||
|
|
@ -153,24 +162,31 @@ function AddHtmlRoutes (files) {
|
|||
res.redirect(`${route}.html`)
|
||||
})
|
||||
})
|
||||
}
|
||||
AddHtmlRoutes(utils.ReadDir('modules/qmining/public'))
|
||||
}
|
||||
AddHtmlRoutes(utils.ReadDir('modules/qmining/public'))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
app.get('/', function (req, res) {
|
||||
res.end('hai')
|
||||
logger.LogReq(req)
|
||||
})
|
||||
})
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
return {
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
logger.Log('Qmining module started', logger.GetColor('yellow'))
|
||||
exports.name = 'Qmining'
|
||||
exports.getApp = GetApp
|
||||
exports.setup = (data) => {
|
||||
userDB = data.userDB
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,34 +31,35 @@ const utils = require('../../utils/utils.js')
|
|||
|
||||
const uloadFiles = './public/f'
|
||||
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
function GetApp () {
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/sio/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 10000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '5mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '5mb'
|
||||
}))
|
||||
}))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
app.get('/', function (req, res) {
|
||||
app.get('/', function (req, res) {
|
||||
res.render('uload')
|
||||
res.end()
|
||||
})
|
||||
})
|
||||
|
||||
function UploadFile (req, res, path, next) {
|
||||
function UploadFile (req, res, path, next) {
|
||||
var fstream
|
||||
req.pipe(req.busboy)
|
||||
req.busboy.on('file', function (fieldname, file, filename) {
|
||||
|
|
@ -79,21 +80,25 @@ function UploadFile (req, res, path, next) {
|
|||
res.end('something bad happened :s')
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
app.route('/fosuploader').post(function (req, res, next) {
|
||||
app.route('/fosuploader').post(function (req, res, next) {
|
||||
UploadFile(req, res, uloadFiles, (fn) => {
|
||||
res.redirect('/f/' + fn)
|
||||
})
|
||||
})
|
||||
app.get('*', function (req, res) {
|
||||
})
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
return {
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
logger.Log('Sio module started', logger.GetColor('yellow'))
|
||||
exports.name = 'Sio'
|
||||
exports.getApp = GetApp
|
||||
|
|
|
|||
|
|
@ -31,30 +31,31 @@ const logger = require('../../utils/logger.js')
|
|||
|
||||
const listedFiles = './public/files'
|
||||
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
function GetApp () {
|
||||
app.set('view engine', 'ejs')
|
||||
app.set('views', [
|
||||
'./modules/stuff/views',
|
||||
'./sharedViews'
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
])
|
||||
app.use(express.static('public'))
|
||||
app.use(busboy({
|
||||
limits: {
|
||||
fileSize: 10000 * 1024 * 1024
|
||||
}
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
}))
|
||||
app.use(bodyParser.json())
|
||||
app.use(bodyParser.urlencoded({
|
||||
limit: '5mb',
|
||||
extended: true
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
}))
|
||||
app.use(bodyParser.json({
|
||||
limit: '5mb'
|
||||
}))
|
||||
}))
|
||||
|
||||
// --------------------------------------------------------------
|
||||
// --------------------------------------------------------------
|
||||
|
||||
// app, '/*.mp4', 'video/mp4', 'stuff/video'
|
||||
function appGetFileType (app, wildcard, contentType, pageToRender) {
|
||||
// app, '/*.mp4', 'video/mp4', 'stuff/video'
|
||||
function appGetFileType (app, wildcard, contentType, pageToRender) {
|
||||
app.get(wildcard, function (req, res) {
|
||||
let p = decodeURI(req.url)
|
||||
let fp = p
|
||||
|
|
@ -112,30 +113,30 @@ function appGetFileType (app, wildcard, contentType, pageToRender) {
|
|||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const fileTypes = [
|
||||
const fileTypes = [
|
||||
['/*.mp4', 'video/mp4', 'video'],
|
||||
['/*.mkv', 'audio/x-matroska', 'video'],
|
||||
['/*.mp3', 'audio/mpeg', 'audio'],
|
||||
['/*.pdf', 'application/pdf'],
|
||||
['/*.zip', 'application/zip']
|
||||
]
|
||||
]
|
||||
|
||||
function GetAlbumArt (path) {
|
||||
function GetAlbumArt (path) {
|
||||
let tmp = path.split('.')
|
||||
tmp.pop()
|
||||
tmp = tmp.join('.').split('/')
|
||||
let last = tmp.pop()
|
||||
|
||||
return tmp.join('/') + '/.' + last + '.png'
|
||||
}
|
||||
}
|
||||
|
||||
fileTypes.forEach((t) => {
|
||||
fileTypes.forEach((t) => {
|
||||
appGetFileType(app, t[0], t[1], t[2])
|
||||
})
|
||||
})
|
||||
|
||||
app.get('/*', function (req, res) {
|
||||
app.get('/*', function (req, res) {
|
||||
let parsedUrl = decodeURI(req.url)
|
||||
let curr = listedFiles + '/' + parsedUrl.substring('/'.length, parsedUrl.length).split('?')[0]
|
||||
let relPath = curr.substring('./public/files'.length, curr.length)
|
||||
|
|
@ -193,21 +194,25 @@ app.get('/*', function (req, res) {
|
|||
url
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
app.get('*', function (req, res) {
|
||||
app.get('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
app.post('*', function (req, res) {
|
||||
app.post('*', function (req, res) {
|
||||
res.status(404).render('404')
|
||||
})
|
||||
})
|
||||
|
||||
exports.app = app
|
||||
return {
|
||||
app: app
|
||||
}
|
||||
}
|
||||
|
||||
exports.name = 'Stuff'
|
||||
exports.getApp = GetApp
|
||||
exports.setup = (x) => {
|
||||
url = x.url
|
||||
}
|
||||
|
||||
logger.Log('Stuff module started', logger.GetColor('yellow'))
|
||||
|
|
|
|||
38
server.js
38
server.js
|
|
@ -20,7 +20,7 @@
|
|||
console.clear()
|
||||
|
||||
const startHTTPS = true
|
||||
const port = 8080
|
||||
const port = 80
|
||||
const httpsport = 5001
|
||||
|
||||
const express = require('express')
|
||||
|
|
@ -30,10 +30,19 @@ const utils = require('./utils/utils.js')
|
|||
const http = require('http')
|
||||
const https = require('https')
|
||||
const cors = require('cors')
|
||||
const cookieParser = require('cookie-parser')
|
||||
const uuidv4 = require('uuid/v4') // TODO: deprecated, but imports are not supported
|
||||
|
||||
const dbtools = require('./utils/dbtools.js')
|
||||
const reqlogger = require('./middlewares/reqlogger.middleware.js')
|
||||
const extraModulesFile = './extraModules.json'
|
||||
const modulesFile = './modules.json'
|
||||
const usersDBPath = 'data/dbs/users.db'
|
||||
|
||||
if (!utils.FileExists(usersDBPath)) {
|
||||
throw new Error('No user DB exists yet! please run utils/dbSetup.js first!')
|
||||
}
|
||||
const userDB = dbtools.GetDB(usersDBPath)
|
||||
|
||||
let modules = JSON.parse(utils.ReadFile(modulesFile))
|
||||
|
||||
|
|
@ -70,15 +79,25 @@ function exit (reason) {
|
|||
x.cleanup()
|
||||
} catch (e) {
|
||||
logger.Log(`Error in ${k} cleanup! Details in STDERR`, logger.GetColor('redbg'))
|
||||
console.err(e)
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
logger.Log('Closing Auth DB')
|
||||
userDB.close()
|
||||
|
||||
process.exit()
|
||||
}
|
||||
|
||||
const app = express()
|
||||
app.use(cors())
|
||||
app.use(cors({
|
||||
credentials: true,
|
||||
origin: true
|
||||
// origin: [ /\.frylabs\.net$/ ]
|
||||
}))
|
||||
const cookieSecret = uuidv4()
|
||||
app.use(cookieParser(cookieSecret))
|
||||
app.use(reqlogger({
|
||||
loggableKeywords: [
|
||||
'stable.user.js'
|
||||
|
|
@ -92,14 +111,19 @@ Object.keys(modules).forEach(function (k, i) {
|
|||
let x = modules[k]
|
||||
try {
|
||||
let mod = require(x.path)
|
||||
logger.Log(`Loading ${mod.name} module`, logger.GetColor('yellow'))
|
||||
if (mod.setup) {
|
||||
mod.setup({
|
||||
url: 'https://' + x.urls[0]
|
||||
url: 'https://' + x.urls[0],
|
||||
userDB: userDB
|
||||
})
|
||||
}
|
||||
x.app = mod.app
|
||||
x.dailyAction = mod.dailyAction
|
||||
x.cleanup = mod.cleanup
|
||||
|
||||
const modApp = mod.getApp()
|
||||
x.app = modApp.app
|
||||
x.dailyAction = modApp.DailyAction
|
||||
x.cleanup = modApp.cleanup
|
||||
|
||||
x.urls.forEach((url) => {
|
||||
app.use(vhost(url, x.app))
|
||||
})
|
||||
|
|
|
|||
34
sharedViews/login.ejs
Normal file
34
sharedViews/login.ejs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<html>
|
||||
<body bgcolor="#212127">
|
||||
<head>
|
||||
<title>login</title>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=0.6" />
|
||||
<style>
|
||||
.text {
|
||||
color: white;
|
||||
}
|
||||
.title {
|
||||
font: normal 28px Verdana;
|
||||
font-weight: bold;
|
||||
color: white;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<center>
|
||||
<h2 class='title'>
|
||||
Frylabs Login
|
||||
</h2>
|
||||
<div class='text'>
|
||||
Jelszó:
|
||||
</div>
|
||||
<form action="http://api.frylabs.net/login" method="POST">
|
||||
<input type='text' id='pw' name='pw' />
|
||||
<input type='submit' value='Submit' formmethod='post' />
|
||||
</form>
|
||||
</center>
|
||||
</body>
|
||||
<script>
|
||||
</script>
|
||||
</html>
|
||||
|
|
@ -216,6 +216,9 @@ function CloseDB (db) {
|
|||
// -------------------------------------------------------------------------
|
||||
|
||||
function PrepareStatement (db, s) {
|
||||
if (!db) {
|
||||
throw new Error('DB is undefined in prepare statement! DB action called with undefined db')
|
||||
}
|
||||
DebugLog(s)
|
||||
return db.prepare(s)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue