Compare commits

...

11 Commits

Author SHA1 Message Date
Kayne Ruse db03373892 Spam attack throttling added 2023-05-15 09:13:09 +10:00
Kayne Ruse 267ecaa705 Added a typecheck to password field 2023-05-15 08:03:54 +10:00
Kayne Ruse 3a8cfd39ed BUGFIX: force a logout if refresh token is too old 2023-05-05 03:56:24 +10:00
Kayne Ruse b157ef18ff Updated dependencies 2023-05-03 21:31:30 +10:00
Kayne Ruse 500035284f Updated depencencies, bumped version 2023-03-25 01:49:17 +11:00
Kayne Ruse c5360a70d6 Updated dependencies 2023-03-19 02:52:44 +11:00
Kayne Ruse cf4c8a0f99 Updated dependencies 2023-02-21 09:30:12 +11:00
Kayne Ruse 21527d8931 Updated dependencies, License 2023-01-12 08:08:27 +11:00
Kayne Ruse a54e802942 Bumped version number 2023-01-04 12:56:04 +00:00
Kayne Ruse f8abd9110d Switched to a slim docker distro 2023-01-04 23:51:43 +11:00
Kayne Ruse 406345ada1 Updated libraries 2022-12-31 19:02:27 +00:00
8 changed files with 1444 additions and 1460 deletions
+2 -1
View File
@@ -1,4 +1,5 @@
FROM node:18
FROM node:18-bullseye-slim
WORKDIR "/app" WORKDIR "/app"
COPY package*.json ./ COPY package*.json ./
RUN npm install --production RUN npm install --production
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2021 Kayne Ruse, KR Game Studios Copyright (c) 2021-2023 Kayne Ruse, KR Game Studios
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+1 -1
View File
@@ -133,7 +133,7 @@ networks:
`; `;
const dockerfile = ` const dockerfile = `
FROM node:18 FROM node:18-bullseye-slim
WORKDIR "/app" WORKDIR "/app"
COPY package*.json ./ COPY package*.json ./
RUN npm install --production RUN npm install --production
+1398 -1439
View File
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -1,6 +1,6 @@
{ {
"name": "auth-server", "name": "auth-server",
"version": "1.6.5", "version": "1.7.5",
"description": "An API centric auth server. Uses Sequelize and mariaDB by default.", "description": "An API centric auth server. Uses Sequelize and mariaDB by default.",
"main": "server/server.js", "main": "server/server.js",
"scripts": { "scripts": {
@@ -24,14 +24,14 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"express": "^4.18.2", "express": "^4.18.2",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^9.0.0",
"mariadb": "^3.0.2", "mariadb": "^3.1.1",
"node-cron": "^3.0.2", "node-cron": "^3.0.2",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.9",
"nodemailer": "^6.8.0", "nodemailer": "^6.9.1",
"sequelize": "^6.25.8" "sequelize": "^6.31.1"
}, },
"devDependencies": { "devDependencies": {
"nodemon": "^2.0.20" "nodemon": "^2.0.22"
} }
} }
+30
View File
@@ -19,6 +19,13 @@ const route = async (req, res) => {
return res.status(401).send(validateErr); return res.status(401).send(validateErr);
} }
//script throttle
const throttle = await checkThrottle(req.body.email);
if (throttle) {
console.warn(`Spam attack detected: ${req.body.email} (${req.body.username})`);
return res.status(401).send(throttle);
}
//generate the password hash //generate the password hash
const hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11)); const hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
@@ -83,6 +90,10 @@ const validateDetails = async (body) => {
return 'Missing password'; return 'Missing password';
} }
if (typeof body.password != "string") {
return 'Invalid password';
}
if (body.password.length < 8) { if (body.password.length < 8) {
return 'Password too short'; return 'Password too short';
} }
@@ -90,6 +101,25 @@ const validateDetails = async (body) => {
return null; return null;
}; };
const checkThrottle = async (email) => {
//check email delay
const prev = await pendingSignups.findOne({
where: {
email: email,
}
});
const DateOffset = ( offset ) => { //Thanks, SO!
return new Date( +new Date + offset );
}
if (!!prev && prev.updatedAt > DateOffset( -5000 )) {
return "An unknown error occurred";
}
return null;
}
const registerPendingSignup = async (body, hash, token) => { const registerPendingSignup = async (body, hash, token) => {
const record = await pendingSignups.upsert({ const record = await pendingSignups.upsert({
email: body.email, email: body.email,
-11
View File
@@ -36,17 +36,6 @@ app.get('*', (req, res) => {
//startup //startup
server.listen(process.env.WEB_PORT || 3200, async (err) => { server.listen(process.env.WEB_PORT || 3200, async (err) => {
//BUGFIX: clear out old refresh tokens
const { Op } = require('sequelize');
const { tokens } = require('./database/models');
tokens.destroy({
where: {
createdAt: {
[Op.lt]: new Date(new Date().setDate(new Date().getDate() - 30))
}
}
});
await database.sync(); await database.sync();
console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`); console.log(`listening to localhost:${process.env.WEB_PORT || 3200}`);
}); });
+5
View File
@@ -25,6 +25,11 @@ const TokenProvider = props => {
localStorage.setItem("accessToken", accessToken); localStorage.setItem("accessToken", accessToken);
}, [accessToken]); }, [accessToken]);
//force a logout if refresh token is too old
if (accessToken && (new Date(Date.now() - 60 * 60 * 24 * 30 * 1000).getTime() > decode(accessToken).exp * 1000)) {
forceLogout();
}
//wrap the default fetch function //wrap the default fetch function
const tokenFetch = async (url, options) => { const tokenFetch = async (url, options) => {
//use this? //use this?