versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-01-26 12:16:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(api): 🎨 Simplify bait middleware

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-06-12 19:38:57 -10:00
parent d301d4da09
commit 36d70fb612
No known key found for this signature in database
1 changed files with 34 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
middlewares/bait.ts
View file

@ -1,49 +1,43 @@
import { logger } from "@/loggers"; import { logger } from "@/loggers";
import { errorResponse, response } from "@/response"; import { response } from "@/response";
import type { SocketAddress } from "bun"; import type { SocketAddress } from "bun";
import { createMiddleware } from "hono/factory"; import { createMiddleware } from "hono/factory";
import { matches } from "ip-matching"; import { matches } from "ip-matching";
import { config } from "~/packages/config-manager"; import { config } from "~/packages/config-manager";
import { LogLevel } from "~/packages/log-manager"; import { LogLevel } from "~/packages/log-manager";
export const bait = createMiddleware(async (context, next) => { const baitFile = async () => {
const requestIp = context.env?.ip as SocketAddress | undefined | null; const file = Bun.file(config.http.bait.send_file || "./beemovie.txt");
if (config.http.bait.enabled) {
// Check for bait IPs
if (requestIp?.address) {
for (const ip of config.http.bait.bait_ips) {
try {
if (matches(ip, requestIp.address)) {
const file = Bun.file(
config.http.bait.send_file || "./beemovie.txt",
);
if (await file.exists()) { if (await file.exists()) {
return response(file); return file;
} }
await logger.log( await logger.log(
LogLevel.Error, LogLevel.Error,
"Server.Bait", "Server.Bait",
`Bait file not found: ${config.http.bait.send_file}`, `Bait file not found: ${config.http.bait.send_file}`,
); );
} };
} catch (e) {
logger.log(
LogLevel.Error,
"Server.IPCheck",
`Error while parsing bait IP "${ip}" `,
);
logger.logError(
LogLevel.Error,
"Server.IPCheck",
e as Error,
);
return errorResponse( export const bait = createMiddleware(async (context, next) => {
`A server error occured: ${(e as Error).message}`, const requestIp = context.env?.ip as SocketAddress | undefined | null;
500,
); if (!config.http.bait.enabled) {
return await next();
}
const file = await baitFile();
if (!file) {
return await next();
}
// Check for bait IPs
if (requestIp?.address) {
for (const ip of config.http.bait.bait_ips) {
if (matches(ip, requestIp.address)) {
return response(file);
} }
} }
} }
@ -53,20 +47,8 @@ export const bait = createMiddleware(async (context, next) => {
for (const agent of config.http.bait.bait_user_agents) { for (const agent of config.http.bait.bait_user_agents) {
if (new RegExp(agent).test(ua)) { if (new RegExp(agent).test(ua)) {
const file = Bun.file(
config.http.bait.send_file || "./beemovie.txt",
);
if (await file.exists()) {
return response(file); return response(file);
} }
await logger.log(
LogLevel.Error,
"Server.Bait",
`Bait file not found: ${config.http.bait.send_file}`,
);
}
}
} }
await next(); await next();