Merge pull request #641 from TNG-dev/zkldi/ban-users

This commit is contained in:
zkldi
2022-01-30 16:37:29 +00:00
committed by GitHub
6 changed files with 56 additions and 2 deletions
+1
View File
@@ -54,6 +54,7 @@ const staticIndexes: Partial<Record<Databases, Index[]>> = {
],
users: [
index({ id: 1 }, UNIQUE),
index({ id: 1, authLevel: 1 }, UNIQUE),
index({ username: 1 }, UNIQUE),
index({ usernameLowercase: 1 }, UNIQUE),
],
+25
View File
@@ -2,6 +2,7 @@ import expMiddlewareMock from "express-request-mock";
import db from "external/mongo/db";
import { SYMBOL_TachiAPIAuth } from "lib/constants/tachi";
import t from "tap";
import mockApi from "test-utils/mock-api";
import ResetDBState from "test-utils/resets";
import { AllPermissions, SetRequestPermissions } from "./auth";
@@ -119,3 +120,27 @@ t.test("#SetRequestPermissions", (t) => {
t.end();
});
t.test("#RejectIfBanned", (t) => {
t.test("Should stop banned users from doing anything.", async (t) => {
await db.users.update({ id: 1 }, { $set: { authLevel: 0 } });
await db["api-tokens"].insert({
userID: 1,
identifier: "Mock API Token",
permissions: {
customise_profile: true,
},
token: "mock_token",
fromAPIClient: null,
});
const res = await mockApi.get("/api/v1/status").set("Authorization", "Bearer mock_token");
t.equal(res.statusCode, 403, "Should return 403 on benign endpoints.");
t.end();
});
t.end();
});
+20 -1
View File
@@ -2,8 +2,9 @@ import { RequestHandler } from "express";
import db from "external/mongo/db";
import { SYMBOL_TachiAPIAuth } from "lib/constants/tachi";
import { SplitAuthorizationHeader } from "utils/misc";
import { APITokenDocument, APIPermissions } from "tachi-common";
import { APITokenDocument, APIPermissions, UserAuthLevels } from "tachi-common";
import CreateLogCtx from "lib/logger/logger";
import { TachiConfig } from "lib/setup/config";
const logger = CreateLogCtx(__filename);
@@ -186,3 +187,21 @@ const CreateRequireNotGuest =
export const RequireNotGuest: RequestHandler = CreateRequireNotGuest("description");
export const FervidexStyleRequireNotGuest: RequestHandler = CreateRequireNotGuest("error");
export const RejectIfBanned: RequestHandler = async (req, res, next) => {
if (req[SYMBOL_TachiAPIAuth].userID) {
const isBanned = await db.users.findOne({
id: req[SYMBOL_TachiAPIAuth].userID!,
authLevel: UserAuthLevels.BANNED,
});
if (isBanned) {
return res.status(403).json({
success: false,
description: `You are banned from ${TachiConfig.NAME}`,
});
}
}
next();
};
@@ -1,6 +1,7 @@
import CreateLogCtx from "lib/logger/logger";
import { RequestHandler, Response } from "express-serve-static-core";
import { SYMBOL_TachiAPIAuth } from "lib/constants/tachi";
import { TachiConfig } from "lib/setup/config";
const logger = CreateLogCtx(__filename);
@@ -60,6 +61,10 @@ export const RequestLoggerMiddleware: RequestHandler = (req, res, next) => {
return;
}
if (contents.body?.description === `You are banned from ${TachiConfig.NAME}.`) {
return;
}
if (res.statusCode < 400 || res.statusCode === 404) {
logger.verbose(
`(${req.method} ${req.originalUrl}) Returned ${res.statusCode}.`,
+2 -1
View File
@@ -1,6 +1,6 @@
import { Router } from "express";
import { UpdateLastSeen } from "server/middleware/update-last-seen";
import { SetRequestPermissions } from "../middleware/auth";
import { RejectIfBanned, SetRequestPermissions } from "../middleware/auth";
import { NormalRateLimitMiddleware } from "../middleware/rate-limiter";
import apiRouterV1 from "./api/v1/router";
import irRouter from "./ir/router";
@@ -13,6 +13,7 @@ router.use("/ir", NormalRateLimitMiddleware, irRouter);
// but also may require custom authentication.
router.use(SetRequestPermissions);
router.use(UpdateLastSeen);
router.use(RejectIfBanned);
router.use("/api/v1", apiRouterV1);
+3
View File
@@ -8,6 +8,7 @@ import { SYMBOL_TachiAPIAuth } from "lib/constants/tachi";
import CreateLogCtx from "lib/logger/logger";
import { Environment, ServerConfig, TachiConfig } from "lib/setup/config";
import { integer } from "tachi-common";
import { RejectIfBanned } from "./middleware/auth";
import { RequestLoggerMiddleware } from "./middleware/request-logger";
import mainRouter from "./router/router";
@@ -96,6 +97,8 @@ process.on("unhandledRejection", (reason, promise) => {
app.use(express.json({ limit: "4mb" }));
app.use((req, res, next) => {
// Always mount an empty req body. We operate under the assumption that req.body is
// always defined.
if (req.method !== "GET" && !req.body) {
req.body = {};
}