Merge 3eaacb4bed into e7f85d404d
This commit is contained in:
Bohica
GitHub
commit
86352575ab
6 changed files with 431 additions and 0 deletions
|
|
@ -3,6 +3,7 @@ using Server.Engines.Quests.Collector;
|
|||
using Server.Items;
|
||||
using Server.Mobiles;
|
||||
using Server.Spells;
|
||||
using Server.Engines.AntiBot;
|
||||
|
||||
namespace Server.Engines.Harvest
|
||||
{
|
||||
|
|
@ -492,6 +493,17 @@ namespace Server.Engines.Harvest
|
|||
return false;
|
||||
}
|
||||
|
||||
if (Utility.Random(100) < 1)
|
||||
{
|
||||
if (!AntiBotSystem.CheckPlayer(from, () =>
|
||||
{
|
||||
from.Target = new HarvestTarget(tool, this);
|
||||
}))
|
||||
{
|
||||
return false; // antibot challenge sent
|
||||
}
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage(500974); // What water do you want to fish in?
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using Server.Items;
|
||||
using Server.Targeting;
|
||||
using Server.Engines.AntiBot;
|
||||
|
||||
namespace Server.Engines.Harvest
|
||||
{
|
||||
|
|
@ -185,6 +186,17 @@ namespace Server.Engines.Harvest
|
|||
{
|
||||
from.RevealingAction();
|
||||
}
|
||||
|
||||
if (Utility.Random(100) < 1)
|
||||
{
|
||||
if (!AntiBotSystem.CheckPlayer(from, () =>
|
||||
{
|
||||
from.Target = new HarvestTarget(tool, this);
|
||||
}))
|
||||
{
|
||||
// antibot challenge sent
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void Initialize()
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using Server.Items;
|
||||
using Server.Mobiles;
|
||||
using Server.Targeting;
|
||||
using Server.Engines.AntiBot;
|
||||
|
||||
namespace Server.Engines.Harvest
|
||||
{
|
||||
|
|
@ -444,6 +445,17 @@ namespace Server.Engines.Harvest
|
|||
return false;
|
||||
}
|
||||
|
||||
if (Utility.Random(100) < 1)
|
||||
{
|
||||
if (!AntiBotSystem.CheckPlayer(from, () =>
|
||||
{
|
||||
from.Target = new HarvestTarget(tool, this);
|
||||
}))
|
||||
{
|
||||
// antibot challenge sent
|
||||
}
|
||||
}
|
||||
|
||||
from.SendLocalizedMessage(503033); // Where do you wish to dig?
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
77
Projects/UOContent/Systems/AntiBotSystem/AntiBotGump.cs
Normal file
77
Projects/UOContent/Systems/AntiBotSystem/AntiBotGump.cs
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2025 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: AntiBotGump.cs *
|
||||
* *
|
||||
* This program is free software: you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation, either version 3 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
*************************************************************************/
|
||||
|
||||
using Server.Gumps;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Engines.AntiBot
|
||||
{
|
||||
public class AntiBotGump : Gump
|
||||
{
|
||||
public readonly Mobile _mobile;
|
||||
public readonly int _code;
|
||||
|
||||
public AntiBotGump(Mobile mobile, int code) : base(150, 150)
|
||||
{
|
||||
_mobile = mobile;
|
||||
_code = code;
|
||||
|
||||
Closable = false;
|
||||
Disposable = false;
|
||||
Draggable = true;
|
||||
Resizable = false;
|
||||
|
||||
AddPage(0);
|
||||
AddBackground(0, 0, 350, 220, 9270);
|
||||
|
||||
AddHtml(20, 20, 310, 25, "<CENTER><B><BASEFONT COLOR=#FFFFFF>Anti-Bot Verification</BASEFONT></B></CENTER>", false, false);
|
||||
AddHtml(20, 50, 310, 40, "<CENTER><BASEFONT COLOR=#FFFFFF>Please enter the following number:</B></BASEFONT></CENTER>", false, false);
|
||||
AddHtml(20, 55, 310, 40, $"<CENTER><BASEFONT COLOR=#FFFFFF><BR><B style=\"color: #FF0000;\">{code}</B></BASEFONT></CENTER>", false, false);
|
||||
AddHtml(20, 100, 310, 50, "<BASEFONT COLOR=#FFFFFF>You have 5 minutes to input the correct number.<BR>Incorrect numbers, cancellations, or timeouts will disconnect you from the server.</BASEFONT>", false, false);
|
||||
|
||||
AddBackground(20, 160, 200, 25, 3000);
|
||||
AddTextEntry(25, 165, 190, 20, 0, 0, "");
|
||||
|
||||
AddButton(230, 160, 4005, 4007, 1, GumpButtonType.Reply, 0); // Submit
|
||||
AddHtml(230, 190, 40, 20, "<CENTER><BASEFONT COLOR=#FFFFFF>Submit</BASEFONT></CENTER>", false, false);
|
||||
|
||||
AddButton(290, 160, 4017, 4019, 0, GumpButtonType.Reply, 0); // Cancel
|
||||
AddHtml(290, 190, 40, 20, "<CENTER><BASEFONT COLOR=#FFFFFF>Cancel</BASEFONT></CENTER>", false, false);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender?.Mobile;
|
||||
if (from == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
bool cancelled = info.ButtonID == 0;
|
||||
int enteredCode = 0;
|
||||
|
||||
if (!cancelled)
|
||||
{
|
||||
var textEntry = info.GetTextEntry(0);
|
||||
if (textEntry != null && !int.TryParse(textEntry.Trim(), out enteredCode))
|
||||
{
|
||||
enteredCode = -1;
|
||||
}
|
||||
}
|
||||
|
||||
AntiBotSystem.ProcessResponse(from, enteredCode, cancelled);
|
||||
}
|
||||
}
|
||||
}
|
||||
233
Projects/UOContent/Systems/AntiBotSystem/AntiBotSystem.cs
Normal file
233
Projects/UOContent/Systems/AntiBotSystem/AntiBotSystem.cs
Normal file
|
|
@ -0,0 +1,233 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2025 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: AntiBotSystem.cs *
|
||||
* *
|
||||
* This program is free software: you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation, either version 3 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
*************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.Http;
|
||||
using System.Text.Json;
|
||||
using System.Threading.Tasks;
|
||||
using Server.Gumps;
|
||||
using Server.Mobiles;
|
||||
|
||||
namespace Server.Engines.AntiBot
|
||||
{
|
||||
public static class AntiBotSystem
|
||||
{
|
||||
private class AntiBotChallenge
|
||||
{
|
||||
public string ChallengeId { get; set; }
|
||||
public DateTime ChallengeExpiry { get; set; }
|
||||
public Action SuccessCallback { get; set; }
|
||||
public Timer TimeoutTimer { get; set; }
|
||||
public bool UseTurnstile { get; set; }
|
||||
public int FallbackCode { get; set; }
|
||||
}
|
||||
|
||||
private static readonly Dictionary<Mobile, AntiBotChallenge> _activeChallenges = new();
|
||||
private static readonly HttpClient _httpClient = new();
|
||||
|
||||
// enable or disable the entire anti-bot verification system
|
||||
public static bool Enabled { get; set; } = true;
|
||||
|
||||
// if set to false (default) = uses a number matching verification
|
||||
// if set to true = uses Cloudflare's Turnstile verification
|
||||
public static bool UseTurnstile { get; set; } = false;
|
||||
|
||||
// Cloudflare Turnstile
|
||||
// secret key from your Cloudflare account (https://dash.cloudflare.com/login)
|
||||
public static string TurnstileSecretKey { get; set; } = "YOUR_SECRET_KEY";
|
||||
|
||||
// the base URL where the widget is hosted (must support HTTPS)
|
||||
// view the docs here: https://developers.cloudflare.com/turnstile/
|
||||
public static string VerificationUrl { get; set; } = "https://yourwebserver.com/verify";
|
||||
|
||||
// timeout before disconnecting the user (applies to both Turnstile and number match verification)
|
||||
public static TimeSpan ChallengeTimeout { get; set; } = TimeSpan.FromMinutes(5);
|
||||
|
||||
public static bool CheckPlayer(Mobile from, Action onSuccess)
|
||||
{
|
||||
if (!Enabled || from is not PlayerMobile)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
CleanupExpiredChallenges();
|
||||
|
||||
if (_activeChallenges.ContainsKey(from))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var challengeId = Guid.NewGuid().ToString("N")[..8];
|
||||
var challenge = new AntiBotChallenge
|
||||
{
|
||||
ChallengeId = challengeId,
|
||||
ChallengeExpiry = Core.Now.Add(ChallengeTimeout),
|
||||
SuccessCallback = onSuccess,
|
||||
UseTurnstile = UseTurnstile,
|
||||
FallbackCode = Utility.RandomMinMax(1000, 9999)
|
||||
};
|
||||
|
||||
challenge.TimeoutTimer = Timer.DelayCall(ChallengeTimeout, () =>
|
||||
{
|
||||
if (_activeChallenges.ContainsKey(from))
|
||||
{
|
||||
_activeChallenges.Remove(from);
|
||||
from.SendMessage("Anti-Bot: Verification timed out. Disconnecting...");
|
||||
from.NetState?.Disconnect("Anti-Bot: Verification failed by timing out.");
|
||||
}
|
||||
});
|
||||
|
||||
_activeChallenges[from] = challenge;
|
||||
|
||||
if (UseTurnstile)
|
||||
{
|
||||
from.CloseGump<AntiBotTurnstileGump>();
|
||||
from.SendGump(new AntiBotTurnstileGump(from, challengeId));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.CloseGump<AntiBotGump>();
|
||||
from.SendGump(new AntiBotGump(from, challenge.FallbackCode));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static async Task<bool> VerifyTurnstileToken(string token)
|
||||
{
|
||||
var formData = new List<KeyValuePair<string, string>>
|
||||
{
|
||||
new("secret", TurnstileSecretKey),
|
||||
new("response", token)
|
||||
};
|
||||
|
||||
var response = await _httpClient.PostAsync(
|
||||
"https://challenges.cloudflare.com/turnstile/v0/siteverify",
|
||||
new FormUrlEncodedContent(formData)
|
||||
);
|
||||
|
||||
var jsonResponse = await response.Content.ReadAsStringAsync();
|
||||
var result = JsonSerializer.Deserialize<TurnstileResponse>(jsonResponse);
|
||||
|
||||
return result?.Success == true;
|
||||
}
|
||||
|
||||
internal static void ProcessResponse(Mobile from, int enteredCode, bool cancelled)
|
||||
{
|
||||
if (!_activeChallenges.TryGetValue(from, out var challenge))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
challenge.TimeoutTimer?.Stop();
|
||||
_activeChallenges.Remove(from);
|
||||
|
||||
if (cancelled)
|
||||
{
|
||||
from.SendMessage("Anti-Bot: Verification cancelled. Disconnecting...");
|
||||
from.NetState?.Disconnect("Anti-Bot: Verification failed by cancellation.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (enteredCode == challenge.FallbackCode)
|
||||
{
|
||||
from.SendMessage("Anti-Bot: Verification successful!");
|
||||
challenge.SuccessCallback?.Invoke();
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("Anti-Bot: Incorrect number. Disconnecting...");
|
||||
from.NetState?.Disconnect("Anti-Bot: Verification failed by incorrect number.");
|
||||
}
|
||||
}
|
||||
|
||||
internal static async void ProcessTurnstileResponse(Mobile from, string token)
|
||||
{
|
||||
if (!_activeChallenges.TryGetValue(from, out var challenge))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
challenge.TimeoutTimer?.Stop();
|
||||
_activeChallenges.Remove(from);
|
||||
|
||||
var isValid = await VerifyTurnstileToken(token);
|
||||
|
||||
if (isValid)
|
||||
{
|
||||
from.SendMessage("Anti-Bot: Verification successful!");
|
||||
challenge.SuccessCallback?.Invoke();
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("Anti-Bot: Verification failed. Disconnecting...");
|
||||
from.NetState?.Disconnect("Anti-Bot: Verification failed.");
|
||||
}
|
||||
}
|
||||
|
||||
public static void ProcessTurnstileVerification(string challengeId, string token)
|
||||
{
|
||||
Mobile targetMobile = null;
|
||||
foreach (var kvp in _activeChallenges)
|
||||
{
|
||||
if (kvp.Value.ChallengeId == challengeId)
|
||||
{
|
||||
targetMobile = kvp.Key;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (targetMobile != null)
|
||||
{
|
||||
ProcessTurnstileResponse(targetMobile, token);
|
||||
}
|
||||
}
|
||||
|
||||
private static void CleanupExpiredChallenges()
|
||||
{
|
||||
var now = Core.Now;
|
||||
var toRemove = new List<Mobile>();
|
||||
|
||||
foreach (var kvp in _activeChallenges)
|
||||
{
|
||||
if (kvp.Value.ChallengeExpiry < now)
|
||||
{
|
||||
kvp.Value.TimeoutTimer?.Stop();
|
||||
toRemove.Add(kvp.Key);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var mobile in toRemove)
|
||||
{
|
||||
_activeChallenges.Remove(mobile);
|
||||
}
|
||||
}
|
||||
|
||||
public static void CancelChallenge(Mobile from)
|
||||
{
|
||||
if (_activeChallenges.TryGetValue(from, out var challenge))
|
||||
{
|
||||
challenge.TimeoutTimer?.Stop();
|
||||
_activeChallenges.Remove(from);
|
||||
}
|
||||
}
|
||||
|
||||
private class TurnstileResponse
|
||||
{
|
||||
public bool Success { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2025 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: AntiBotTurnstileGump.cs *
|
||||
* *
|
||||
* This program is free software: you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation, either version 3 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
*************************************************************************/
|
||||
|
||||
using Server.Gumps;
|
||||
using Server.Network;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Server.Engines.AntiBot
|
||||
{
|
||||
public class AntiBotTurnstileGump : Gump
|
||||
{
|
||||
private readonly Mobile _from;
|
||||
private readonly string _challengeId;
|
||||
|
||||
public AntiBotTurnstileGump(Mobile from, string challengeId) : base(150, 150)
|
||||
{
|
||||
_from = from;
|
||||
_challengeId = challengeId;
|
||||
|
||||
Closable = false;
|
||||
Disposable = false;
|
||||
Draggable = true;
|
||||
Resizable = false;
|
||||
|
||||
AddPage(0);
|
||||
AddBackground(0, 0, 350, 220, 9270);
|
||||
|
||||
AddHtml(20, 20, 310, 25, "<CENTER><B><BASEFONT COLOR=#FFFFFF>Anti-Bot Verification</BASEFONT></B></CENTER>", false, false);
|
||||
AddHtml(20, 50, 310, 40, "<CENTER><BASEFONT COLOR=#FFFFFF>Please verify by web browser:</B></BASEFONT></CENTER>", false, false);
|
||||
AddHtml(20, 75, 310, 40, $"<CENTER><BASEFONT COLOR=#FFFFFF>{AntiBotSystem.VerificationUrl}?id={challengeId}</B></BASEFONT></CENTER>", false, false);
|
||||
AddHtml(20, 100, 310, 50, "<BASEFONT COLOR=#FFFFFF>You have 5 minutes to complete verification.<BR>Cancelling or timing out will disconnect you from the server.</BASEFONT>", false, false);
|
||||
|
||||
AddButton(30, 170, 4005, 4007, 1, GumpButtonType.Reply, 0); // Open Browser
|
||||
AddHtml(60, 173, 100, 20, "<CENTER><BASEFONT COLOR=#FFFFFF>Open Browser</BASEFONT></CENTER>", false, false);
|
||||
|
||||
AddButton(230, 170, 4017, 4019, 0, GumpButtonType.Reply, 0); // Cancel
|
||||
AddHtml(260, 173, 60, 20, "<CENTER><BASEFONT COLOR=#FFFFFF>Cancel</BASEFONT></CENTER>", false, false);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender?.Mobile;
|
||||
if (from == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
case 1: // Open Browser
|
||||
try
|
||||
{
|
||||
var url = $"{AntiBotSystem.VerificationUrl}?id={_challengeId}";
|
||||
Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
|
||||
_from.SendMessage("Browser opened. Complete verification and return to game.");
|
||||
_from.SendGump(this); // Keep gump open
|
||||
}
|
||||
catch
|
||||
{
|
||||
_from.SendMessage("Could not open browser. Please visit the verification URL manually.");
|
||||
_from.SendGump(this); // Keep gump open
|
||||
}
|
||||
break;
|
||||
|
||||
case 0: // Cancel
|
||||
AntiBotSystem.CancelChallenge(_from);
|
||||
_from.SendMessage("Anti-Bot: Verification cancelled. Disconnecting...");
|
||||
_from.NetState?.Disconnect("Anti-Bot: Verification cancelled.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue