rename command: `ban ...` => `ban player ...`
To enable adding other subcommands starting with `ban`. Moving ban list and crash related code into its own class to tidy the Program class up. Change Id values of the crash cmds, to fit into the 16 byte max length imposed by ChangeStagePacket.IdSize.
This commit is contained in:
Robin C. Ladiges
parent
71bb96bf1e
commit
e13840d543
|
|
@ -0,0 +1,143 @@
|
|||
using System.Net;
|
||||
using System.Text;
|
||||
|
||||
using Shared.Packet.Packets;
|
||||
|
||||
namespace Server;
|
||||
|
||||
using MUCH = Func<string[], (HashSet<string> failToFind, HashSet<Client> toActUpon, List<(string arg, IEnumerable<string> amb)> ambig)>;
|
||||
|
||||
public static class BanLists {
|
||||
public static bool Enabled {
|
||||
get {
|
||||
return Settings.Instance.BanList.Enabled;
|
||||
}
|
||||
}
|
||||
|
||||
private static List<string> IPs {
|
||||
get {
|
||||
return Settings.Instance.BanList.IpAddresses;
|
||||
}
|
||||
}
|
||||
|
||||
private static List<Guid> Profiles {
|
||||
get {
|
||||
return Settings.Instance.BanList.Players;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static bool IsIPv4Banned(Client user) {
|
||||
IPEndPoint? ipv4 = (IPEndPoint?) user.Socket?.RemoteEndPoint;
|
||||
if (ipv4 == null) { return false; }
|
||||
return IsIPv4Banned(ipv4.Address);
|
||||
}
|
||||
public static bool IsIPv4Banned(IPAddress ipv4) {
|
||||
return IsIPv4Banned(ipv4.ToString());
|
||||
}
|
||||
public static bool IsIPv4Banned(string ipv4) {
|
||||
return IPs.Contains(ipv4);
|
||||
}
|
||||
|
||||
public static bool IsProfileBanned(Client user) {
|
||||
return IsProfileBanned(user.Id);
|
||||
}
|
||||
public static bool IsProfileBanned(string str) {
|
||||
if (!Guid.TryParse(str, out Guid id)) { return false; }
|
||||
return IsProfileBanned(id);
|
||||
}
|
||||
public static bool IsProfileBanned(Guid id) {
|
||||
return Profiles.Contains(id);
|
||||
}
|
||||
|
||||
public static bool IsClientBanned(Client user) {
|
||||
return IsProfileBanned(user) || IsIPv4Banned(user);
|
||||
}
|
||||
|
||||
|
||||
private static void BanIPv4(Client user) {
|
||||
IPEndPoint? ipv4 = (IPEndPoint?) user.Socket?.RemoteEndPoint;
|
||||
if (ipv4 != null) {
|
||||
BanIPv4(ipv4.Address);
|
||||
}
|
||||
}
|
||||
private static void BanIPv4(IPAddress ipv4) {
|
||||
BanIPv4(ipv4.ToString());
|
||||
}
|
||||
private static void BanIPv4(string ipv4) {
|
||||
IPs.Add(ipv4);
|
||||
}
|
||||
|
||||
private static void BanProfile(Client user) {
|
||||
BanProfile(user.Id);
|
||||
}
|
||||
private static void BanProfile(string str) {
|
||||
if (!Guid.TryParse(str, out Guid id)) { return; }
|
||||
BanProfile(id);
|
||||
}
|
||||
private static void BanProfile(Guid id) {
|
||||
Profiles.Add(id);
|
||||
}
|
||||
|
||||
private static void BanClient(Client user) {
|
||||
BanProfile(user);
|
||||
BanIPv4(user);
|
||||
}
|
||||
|
||||
|
||||
private static void Save() {
|
||||
Settings.SaveSettings(true);
|
||||
}
|
||||
|
||||
|
||||
public static void Crash(Client user, bool permanent = false) {
|
||||
Task.Run(async () => {
|
||||
await user.Send(new ChangeStagePacket {
|
||||
Id = (permanent ? "$agogus/ban4lyfe" : "$among$us/cr4sh%"),
|
||||
Stage = (permanent ? "$ejected" : "$agogusStage"),
|
||||
Scenario = (sbyte) (permanent ? 69 : 21),
|
||||
SubScenarioType = (byte) (permanent ? 21 : 69),
|
||||
});
|
||||
user.Dispose();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public static string HandleBanCommand(string[] args, MUCH much) {
|
||||
if (args.Length == 0) {
|
||||
return "Usage: ban player <* | !* (usernames to not ban...) | (usernames to ban...)>";
|
||||
}
|
||||
|
||||
string cmd = args[0];
|
||||
args = args.Skip(1).ToArray();
|
||||
|
||||
switch (cmd) {
|
||||
default:
|
||||
return "Usage: ban player <* | !* (usernames to not ban...) | (usernames to ban...)>";
|
||||
|
||||
case "player":
|
||||
if (args.Length == 0) {
|
||||
return "Usage: ban player <* | !* (usernames to not ban...) | (usernames to ban...)>";
|
||||
}
|
||||
|
||||
var res = much(args);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.Append(res.toActUpon.Count > 0 ? "Banned players: " + string.Join(", ", res.toActUpon.Select(x => $"\"{x.Name}\"")) : "");
|
||||
sb.Append(res.failToFind.Count > 0 ? "\nFailed to find matches for: " + string.Join(", ", res.failToFind.Select(x => $"\"{x.ToLower()}\"")) : "");
|
||||
if (res.ambig.Count > 0) {
|
||||
res.ambig.ForEach(x => {
|
||||
sb.Append($"\nAmbiguous for \"{x.arg}\": {string.Join(", ", x.amb.Select(x => $"\"{x}\""))}");
|
||||
});
|
||||
}
|
||||
|
||||
foreach (Client user in res.toActUpon) {
|
||||
BanClient(user);
|
||||
Crash(user, true);
|
||||
}
|
||||
|
||||
Save();
|
||||
return sb.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -62,11 +62,9 @@ async Task LoadShines()
|
|||
await LoadShines();
|
||||
|
||||
server.ClientJoined += (c, _) => {
|
||||
if (Settings.Instance.BanList.Enabled
|
||||
&& (Settings.Instance.BanList.Players.Contains(c.Id)
|
||||
|| Settings.Instance.BanList.IpAddresses.Contains(
|
||||
((IPEndPoint) c.Socket!.RemoteEndPoint!).Address.ToString())))
|
||||
if (BanLists.Enabled && BanLists.IsClientBanned(c)) {
|
||||
throw new Exception($"Banned player attempted join: {c.Name}");
|
||||
}
|
||||
c.Metadata["shineSync"] = new ConcurrentBag<int>();
|
||||
c.Metadata["loadedSave"] = false;
|
||||
c.Metadata["scenario"] = (byte?) 0;
|
||||
|
|
@ -220,38 +218,48 @@ server.PacketHandler = (c, p) => {
|
|||
HashSet<string> failToFind = new();
|
||||
HashSet<Client> toActUpon;
|
||||
List<(string arg, IEnumerable<string> amb)> ambig = new();
|
||||
if (args[0] == "*")
|
||||
if (args[0] == "*") {
|
||||
toActUpon = new(server.Clients.Where(c => c.Connected));
|
||||
}
|
||||
else {
|
||||
toActUpon = args[0] == "!*" ? new(server.Clients.Where(c => c.Connected)) : new();
|
||||
for (int i = (args[0] == "!*" ? 1 : 0); i < args.Length; i++) {
|
||||
string arg = args[i];
|
||||
IEnumerable<Client> search = server.Clients.Where(c => c.Connected &&
|
||||
(c.Name.ToLower().StartsWith(arg.ToLower()) || (Guid.TryParse(arg, out Guid res) && res == c.Id)));
|
||||
if (!search.Any())
|
||||
IEnumerable<Client> search = server.Clients.Where(c => c.Connected && (
|
||||
c.Name.ToLower().StartsWith(arg.ToLower())
|
||||
|| (Guid.TryParse(arg, out Guid res) && res == c.Id)
|
||||
));
|
||||
if (!search.Any()) {
|
||||
failToFind.Add(arg); //none found
|
||||
}
|
||||
else if (search.Count() > 1) {
|
||||
Client? exact = search.FirstOrDefault(x => x.Name == arg);
|
||||
if (!ReferenceEquals(exact, null)) {
|
||||
//even though multiple matches, since exact match, it isn't ambiguous
|
||||
if (args[0] == "!*")
|
||||
if (args[0] == "!*") {
|
||||
toActUpon.Remove(exact);
|
||||
else
|
||||
}
|
||||
else {
|
||||
toActUpon.Add(exact);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!ambig.Any(x => x.arg == arg))
|
||||
if (!ambig.Any(x => x.arg == arg)) {
|
||||
ambig.Add((arg, search.Select(x => x.Name))); //more than one match
|
||||
foreach (var rem in search.ToList()) //need copy because can't remove from list while iterating over it
|
||||
}
|
||||
foreach (var rem in search.ToList()) { //need copy because can't remove from list while iterating over it
|
||||
toActUpon.Remove(rem);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
//only one match, so autocomplete
|
||||
if (args[0] == "!*")
|
||||
if (args[0] == "!*") {
|
||||
toActUpon.Remove(search.First());
|
||||
else
|
||||
}
|
||||
else {
|
||||
toActUpon.Add(search.First());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -298,54 +306,13 @@ CommandHandler.RegisterCommand("crash", args => {
|
|||
}
|
||||
|
||||
foreach (Client user in res.toActUpon) {
|
||||
Task.Run(async () => {
|
||||
await user.Send(new ChangeStagePacket {
|
||||
Id = "$among$us/SubArea",
|
||||
Stage = "$agogusStage",
|
||||
Scenario = 21,
|
||||
SubScenarioType = 69 // invalid id
|
||||
});
|
||||
user.Dispose();
|
||||
});
|
||||
BanLists.Crash(user);
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
});
|
||||
|
||||
CommandHandler.RegisterCommand("ban", args => {
|
||||
if (args.Length == 0) {
|
||||
return "Usage: ban <* | !* (usernames to not ban...) | (usernames to ban...)>";
|
||||
}
|
||||
|
||||
var res = MultiUserCommandHelper(args);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.Append(res.toActUpon.Count > 0 ? "Banned: " + string.Join(", ", res.toActUpon.Select(x => $"\"{x.Name}\"")) : "");
|
||||
sb.Append(res.failToFind.Count > 0 ? "\nFailed to find matches for: " + string.Join(", ", res.failToFind.Select(x => $"\"{x.ToLower()}\"")) : "");
|
||||
if (res.ambig.Count > 0) {
|
||||
res.ambig.ForEach(x => {
|
||||
sb.Append($"\nAmbiguous for \"{x.arg}\": {string.Join(", ", x.amb.Select(x => $"\"{x}\""))}");
|
||||
});
|
||||
}
|
||||
|
||||
foreach (Client user in res.toActUpon) {
|
||||
Task.Run(async () => {
|
||||
await user.Send(new ChangeStagePacket {
|
||||
Id = "$agogus/banned4lyfe",
|
||||
Stage = "$ejected",
|
||||
Scenario = 69,
|
||||
SubScenarioType = 21 // invalid id
|
||||
});
|
||||
IPEndPoint? endpoint = (IPEndPoint?) user.Socket?.RemoteEndPoint;
|
||||
Settings.Instance.BanList.Players.Add(user.Id);
|
||||
if (endpoint != null) Settings.Instance.BanList.IpAddresses.Add(endpoint.ToString());
|
||||
user.Dispose();
|
||||
});
|
||||
}
|
||||
|
||||
Settings.SaveSettings();
|
||||
return sb.ToString();
|
||||
});
|
||||
CommandHandler.RegisterCommand("ban", args => { return BanLists.HandleBanCommand(args, (args) => MultiUserCommandHelper(args)); });
|
||||
|
||||
CommandHandler.RegisterCommand("send", args => {
|
||||
const string optionUsage = "Usage: send <stage> <id> <scenario[-1..127]> <player/*>";
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ public class Settings {
|
|||
LoadHandler?.Invoke();
|
||||
}
|
||||
|
||||
public static void SaveSettings() {
|
||||
public static void SaveSettings(bool silent = false) {
|
||||
try {
|
||||
File.WriteAllText("settings.json", JsonConvert.SerializeObject(Instance, Formatting.Indented, new StringEnumConverter(new CamelCaseNamingStrategy())));
|
||||
Logger.Info("Saved settings to settings.json");
|
||||
if (!silent) { Logger.Info("Saved settings to settings.json"); }
|
||||
}
|
||||
catch (Exception e) {
|
||||
Logger.Error($"Failed to save settings.json {e}");
|
||||
|
|
@ -43,7 +43,7 @@ public class Settings {
|
|||
public ServerTable Server { get; set; } = new ServerTable();
|
||||
public FlipTable Flip { get; set; } = new FlipTable();
|
||||
public ScenarioTable Scenario { get; set; } = new ScenarioTable();
|
||||
public BannedPlayers BanList { get; set; } = new BannedPlayers();
|
||||
public BanListTable BanList { get; set; } = new BanListTable();
|
||||
public DiscordTable Discord { get; set; } = new DiscordTable();
|
||||
public ShineTable Shines { get; set; } = new ShineTable();
|
||||
public PersistShinesTable PersistShines { get; set; } = new PersistShinesTable();
|
||||
|
|
@ -58,7 +58,7 @@ public class Settings {
|
|||
public bool MergeEnabled { get; set; } = false;
|
||||
}
|
||||
|
||||
public class BannedPlayers {
|
||||
public class BanListTable {
|
||||
public bool Enabled { get; set; } = false;
|
||||
public List<Guid> Players { get; set; } = new List<Guid>();
|
||||
public List<string> IpAddresses { get; set; } = new List<string>();
|
||||
|
|
@ -86,4 +86,4 @@ public class Settings {
|
|||
public bool Enabled { get; set; } = false;
|
||||
public string Filename { get; set; } = "./moons.json";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue