Skip to content

Added daily limiter to vpn detection requests #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kev306 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added daily limiter to vpn detection requests #668

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b711cb8
Temporarily disabling getip vpn check until a limiter is added
kev306 May 4, 2024
8b7de90
Added limiter for VPN detection
kev306 May 4, 2024
b7a1619
Merge branch 'master' of github.com:vck3000/ProAvalon into bugfix/vpn…
kev306 May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions src/util/vpnDetection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { RequestHandler } from 'express';

const VPN_TIMEOUT = 1000 * 60 * 60 * 12; // 12 hours
const VPN_TIMEOUT = 12 * 60 * 60 * 1000; // 12 hours
const VPN_LIMITER_VPNAPI = 500;
const VPN_LIMITER_GETIP = 1000;
const VPN_LIMITER_RESET_INTERVAL = 24 * 60 * 60 * 1000; // 24 hours

let whitelistedUsernames: string[] = [];
if (process.env.WHITELISTED_VPN_USERNAMES) {
Expand Down Expand Up @@ -44,7 +47,7 @@ type IP = string;

const vpnCache: Map<IP, VpnEntry> = new Map();

const isVPN = async (ip: string): Promise<boolean> => {
const isVPN = async (ip: string, totalDailyCalls: number): Promise<boolean> => {
if (vpnCache.has(ip)) {
// Clear the cache entry if it's timed out.
if (vpnCache.get(ip).isTimedOut(new Date())) {
Expand All @@ -60,16 +63,24 @@ const isVPN = async (ip: string): Promise<boolean> => {
console.log(`Checking VPN status of ip: ${ip}`);
console.log(`VPN Cache size: ${vpnCache.size}`);

// Must pass both vpn checks
const VpnCheck1 = await isVpnCheck1(ip);
let VpnCheck1;
let VpnCheck2;

if (totalDailyCalls < VPN_LIMITER_VPNAPI) {
VpnCheck1 = await isVpnCheck1(ip);
}

if (totalDailyCalls < VPN_LIMITER_GETIP) {
VpnCheck2 = await isVpnCheck2(ip);
}

const msg = 'Max daily calls reached';

// TODO-kev: Temporarily commenting out until a limiter is added in
// const VpnCheck2 = await isVpnCheck2(ip);
// console.log(
// `VPN Detection Result: vpnapi.io=${VpnCheck1} check.getipintel.net=${VpnCheck2}`,
// );
console.log(
`VPN Detection Result: vpnapi.io=${VpnCheck1} check.getipintel.net=temporarily disabled`,
`VPN Detection Result: vpnapi.io="${
VpnCheck1 ? VpnCheck1 : msg
}" check.getipintel.net="${VpnCheck2 ? VpnCheck2 : msg}"`,
);

// const result = VpnCheck1 || VpnCheck2;
Expand Down Expand Up @@ -115,6 +126,13 @@ const isVpnCheck2 = async (ip: string): Promise<boolean> => {
return result;
};

let disallowVPNsCallCount = 0;

// Reset disallowVPNsCallCount every 24 hours
setInterval(() => {
disallowVPNsCallCount = 0;
}, VPN_LIMITER_RESET_INTERVAL);

export const disallowVPNs: RequestHandler = (req, res, next) => {
if (process.env.ENV === 'local') {
next();
Expand All @@ -126,7 +144,9 @@ export const disallowVPNs: RequestHandler = (req, res, next) => {
return;
}

isVPN(req.ip)
disallowVPNsCallCount++;

isVPN(req.ip, disallowVPNsCallCount)
.then((vpn) => {
if (vpn) {
console.log(`Blocked ${req.body.username} on ip ${req.ip}`);
Expand Down