mirror of
https://github.com/TheGreyDiamond/elevatormapRewritten.git
synced 2025-07-17 18:23:48 +02:00
Cleanup
This commit is contained in:
TheGreyDiamond
3
.eslintignore
Normal file
3
.eslintignore
Normal file
@ -0,0 +1,3 @@
|
||||
node_modules
|
||||
dist
|
||||
*.js
|
||||
16
.eslintrc.json
Normal file
16
.eslintrc.json
Normal file
@ -0,0 +1,16 @@
|
||||
{
|
||||
"root": true,
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/eslint-recommended",
|
||||
"plugin:@typescript-eslint/recommended"
|
||||
],
|
||||
"rules": {
|
||||
"@typescript-eslint/no-var-requires": 0
|
||||
}
|
||||
|
||||
}
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -105,3 +105,4 @@ typings/
|
||||
testingDONOTCOMMITME.json
|
||||
|
||||
static/uploads/*
|
||||
index.js
|
||||
|
||||
357
index.ts
Normal file
357
index.ts
Normal file
@ -0,0 +1,357 @@
|
||||
// Imports
|
||||
const express = require("express");
|
||||
const fs = require("fs");
|
||||
const Eta = require("eta");
|
||||
const winston = require("winston");
|
||||
const mysql = require("mysql");
|
||||
const bodyParser = require("body-parser");
|
||||
// const csp = require(`helmet`);
|
||||
const session = require("express-session");
|
||||
const nodemailer = require("nodemailer");
|
||||
|
||||
// Inting the logger
|
||||
const logger = winston.createLogger({
|
||||
level: "debug",
|
||||
format: winston.format.json(),
|
||||
defaultMeta: { service: "user-service" },
|
||||
transports: [
|
||||
//
|
||||
// - Write all logs with level `error` and below to `error.log`
|
||||
// - Write all logs with level `info` and below to `combined.log`
|
||||
//
|
||||
new winston.transports.File({ filename: "error.log", level: "error" }),
|
||||
new winston.transports.File({ filename: "combined.log" }),
|
||||
],
|
||||
});
|
||||
|
||||
logger.add(
|
||||
new winston.transports.Console({
|
||||
format: winston.format.simple(),
|
||||
})
|
||||
);
|
||||
|
||||
const app = express();
|
||||
|
||||
app.use(express.static("static"));
|
||||
|
||||
app.use(bodyParser.urlencoded({ extended: false }));
|
||||
app.use(bodyParser.json());
|
||||
|
||||
app.use(function (req, res, next) {
|
||||
const pathesWhichRequireDB = ["map", "login", "register"];
|
||||
const pathesWhichRequireLogin = ["createElevator"];
|
||||
const path = req.path
|
||||
const pathesDes = path.split("/")
|
||||
let requiresDB = false;
|
||||
let requiresLogin = false;
|
||||
let allowContinue = true;
|
||||
console.log(pathesDes)
|
||||
|
||||
if (pathesWhichRequireLogin.indexOf(pathesDes[1]) > -1) {
|
||||
requiresLogin = true;
|
||||
}
|
||||
|
||||
if (pathesDes[1] == "api") {
|
||||
requiresDB = true;
|
||||
}
|
||||
if (pathesWhichRequireDB.indexOf(pathesDes[1]) > -1) {
|
||||
requiresDB = true;
|
||||
}
|
||||
|
||||
if (requiresDB) {
|
||||
if (!mysqlIsUpAndOkay) {
|
||||
allowContinue = false;
|
||||
const data = fs.readFileSync("templates/dbError.html", "utf8");
|
||||
let displayText =
|
||||
"This might be an artifact of a recent restart. Maybe wait a few minutes and reload this page.";
|
||||
if (startUpTime + 60 <= Math.floor(new Date().getTime() / 1000)) {
|
||||
displayText =
|
||||
"The server failed to connect to the MySQL server. This means it was unable to load any data.";
|
||||
}
|
||||
if (mySQLstate == 1) {
|
||||
displayText =
|
||||
"There is a problem with the database servers setup. Please check the log for more info.";
|
||||
}
|
||||
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: fontawesomeKey,
|
||||
displayText: displayText,
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (requiresLogin) {
|
||||
allowContinue = false;
|
||||
const data = fs.readFileSync("templates/redirect.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Redirect",
|
||||
fontawesomeKey: fontawesomeKey,
|
||||
url: "/login?r=" + path,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
console.log('Time:', Date.now())
|
||||
if (allowContinue) {
|
||||
next()
|
||||
} else {
|
||||
console.log("Stopped further exec of route")
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
/*
|
||||
app.use(csp.contentSecurityPolicy({
|
||||
useDefaults: true,
|
||||
contentSecurityPolicy: false,
|
||||
crossOriginEmbedderPolicy: false,
|
||||
directives: {
|
||||
"default-src": [`'self'`],
|
||||
"img-src": [`'self'`],
|
||||
scriptSrc: [`'self'`, `https://hcaptcha.com`, `https://*.hcaptcha.com`, `https://*.fontawesome.com`, "unsafe-inline", "unsafe-eval","'unsafe-inline'"],
|
||||
"script-src-attr": [`'self'`, `https://hcaptcha.com`, `https://*.hcaptcha.com`, `https://*.fontawesome.com`, "unsafe-inline", "unsafe-eval"],
|
||||
"frame-src": [`'self'`, `https://hcaptcha.com`, `https://*.hcaptcha.com`],
|
||||
"style-src": [`'self'`, `https://hcaptcha.com`, `https://*.hcaptcha.com`, `https://*.fontawesome.com`, `'unsafe-inline'`],
|
||||
"connect-src": [`'self'`, `https://hcaptcha.com`, `https://*.hcaptcha.com`, `https://*.fontawesome.com`],
|
||||
"font-src": [`'self'`, `https://*.fontawesome.com`],
|
||||
},
|
||||
|
||||
}))
|
||||
*/
|
||||
|
||||
// Settings
|
||||
const port = 3000;
|
||||
const startUpTime = Math.floor(new Date().getTime() / 1000);
|
||||
|
||||
|
||||
let fontawesomeKey = "";
|
||||
let mapboxAccessToken = "";
|
||||
let mysqlData = { "user": "", "password": "", "database": "", "allowCreation": false };
|
||||
let hCaptcha = { "sitekey": "", "secret": "" };
|
||||
let mailConf = { "host": "", "port": 0, "username": "", "password": "" };
|
||||
let serverAdress = "";
|
||||
let cookieSecret = ""
|
||||
let jsonConfigGlobal = {};
|
||||
|
||||
// Load config
|
||||
try {
|
||||
const data = fs.readFileSync("config/default.json", "utf8");
|
||||
const jsonContent = JSON.parse(data);
|
||||
let jsonConfig = jsonContent;
|
||||
if (jsonContent.redirectConfig) {
|
||||
const data = fs.readFileSync(
|
||||
"config/" + jsonContent.redirectConfig,
|
||||
"utf8"
|
||||
);
|
||||
jsonConfig = JSON.parse(data);
|
||||
}
|
||||
fontawesomeKey = jsonConfig.fontAwesome;
|
||||
mapboxAccessToken = jsonConfig.mapboxAccessToken;
|
||||
mysqlData = jsonConfig.mysql;
|
||||
|
||||
mailConf = jsonConfig.mail;
|
||||
serverAdress = jsonConfig.serverAdress;
|
||||
cookieSecret =
|
||||
jsonConfig.cookieSecret || "saF0DSF65AS4DF0S4D6F0S54DF0Fad";
|
||||
jsonConfigGlobal = jsonConfig;
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"While reading the config an error occured. The error was: " + error
|
||||
);
|
||||
}
|
||||
|
||||
const transport = nodemailer.createTransport({
|
||||
host: mailConf.host,
|
||||
port: mailConf.port,
|
||||
requireTLS: true,
|
||||
secure: false,
|
||||
debug: true,
|
||||
disableFileAccess: true,
|
||||
//authMethod: "START TLS",
|
||||
auth: {
|
||||
user: mailConf.username,
|
||||
pass: mailConf.password,
|
||||
},
|
||||
});
|
||||
|
||||
//let transporter = nodemailer.createTransport(transport)
|
||||
//console.log(transport.host)
|
||||
logger.info("Testing SMTP connection");
|
||||
transport.verify(function (error) {
|
||||
if (error) {
|
||||
logger.error(error);
|
||||
} else {
|
||||
logger.info("SMPT server is ready to accept messages");
|
||||
}
|
||||
});
|
||||
|
||||
app.use(session({ secret: cookieSecret }));
|
||||
|
||||
|
||||
// Basic defines for html
|
||||
const metainfo = {
|
||||
author: "TheGreydiamond",
|
||||
desc: "The Elevatormap. A map for elevator spotters!",
|
||||
sitePrefix: "Elevatormap - "
|
||||
}
|
||||
|
||||
let mysqlIsUpAndOkay = false;
|
||||
let mySQLstate = 0; // 0 -> Default failure 1 -> Missing strucutre
|
||||
|
||||
|
||||
|
||||
// Prepare MYSQL
|
||||
let con = mysql.createConnection({
|
||||
host: "localhost",
|
||||
user: mysqlData.user,
|
||||
password: mysqlData.password,
|
||||
database: mysqlData.database,
|
||||
});
|
||||
|
||||
|
||||
|
||||
function checkIfMySQLStructureIsReady() {
|
||||
if (mysqlIsUpAndOkay) {
|
||||
// Only if MySQL is ready
|
||||
logger.debug("Checking MySQL strucutre");
|
||||
con.query("SHOW TABLES;", function (err, result, fields) {
|
||||
if (err) throw err;
|
||||
if (result.length == 0) {
|
||||
// There are no tables. Not good.
|
||||
logger.warn("There are no tables found");
|
||||
if (mysqlData.allowCreation) {
|
||||
// Lets create it then
|
||||
logger.warn("Creating a new table");
|
||||
const sql =
|
||||
"CREATE TABLE `" +
|
||||
mysqlData.database +
|
||||
"`.`elevators` ( `id` INT NOT NULL AUTO_INCREMENT , `lat` FLOAT NOT NULL , `lng` FLOAT NOT NULL , `manufacturer` VARCHAR(512) NOT NULL , `modell` VARCHAR(512) NOT NULL , `info` VARCHAR(512) NOT NULL , `visitabilty` INT NOT NULL , `technology` INT NOT NULL , `images` JSON NOT NULL , `amountOfFloors` INT NOT NULL , `maxPassangers` INT NOT NULL , `maxWeight` INT NOT NULL , `creator` INT NOT NULL, PRIMARY KEY (`id`)) ENGINE = InnoDB;";
|
||||
const newSql =
|
||||
"CREATE TABLE `" +
|
||||
mysqlData.database +
|
||||
"`.`users` ( `id` INT NOT NULL AUTO_INCREMENT , `email` VARCHAR(255) NOT NULL , `username` VARCHAR(255) NOT NULL , `passwordHash` VARCHAR(512) NOT NULL , `permLevel` INT NOT NULL DEFAULT '0' , `verificationState` INT NOT NULL DEFAULT '0' , PRIMARY KEY (`id`), UNIQUE KEY (`email`)) ENGINE = InnoDB;";
|
||||
const newSqlMailVeri =
|
||||
"CREATE TABLE `" +
|
||||
mysqlData.database +
|
||||
"`.`mailverification` ( `id` INT NOT NULL AUTO_INCREMENT , `targetMail` VARCHAR(512) NOT NULL , `userID` INT NOT NULL , `token` VARCHAR(255) NOT NULL , PRIMARY KEY (`id`)) ENGINE = InnoDB;";
|
||||
con.query(sql, function (err, result) {
|
||||
if (err) throw err;
|
||||
logger.info("Table created");
|
||||
});
|
||||
|
||||
con.query(newSql, function (err, result) {
|
||||
if (err) throw err;
|
||||
logger.info("Usertable created");
|
||||
});
|
||||
|
||||
con.query(newSqlMailVeri, function (err, result) {
|
||||
if (err) throw err;
|
||||
logger.info("Email verification table created");
|
||||
});
|
||||
} else {
|
||||
// We cannot do that. Welp.
|
||||
logger.warn(
|
||||
"MySQL tables are missing and the config denies creation of new ones."
|
||||
);
|
||||
mysqlIsUpAndOkay = false;
|
||||
mySQLstate = 1;
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
logger.warn("Tried checking the tables even though MySQL wasn't ready.");
|
||||
}
|
||||
}
|
||||
|
||||
con.connect(function (err) {
|
||||
if (err) {
|
||||
mysqlIsUpAndOkay = false;
|
||||
logger.error("Connction to MySQL failed");
|
||||
console.log(err);
|
||||
} else {
|
||||
logger.info("Mysql is ready.");
|
||||
mysqlIsUpAndOkay = true;
|
||||
checkIfMySQLStructureIsReady();
|
||||
}
|
||||
});
|
||||
|
||||
// Routes
|
||||
app.get("/", function (req, res) {
|
||||
const data = fs.readFileSync("templates/index.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Start",
|
||||
fontawesomeKey: fontawesomeKey,
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
app.get("/map", function (req, res) {
|
||||
const data = fs.readFileSync("templates/map.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Map",
|
||||
fontawesomeKey: fontawesomeKey,
|
||||
mapboxAccessToken: mapboxAccessToken,
|
||||
})
|
||||
)
|
||||
|
||||
});
|
||||
|
||||
app.get("/createElevator", function (req, res) {
|
||||
const data = fs.readFileSync("templates/createElevator.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "New elevator",
|
||||
fontawesomeKey: fontawesomeKey,
|
||||
mapboxAccessToken: mapboxAccessToken,
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
require('./Routes/api.route.ts')(app, con, mysqlIsUpAndOkay, logger, metainfo);
|
||||
require('./Routes/debug.route.ts')(app, con, logger, metainfo);
|
||||
require('./Routes/auth.route.ts')(app, con, logger, metainfo, jsonConfigGlobal);
|
||||
|
||||
// Some loops for handeling stuff
|
||||
setInterval(() => {
|
||||
if (mysqlIsUpAndOkay == false) {
|
||||
logger.warn("Retrying to connect to MySQL");
|
||||
con = mysql.createConnection({
|
||||
host: "localhost",
|
||||
user: mysqlData.user,
|
||||
password: mysqlData.password,
|
||||
database: mysqlData.database,
|
||||
});
|
||||
|
||||
con.connect(function (err) {
|
||||
if (err) {
|
||||
mysqlIsUpAndOkay = false;
|
||||
logger.error("Connction to MySQL failed");
|
||||
console.log(err);
|
||||
} else {
|
||||
logger.info("Mysql is ready.");
|
||||
mysqlIsUpAndOkay = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
}, 60000);
|
||||
|
||||
// App start
|
||||
app.listen(port, () => {
|
||||
logger.info(`Elevator map ready at http://localhost:${port}`);
|
||||
});
|
||||
1269
package-lock.json
generated
1269
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@ -4,8 +4,13 @@
|
||||
"description": "The elevatormap rewritten",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 0",
|
||||
"start": "node index.js"
|
||||
"makeJS": "tsc index.ts",
|
||||
"lint": "eslint . --ext .ts",
|
||||
"makeJSwatch": "tsc -w index.ts",
|
||||
"start": "tsc index.ts && node index.js",
|
||||
"preChecks": "npm outdated && npm audit",
|
||||
"startBeforeMerge": "eslint . --ext .ts && tsc index.ts && node index.js",
|
||||
"nodemon": "nodemon index.js"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@ -20,14 +25,23 @@
|
||||
"dependencies": {
|
||||
"bcrypt": "^5.0.1",
|
||||
"body-parser": "^1.19.0",
|
||||
"eta": "^1.12.1",
|
||||
"eta": "^1.12.2",
|
||||
"express": "^4.17.1",
|
||||
"express-session": "^1.17.2",
|
||||
"greeting-time": "^1.0.0",
|
||||
"hcaptcha": "0.0.2",
|
||||
"helmet": "^4.6.0",
|
||||
"multer": "^1.4.2",
|
||||
"mysql": "^2.18.1",
|
||||
"nodemailer": "^6.6.1",
|
||||
"nodemailer": "^6.6.2",
|
||||
"winston": "^3.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^16.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "^4.21.0",
|
||||
"@typescript-eslint/parser": "^4.21.0",
|
||||
"eslint": "^7.26.0",
|
||||
"eslint-config-strongloop": "^2.1.0",
|
||||
"typescript": "^4.2.4"
|
||||
}
|
||||
}
|
||||
|
||||
312
routes/api.route.ts
Normal file
312
routes/api.route.ts
Normal file
@ -0,0 +1,312 @@
|
||||
module.exports = function (app, con, mysqlIsUpAndOkay, logger) {
|
||||
const multer = require("multer");
|
||||
const upload = multer({ dest: "static/uploads/" });
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
|
||||
app.get("/api/getElevatorById", function (req, res) {
|
||||
console.log(req.query);
|
||||
if (req.query.id != undefined) {
|
||||
// All parameters are there
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
try {
|
||||
const id = parseFloat(req.query.id);
|
||||
} catch (error) {
|
||||
res.send(
|
||||
JSON.stringify({ state: "Failed", message: "Invalid arguments" })
|
||||
);
|
||||
res.status(400);
|
||||
return;
|
||||
}
|
||||
const id = parseFloat(req.query.id);
|
||||
|
||||
con.query(
|
||||
"SELECT * FROM elevators WHERE id=" + id,
|
||||
function (err, result) {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Failed",
|
||||
message: "A server side error occured.",
|
||||
results: [],
|
||||
})
|
||||
);
|
||||
logger.error("The server failed to execute a request");
|
||||
console.log(err);
|
||||
mysqlIsUpAndOkay = false;
|
||||
} else {
|
||||
console.log(result[0]);
|
||||
res.status(200);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Ok",
|
||||
message: "Successful.",
|
||||
results: result,
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// Welp something is missing
|
||||
res.status(400);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.send(JSON.stringify({ state: "Failed", message: "Missing arguments" }));
|
||||
}
|
||||
});
|
||||
|
||||
app.get("/api/resolveNameById", function (req, res) {
|
||||
if (req.query.id != undefined && req.query.id != "") {
|
||||
|
||||
const sql = "SELECT username FROM users WHERE id=?";
|
||||
con.query(sql, [req.query.id], function (err, result) {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Failed",
|
||||
message: "A server side error occured.",
|
||||
results: [],
|
||||
})
|
||||
);
|
||||
logger.error("The server failed to execute a request");
|
||||
mysqlIsUpAndOkay = false;
|
||||
} else {
|
||||
console.log(result[0]);
|
||||
res.status(200);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.send(
|
||||
JSON.stringify({ state: "Ok", message: "", results: result })
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
} else {
|
||||
res.status(400);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.send(JSON.stringify({ state: "Failed", message: "Missing argument: id" }));
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
app.get("/api/getElevatorLocation", function (req, res) {
|
||||
if (
|
||||
req.query.lan != undefined &&
|
||||
req.query.lat != undefined &&
|
||||
req.query.radius != undefined
|
||||
) {
|
||||
// All parameters are there
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
try {
|
||||
const lan = parseFloat(req.query.lan);
|
||||
const lat = parseFloat(req.query.lat);
|
||||
const radius = parseFloat(req.query.radius);
|
||||
} catch (error) {
|
||||
res.send(
|
||||
JSON.stringify({ state: "Failed", message: "Invalid arguments" })
|
||||
);
|
||||
res.status(400);
|
||||
return;
|
||||
}
|
||||
const lan = parseFloat(req.query.lan);
|
||||
const lat = parseFloat(req.query.lat);
|
||||
const radius = parseFloat(req.query.radius);
|
||||
|
||||
// TODO: Return just the elevators in the viewers area
|
||||
|
||||
con.query(
|
||||
"SELECT id, lat, lng FROM elevators",
|
||||
function (err, result, fields) {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Failed",
|
||||
message: "A server side error occured.",
|
||||
results: [],
|
||||
})
|
||||
);
|
||||
logger.error("The server failed to execute a request");
|
||||
mysqlIsUpAndOkay = false;
|
||||
} else {
|
||||
console.log(result[0]);
|
||||
res.status(200);
|
||||
res.send(
|
||||
JSON.stringify({ state: "Ok", message: "", results: result })
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// Welp something is missing
|
||||
res.status(400);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.send(JSON.stringify({ state: "Failed", message: "Missing arguments" }));
|
||||
}
|
||||
});
|
||||
|
||||
// returns an object with the cookies' name as keys
|
||||
const getAppCookies = (req) => {
|
||||
// We extract the raw cookies from the request headers
|
||||
const rawCookies = req.headers.cookie.split("; ");
|
||||
// rawCookies = ['myapp=secretcookie, 'analytics_cookie=beacon;']
|
||||
|
||||
const parsedCookies = {};
|
||||
rawCookies.forEach((rawCookie) => {
|
||||
const parsedCookie = rawCookie.split("=");
|
||||
// parsedCookie = ['myapp', 'secretcookie'], ['analytics_cookie', 'beacon']
|
||||
parsedCookies[parsedCookie[0]] = parsedCookie[1];
|
||||
});
|
||||
return parsedCookies;
|
||||
};
|
||||
|
||||
app.post("/api/saveNewElevatorMeta", function (req, res) {
|
||||
const sess = req.session;
|
||||
const tempJs = JSON.parse(decodeURIComponent(getAppCookies(req)["tempStore"]));
|
||||
const sql =
|
||||
"INSERT INTO elevators (lat, lng, manufacturer, modell, info, visitabilty, technology, amountOfFloors, maxPassangers, maxWeight, images, creator) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '{ \"images\": []}', ?)";
|
||||
con.query(
|
||||
sql,
|
||||
[
|
||||
tempJs.lat,
|
||||
tempJs.lng,
|
||||
tempJs.manuf,
|
||||
tempJs.model,
|
||||
tempJs.description,
|
||||
tempJs.visit,
|
||||
tempJs.type,
|
||||
tempJs.flor,
|
||||
tempJs.pepl,
|
||||
tempJs.weig,
|
||||
sess.uid
|
||||
],
|
||||
function (err, result) {
|
||||
if (err) throw err;
|
||||
console.log("1 record inserted with id " + result.insertId);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
|
||||
res.send(
|
||||
JSON.stringify({ state: "Okay", message: "Ok. No fault!", id: result.insertId })
|
||||
);
|
||||
res.status(200);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
app.post("/api/uploadImage", upload.any(), function (req, res) {
|
||||
console.log(req.query.id)
|
||||
let i = 0;
|
||||
const sql = 'SELECT id, images FROM elevators WHERE id=?';
|
||||
const allImages = []
|
||||
while (i < req.files.length) {
|
||||
const fObj = req.files[i];
|
||||
const currentPath = path.join(fObj["path"]);
|
||||
const destinationPath =
|
||||
currentPath +
|
||||
"." +
|
||||
fObj["originalname"].split(".")[
|
||||
fObj["originalname"].split(".").length - 1
|
||||
]; // Add the file end
|
||||
|
||||
fs.rename(currentPath, destinationPath, function (err) {
|
||||
if (err) {
|
||||
throw err;
|
||||
} else {
|
||||
console.log("Successfully moved the file!");
|
||||
}
|
||||
});
|
||||
allImages.push({ "path": destinationPath, "alt": "No alt was provided." })
|
||||
i++;
|
||||
}
|
||||
|
||||
con.query(
|
||||
sql, [req.query.id],
|
||||
function (err, result, fields) {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Failed",
|
||||
message: "A server side error occured.",
|
||||
results: [],
|
||||
})
|
||||
);
|
||||
logger.error("The server failed to execute a request");
|
||||
mysqlIsUpAndOkay = false;
|
||||
} else {
|
||||
const jData = JSON.parse(result[0].images)
|
||||
console.log(jData)
|
||||
jData.images.push.spread(jData.images, allImages)
|
||||
console.log(jData);
|
||||
console.log(result);
|
||||
const sql = "UPDATE elevators SET images = ? WHERE id = ?";
|
||||
con.query(sql, [JSON.stringify(jData), req.query.id], function (err) {
|
||||
if (err) {
|
||||
console.log("Update failure")
|
||||
} else {
|
||||
console.log("Okay")
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// Save Image End
|
||||
});
|
||||
|
||||
|
||||
app.get("/api/getElevators", function (req, res) {
|
||||
console.log(req.query);
|
||||
if (
|
||||
req.query.lan != undefined &&
|
||||
req.query.lat != undefined &&
|
||||
req.query.radius != undefined
|
||||
) {
|
||||
// All parameters are there
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
try {
|
||||
const lan = parseFloat(req.query.lan);
|
||||
const lat = parseFloat(req.query.lat);
|
||||
const radius = parseFloat(req.query.radius);
|
||||
} catch (error) {
|
||||
res.send(
|
||||
JSON.stringify({ state: "Failed", message: "Invalid arguments" })
|
||||
);
|
||||
res.status(400);
|
||||
return;
|
||||
}
|
||||
const lan = parseFloat(req.query.lan);
|
||||
const lat = parseFloat(req.query.lat);
|
||||
const radius = parseFloat(req.query.radius);
|
||||
|
||||
// TODO: Return just the elevators in the viewers area
|
||||
|
||||
con.query("SELECT * FROM elevators", function (err, result) {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
res.send(
|
||||
JSON.stringify({
|
||||
state: "Failed",
|
||||
message: "A server side error occured.",
|
||||
results: [],
|
||||
})
|
||||
);
|
||||
logger.error("The server failed to execute a request");
|
||||
mysqlIsUpAndOkay = false;
|
||||
} else {
|
||||
console.log(result[0]);
|
||||
res.status(200);
|
||||
res.send(JSON.stringify({ state: "Ok", message: "", results: result }));
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// Welp something is missing
|
||||
res.status(400);
|
||||
res.setHeader("Content-Type", "application/json");
|
||||
res.send(JSON.stringify({ state: "Failed", message: "Missing arguments" }));
|
||||
}
|
||||
});
|
||||
}
|
||||
443
routes/auth.route.ts
Normal file
443
routes/auth.route.ts
Normal file
@ -0,0 +1,443 @@
|
||||
module.exports = function (app, con, logger, metainfo, jsonConfig) {
|
||||
const greetingTime = require("greeting-time");
|
||||
const fs = require("fs");
|
||||
const Eta = require("eta");
|
||||
const { verify } = require("hcaptcha");
|
||||
const bcrypt = require("bcrypt");
|
||||
const cryptoF = require("crypto");
|
||||
const saltRounds = 10;
|
||||
|
||||
const mailRegex =
|
||||
/(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/;
|
||||
|
||||
app.get("/logout", function (req, res) {
|
||||
req.session.destroy();
|
||||
const data = fs.readFileSync("templates/redirect.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Logout",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
url: "/",
|
||||
})
|
||||
);
|
||||
});
|
||||
app.get("/verify*", function (req, res) {
|
||||
console.log(req.url.split("/")[2]);
|
||||
const stmt = "SELECT * FROM mailverification WHERE token = ?;";
|
||||
|
||||
con.query(stmt, [req.url.split("/")[2]], function (err, result) {
|
||||
if (err) {
|
||||
res.status(404);
|
||||
res.send(
|
||||
JSON.stringify({ state: "Failed", message: "Database error occured" })
|
||||
);
|
||||
logger.error(err);
|
||||
} else {
|
||||
if (result.length == 0) {
|
||||
res.status(404);
|
||||
res.send(
|
||||
JSON.stringify({ state: "Failed", message: "Link already done" })
|
||||
);
|
||||
} else {
|
||||
console.log(result);
|
||||
res.status(200);
|
||||
const stmt2 = "DELETE FROM mailverification WHERE id=?";
|
||||
console.log(result[0].id);
|
||||
con.query(stmt2, [result[0].id], function (err, result, fields) {
|
||||
// TODO handling of this
|
||||
//logger.debug(err)
|
||||
//console.log(result)
|
||||
});
|
||||
const stmt3 = "UPDATE users SET verificationState=1 WHERE email=?";
|
||||
con.query(
|
||||
stmt3,
|
||||
[result[0].targetMail],
|
||||
function (err, result, fields) {
|
||||
// TODO handling of this
|
||||
//logger.debug(err)
|
||||
//console.log(result)
|
||||
}
|
||||
);
|
||||
res.send(JSON.stringify({ state: "OK", message: "Done!" }));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
app.post("/register", function (req, res) {
|
||||
const sess = req.session;
|
||||
let resu;
|
||||
verify(jsonConfig.hCaptcha.secret, req.body["g-recaptcha-response"]).then(
|
||||
(data) => (resu = data)
|
||||
);
|
||||
/*.catch(setTimeout(() => {
|
||||
//if(resu.success == false){
|
||||
console.log("HERE");
|
||||
const data = fs.readFileSync("templates/genericError.html", "utf8");
|
||||
resu = "-1";
|
||||
con
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
displayText: "There was an issue with the Captcha",
|
||||
})
|
||||
);
|
||||
//}
|
||||
|
||||
}, 0)
|
||||
);*/
|
||||
|
||||
if (req.body.pass == req.body.pass2) {
|
||||
|
||||
if (mailRegex.test(req.body.email)) {
|
||||
setTimeout(() => {
|
||||
console.log(resu);
|
||||
if (resu.success == true) {
|
||||
bcrypt.hash(req.body.pass, saltRounds, (err, hash) => {
|
||||
const data = fs.readFileSync(
|
||||
"templates/genericError.html",
|
||||
"utf8"
|
||||
);
|
||||
// SQL INSERT
|
||||
|
||||
const stmt =
|
||||
"INSERT INTO users(email, username, passwordHash) VALUES(?, ?, ?)";
|
||||
const stmt2 =
|
||||
"INSERT INTO mailverification(targetMail, userID, token) VALUES(?, ?, ?)";
|
||||
cryptoF.randomBytes(48, function (err, buffer) {
|
||||
const token = buffer.toString("hex");
|
||||
con.query(
|
||||
stmt,
|
||||
[req.body.email, req.body.username, hash],
|
||||
(err, results1) => {
|
||||
if (err) {
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
displayText:
|
||||
"An error occured while creating your account.",
|
||||
})
|
||||
);
|
||||
return console.error(err.message);
|
||||
} else {
|
||||
// Create mail verification
|
||||
con.query(
|
||||
stmt2,
|
||||
[req.body.email, results1.insertId, token],
|
||||
(err, results) => {
|
||||
if (err) {
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
displayText:
|
||||
"An error occured while creating your account.",
|
||||
})
|
||||
);
|
||||
return console.error(err.message);
|
||||
} else {
|
||||
sess.username = req.body.username;
|
||||
sess.uid = String(results1.insertId);
|
||||
sess.mail = req.body.email;
|
||||
// get inserted id
|
||||
logger.info("Inserted Id:" + results.insertId);
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
displayText: "OK " + hash,
|
||||
})
|
||||
);
|
||||
sendVerificationMail(results.insertId);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
} else {
|
||||
const data = fs.readFileSync("templates/register.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Register",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
sitekey: jsonConfig.hCaptcha.sitekey,
|
||||
error: true,
|
||||
errorMessage: "You failed the captcha, please try again.",
|
||||
})
|
||||
);
|
||||
}
|
||||
}, 200);
|
||||
} else {
|
||||
// Passwords don't match up
|
||||
const data = fs.readFileSync("templates/register.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Register",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
sitekey: jsonConfig.hCaptcha.sitekey,
|
||||
error: true,
|
||||
errorMessage: "The E-Mail given is not valid",
|
||||
})
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Passwords don't match up
|
||||
const data = fs.readFileSync("templates/register.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Register",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
sitekey: jsonConfig.hCaptcha.sitekey,
|
||||
error: true,
|
||||
errorMessage: "The password have to match up.",
|
||||
})
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
app.get("/register", function (req, res) {
|
||||
const data = fs.readFileSync("templates/register.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Register",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
sitekey: jsonConfig.hCaptcha.sitekey,
|
||||
})
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
app.get("/profile", function (req, res) {
|
||||
if (req.session.username != undefined) {
|
||||
let greeting = greetingTime(new Date());
|
||||
greeting += req.session.username;
|
||||
const hash = cryptoF
|
||||
.createHash("md5")
|
||||
.update(req.session.mail.replace(" ", "").toLowerCase())
|
||||
.digest("hex");
|
||||
const gravatarURL = "https://www.gravatar.com/avatar/" + hash;
|
||||
const data = fs.readFileSync("templates/profile.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Profile",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
greeting: greeting,
|
||||
gravatarURL: gravatarURL,
|
||||
})
|
||||
);
|
||||
} else {
|
||||
const data = fs.readFileSync("templates/redirect.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Profile",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
url: "/login",
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
app.get("/login", function (req, res) {
|
||||
|
||||
const data = fs.readFileSync("templates/login.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Login",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
})
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
|
||||
app.post("/login", function (req, res) {
|
||||
const password = req.body.pass;
|
||||
const mail = req.body.email;
|
||||
const sess = req.session;
|
||||
console.log(req.body.pass);
|
||||
|
||||
// Check if okay
|
||||
if (
|
||||
mail != undefined &&
|
||||
mail != "" &&
|
||||
password != undefined &&
|
||||
password != ""
|
||||
) {
|
||||
if (mailRegex.test(mail)) {
|
||||
const stmt = "SELECT * FROM users WHERE email='?';";
|
||||
con.query(stmt, [mail], function (err, result) {
|
||||
if (err) throw err; // TODO proper error page
|
||||
if (result.length == 0) {
|
||||
const data = fs.readFileSync("templates/login.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Ok",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
error: true,
|
||||
errorMessage: "This user does not exist!",
|
||||
})
|
||||
);
|
||||
} else {
|
||||
bcrypt.compare(
|
||||
password,
|
||||
result[0].passwordHash,
|
||||
function (error, response) {
|
||||
if (response) {
|
||||
// Login okay
|
||||
sess.username = result[0].username;
|
||||
sess.uid = String(result[0].id);
|
||||
sess.mail = result[0].email;
|
||||
|
||||
const data = fs.readFileSync("templates/redirect.html", "utf8");
|
||||
if (req.query.r != undefined && req.query.r != "") {
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Ok",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
url: req.query.r,
|
||||
})
|
||||
);
|
||||
|
||||
} else {
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Ok",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
url: "/profile",
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
} else {
|
||||
// Password falsch
|
||||
const data = fs.readFileSync("templates/login.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Ok",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
error: true,
|
||||
errorMessage: "The given password is wrong.",
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
const data = fs.readFileSync("templates/login.html", "utf8");
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Ok",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
error: true,
|
||||
errorMessage: "The given E-Mail is invalid.",
|
||||
})
|
||||
);
|
||||
}
|
||||
} else {
|
||||
logger.warn(
|
||||
"The login form did not sent all data. Dump: \n Password: " +
|
||||
password +
|
||||
" \n E-Mail: " +
|
||||
mail
|
||||
);
|
||||
const data = fs.readFileSync("templates/genericError.html", "utf8");
|
||||
const displayText = "The form did not sent all the information needed.";
|
||||
res.send(
|
||||
Eta.render(data, {
|
||||
author: metainfo.author,
|
||||
desc: metainfo.desc,
|
||||
siteTitel: metainfo.sitePrefix + "Error",
|
||||
fontawesomeKey: jsonConfig.fontAwesome,
|
||||
displayText: displayText,
|
||||
})
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
// sendVerificationMail(2);
|
||||
function sendVerificationMail(userId) {
|
||||
// Query for the mail
|
||||
const stmt = "SELECT * FROM mailverification WHERE id=?";// + userId;
|
||||
con.query(stmt, [userId], function (err, result, fields) {
|
||||
if (err) throw err; // TODO proper error handling
|
||||
if (result.length == 0) {
|
||||
logger.warn(
|
||||
"sendVerificationMail failed because ID " + userId + " doesnt exist!"
|
||||
);
|
||||
} else {
|
||||
const emailContent =
|
||||
"Hi! \n You have created an account for the open elevator map. To finalize the process please verify your E-Mail adress. Use this link: http://" +
|
||||
serverAdress +
|
||||
"/verify/" +
|
||||
result[0].token;
|
||||
transport.sendMail({
|
||||
from: '"Elevator map " <' + mailConf.username + ">", // sender address
|
||||
to: result[0].targetMail, // list of receivers
|
||||
subject: "[Elevator map] Please verify your Mailadress", // Subject line
|
||||
text: emailContent, // plain text body
|
||||
html: emailContent.replace("\n", "<br>"), // html body
|
||||
});
|
||||
}
|
||||
|
||||
console.log(result);
|
||||
});
|
||||
|
||||
/*
|
||||
let info = await transporter.sendMail({
|
||||
from: '"Elevator map " <' + mysqlData.username + '>', // sender address
|
||||
to: "bar@example.com, baz@example.com", // list of receivers
|
||||
subject: "Hello ✔", // Subject line
|
||||
text: "Hello world?", // plain text body
|
||||
html: "<b>Hello world?</b>", // html body
|
||||
});*/
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
6
routes/debug.route.ts
Normal file
6
routes/debug.route.ts
Normal file
@ -0,0 +1,6 @@
|
||||
module.exports = function (app) {
|
||||
app.get("/debug/showSessionInfo", function (req, res) {
|
||||
res.send(JSON.stringify(req.session));
|
||||
});
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user