* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand. * WIP - Rewriting packets. * Cleanup and updates README * Converts more packets * Fixes header * Converts Effects packets. * Forgot the send command * Adds the start of containers packets. * Adds message packets with caching * Extends the send methods * Starts to add Acquire methods * Converted the packets * Cleanup * Cleanup * Adds more packets * Adds more packets * Fixes clearing arrays from pool. Adds Mobile Incoming * Converts more packets. * Moves more packets * Moves more packets * Test compression * Merges * Migrating to an idiomatic syntax that also supports compression, and proxying. * Optimize the stack alloc. Changes attributes * Converted container packets * Visual Studio doesn't auto save files. I am still getting used to subpar IDEs. * Adds static packet caching. Will profile later. Converts more packets * Fixes packets and changes how compression is configured * WIP - Adds basics for Gumps. Not finished though. * Fix file * Fixes formatting * Changed SpanWriter to be more idiomatic. * Fixes Span vs RawSpan and missing stackallocs * Converts over some more gumps * WIP - Deletes 32bit support. * Drops RDRand32 support. * Fixes gump compilation * Converting gump components * Removes old huffman compression function * Revert signature for backwards compatibility * WIP - Converting more gump components * Creates ArraySet for the strings. Updates AppendTo to reference that. * Converts the maining gump components * Cleans up gump components * Cleans up directives * Cleans up ArraySet and moves it. Adds null-coalescing-assignment * Cleanup, Target Packets, and C# 8 changes. * Removed OPL Packet * World packets * Fixing packet uses * Cleans up code. Fixes packet uses in various places. * More cleanup for packets * Code cleanup * Converts more packet uses and cleans up more code * More code cleanup * Finishes fixing the packets in Item * Updates secure trade packets * Updates core and gets it to compile. * Moved packets to scripts. Fixed account handler use of packets * Code cleanup * Updates chat packets * Code cleanuo * Adds party packets, but need to implement them. * Party packets WIP * Finishes party packets * Rearrange movement namespaces and classes * Finishes plant packets * Code Formatting * Fixes moving effects * Code cleanup, eliminates equipinfo * Adds more packets. Fixes bugs with various packets. * Finishes mahjon packets * Fixes mahjong packet * Code cleanup * Finishes mahjong packets * Adds Map packets * Add multifacet maps and charts * Cleans up some packets with UTF8 * Optimizes packets * Cleans up more packets. Moves the MessageHelper * Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets. * Updates protocol extensions packet receiver * Fixes a few bugs. Fixes a few more packets. * Code cleanup and fixing more packets * Fixes packet effects * Cleaned up more code * Buff Icon cleanup * Removed unused constructors * Code Cleanup. Adds BoatHS Packets * Moves house files. Updates house foundation packets. * Deployment cleanup * Fixes: * Code cleanup * More code cleanup * More code cleanup * Cleaned up BaseHouse * Enforces styling * Converts foreach to linq where possible. * Dont need that * Goals/Readme updates * Removes 32bit support at the highest level. Turns on HRT by default. * Code cleanup. Fixes extended features packet. * Fixes various bugs * Code cleanup * Code cleanup * Code cleanup. Fixes gump X/Y assignment. * Code cleanup using |= operator * More code cleanup * Cleanup * Fixes spacing issues. Thanks Visual Studio. You suck. * Compiler error * Fixes NPE from RunUO 2.7 * Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README * Fixes more packets. Stupid trailing nulls. * Fixes various bugs. * Fixes for gumps * Fixes more gump stuff. Going to split it out later since it is getting insane * Recoded the gump writing * WIP * *Added output path of scripts project to dev branch *Activated debugging in code
272 lines
6.8 KiB
C#
272 lines
6.8 KiB
C#
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Net;
|
|
|
|
namespace Server
|
|
{
|
|
public class Firewall
|
|
{
|
|
static Firewall()
|
|
{
|
|
List = new List<IFirewallEntry>();
|
|
|
|
string path = "firewall.cfg";
|
|
|
|
if (File.Exists(path))
|
|
{
|
|
using StreamReader ip = new StreamReader(path);
|
|
string line;
|
|
|
|
while ((line = ip.ReadLine()) != null)
|
|
{
|
|
line = line.Trim();
|
|
|
|
if (line.Length == 0)
|
|
continue;
|
|
|
|
List.Add(ToFirewallEntry(line));
|
|
|
|
/*
|
|
object toAdd;
|
|
|
|
IPAddress addr;
|
|
if ( IPAddress.TryParse( line, out addr ) )
|
|
toAdd = addr;
|
|
else
|
|
toAdd = line;
|
|
|
|
m_Blocked.Add( toAdd.ToString() );
|
|
* */
|
|
}
|
|
}
|
|
}
|
|
|
|
public static List<IFirewallEntry> List{ get; }
|
|
|
|
public static IFirewallEntry ToFirewallEntry(object entry)
|
|
{
|
|
if (entry is IFirewallEntry firewallEntry)
|
|
return firewallEntry;
|
|
if (entry is IPAddress address)
|
|
return new IPFirewallEntry(address);
|
|
if (entry is string s)
|
|
return ToFirewallEntry(s);
|
|
|
|
return null;
|
|
}
|
|
|
|
public static IFirewallEntry ToFirewallEntry(string entry)
|
|
{
|
|
if (IPAddress.TryParse(entry, out IPAddress addr))
|
|
return new IPFirewallEntry(addr);
|
|
|
|
//Try CIDR parse
|
|
string[] str = entry.Split('/');
|
|
|
|
if (str.Length == 2)
|
|
if (IPAddress.TryParse(str[0], out IPAddress cidrPrefix))
|
|
if (int.TryParse(str[1], out int cidrLength))
|
|
return new CIDRFirewallEntry(cidrPrefix, cidrLength);
|
|
|
|
return new WildcardIPFirewallEntry(entry);
|
|
}
|
|
|
|
public static void RemoveAt(int index)
|
|
{
|
|
List.RemoveAt(index);
|
|
Save();
|
|
}
|
|
|
|
public static void Remove(object obj)
|
|
{
|
|
IFirewallEntry entry = ToFirewallEntry(obj);
|
|
|
|
if (entry != null)
|
|
{
|
|
List.Remove(entry);
|
|
Save();
|
|
}
|
|
}
|
|
|
|
public static void Add(object obj)
|
|
{
|
|
if (obj is IPAddress address)
|
|
Add(address);
|
|
else if (obj is string s)
|
|
Add(s);
|
|
else if (obj is IFirewallEntry entry)
|
|
Add(entry);
|
|
}
|
|
|
|
public static void Add(IFirewallEntry entry)
|
|
{
|
|
if (!List.Contains(entry))
|
|
List.Add(entry);
|
|
|
|
Save();
|
|
}
|
|
|
|
public static void Add(string pattern)
|
|
{
|
|
IFirewallEntry entry = ToFirewallEntry(pattern);
|
|
|
|
if (!List.Contains(entry))
|
|
List.Add(entry);
|
|
|
|
Save();
|
|
}
|
|
|
|
public static void Add(IPAddress ip)
|
|
{
|
|
IFirewallEntry entry = new IPFirewallEntry(ip);
|
|
|
|
if (!List.Contains(entry))
|
|
List.Add(entry);
|
|
|
|
Save();
|
|
}
|
|
|
|
public static void Save()
|
|
{
|
|
string path = "firewall.cfg";
|
|
|
|
using StreamWriter op = new StreamWriter(path);
|
|
for (int i = 0; i < List.Count; ++i)
|
|
op.WriteLine(List[i]);
|
|
}
|
|
|
|
public static bool IsBlocked(IPAddress ip)
|
|
{
|
|
for (int i = 0; i < List.Count; i++)
|
|
if (List[i].IsBlocked(ip))
|
|
return true;
|
|
|
|
return false;
|
|
/*
|
|
bool contains = false;
|
|
|
|
for ( int i = 0; !contains && i < m_Blocked.Count; ++i )
|
|
{
|
|
if ( m_Blocked[i] is IPAddress )
|
|
contains = ip.Equals( m_Blocked[i] );
|
|
else if ( m_Blocked[i] is String )
|
|
{
|
|
string s = (string)m_Blocked[i];
|
|
|
|
contains = Utility.IPMatchCIDR( s, ip );
|
|
|
|
if ( !contains )
|
|
contains = Utility.IPMatch( s, ip );
|
|
}
|
|
}
|
|
|
|
return contains;
|
|
* */
|
|
}
|
|
|
|
#region Firewall Entries
|
|
|
|
public interface IFirewallEntry
|
|
{
|
|
bool IsBlocked(IPAddress address);
|
|
}
|
|
|
|
public class IPFirewallEntry : IFirewallEntry
|
|
{
|
|
private IPAddress m_Address;
|
|
|
|
public IPFirewallEntry(IPAddress address) => m_Address = address;
|
|
|
|
public bool IsBlocked(IPAddress address) => m_Address.Equals(address);
|
|
|
|
public override string ToString() => m_Address.ToString();
|
|
|
|
public override bool Equals(object obj)
|
|
{
|
|
if (obj is IPAddress)
|
|
return obj.Equals(m_Address);
|
|
if (obj is string s)
|
|
{
|
|
if (IPAddress.TryParse(s, out IPAddress otherAddress))
|
|
return otherAddress.Equals(m_Address);
|
|
}
|
|
else if (obj is IPFirewallEntry entry)
|
|
return m_Address.Equals(entry.m_Address);
|
|
|
|
return false;
|
|
}
|
|
|
|
public override int GetHashCode() => m_Address.GetHashCode();
|
|
}
|
|
|
|
public class CIDRFirewallEntry : IFirewallEntry
|
|
{
|
|
private int m_CIDRLength;
|
|
private IPAddress m_CIDRPrefix;
|
|
|
|
public CIDRFirewallEntry(IPAddress cidrPrefix, int cidrLength)
|
|
{
|
|
m_CIDRPrefix = cidrPrefix;
|
|
m_CIDRLength = cidrLength;
|
|
}
|
|
|
|
public bool IsBlocked(IPAddress address) => Utility.IPMatchCIDR(m_CIDRPrefix, address, m_CIDRLength);
|
|
|
|
public override string ToString() => $"{m_CIDRPrefix}/{m_CIDRLength}";
|
|
|
|
public override bool Equals(object obj)
|
|
{
|
|
if (obj is string entry)
|
|
{
|
|
string[] str = entry.Split('/');
|
|
|
|
if (str.Length == 2)
|
|
if (IPAddress.TryParse(str[0], out IPAddress cidrPrefix))
|
|
if (int.TryParse(str[1], out int cidrLength))
|
|
return m_CIDRPrefix.Equals(cidrPrefix) && m_CIDRLength.Equals(cidrLength);
|
|
}
|
|
else if (obj is CIDRFirewallEntry cidrEntry)
|
|
{
|
|
return m_CIDRPrefix.Equals(cidrEntry.m_CIDRPrefix) && m_CIDRLength.Equals(cidrEntry.m_CIDRLength);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public override int GetHashCode() => m_CIDRPrefix.GetHashCode() ^ m_CIDRLength.GetHashCode();
|
|
}
|
|
|
|
public class WildcardIPFirewallEntry : IFirewallEntry
|
|
{
|
|
private string m_Entry;
|
|
|
|
private bool m_Valid;
|
|
|
|
public WildcardIPFirewallEntry(string entry) => m_Entry = entry;
|
|
|
|
bool IFirewallEntry.IsBlocked(IPAddress address)
|
|
{
|
|
if (!m_Valid)
|
|
return false; //Why process if it's invalid? it'll return false anyway after processing it.
|
|
|
|
bool matched = Utility.IPMatch(m_Entry, address, out bool valid);
|
|
m_Valid = valid;
|
|
return matched;
|
|
}
|
|
|
|
public override string ToString() => m_Entry;
|
|
|
|
public override bool Equals(object obj)
|
|
{
|
|
if (obj is string)
|
|
return obj.Equals(m_Entry);
|
|
|
|
return obj is WildcardIPFirewallEntry entry && m_Entry.Equals(entry.m_Entry);
|
|
}
|
|
|
|
public override int GetHashCode() => m_Entry.GetHashCode();
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
}
|