0404251638
## Summary - Adds proper Latin1 encoding support, replacing CP1252 usage throughout the codebase - Adds specialized, optimized string decoding methods with safe string filtering for each encoding type - Filters invalid Unicode characters (C0/C1 control codes, non-characters) by removal rather than replacement since the UO client renders nothing for these characters - Fixes UTF-16 null terminator position handling to correctly advance by 2 bytes ## Changes TextEncoding.cs - Added SearchValues-based invalid byte/char detection for efficient filtering - Added encoding-specific GetString methods: GetStringAscii, GetStringLatin1, GetStringUtf8, GetStringBigUni, GetStringLittleUni - Each method supports a safeString parameter for filtering invalid characters - Little-endian UTF-16 uses direct memory cast for zero-copy decoding on LE systems - Invalid characters are removed (not replaced with U+FFFD) since the client renders nothing for them SpanReader.cs - Added ReadLatin1() and ReadLatin1Safe() methods - Rewrote encoding-specific read methods to use optimized TextEncoding.GetString* methods - Fixed UTF-16 null terminator handling: position now correctly advances by byteLength (2) instead of 1 SpanWriter.cs - Added WriteLatin1 and WriteLatin1Null methods ## Packet Updates - Updated all packet code to use Latin1 encoding instead of CP1252 - Affected: account packets, equipment packets, menu packets, message packets, mobile packets, player packets, secure trade packets, vendor packets, gump packets, book packets, mahjong packets ## Filtering Behavior Invalid characters filtered in safe mode: ``` ┌───────────────┬────────────────────────┐ │ Range │ Description │ ├───────────────┼────────────────────────┤ │ 0x00-0x1F │ C0 control codes │ ├───────────────┼────────────────────────┤ │ 0x7F │ DEL │ ├───────────────┼────────────────────────┤ │ 0x80-0x9F │ C1 control codes │ ├───────────────┼────────────────────────┤ │ 0xFFFE-0xFFFF │ Unicode non-characters │ └───────────────┴────────────────────────┘ ``` Note: Surrogate pairs (0xD800-0xDFFF) are not filtered because proper validation requires context checking for paired vs unpaired surrogates. The UO client renders nothing for these anyway. ## Test Plan - All 631 Server.Tests pass - Verified client rendering behavior using TestUnicodeGump command (pages 1-5) - Confirmed U+FFFD, unpaired surrogates, and non-characters all render as blank in client - Verified Latin1 characters (0xA0-0xFF) display correctly - Verified C1 control codes (0x80-0x9F) are filtered and don't display
34 lines
1.5 KiB
C#
34 lines
1.5 KiB
C#
using Server.Misc;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Accounting;
|
|
|
|
public class AccountHandlerTests
|
|
{
|
|
[Theory]
|
|
[InlineData("", false)] // Empty username
|
|
[InlineData(" ", false)] // Single space
|
|
[InlineData(".", false)] // Single period
|
|
[InlineData("Invalid<Char", false)] // Contains forbidden character
|
|
[InlineData("EndsWithSpace ", false)] // Ends with space
|
|
[InlineData("EndsWithPeriod.", false)] // Ends with period
|
|
[InlineData(" StartsWithSpace", false)] // Starts with space
|
|
[InlineData("ValidUser123", true)] // Standard Username
|
|
[InlineData("Valid.User", true)] // Valid with period
|
|
[InlineData("ValidUser!@#", true)] // Contains valid special characters
|
|
public void IsValidUsername_ValidatesCorrectly(string username, bool expected)
|
|
{
|
|
Assert.Equal(expected, AccountHandler.IsValidUsername(username));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("", false)] // Empty password
|
|
[InlineData("ValidPass123!", true)] // Standard Password
|
|
[InlineData(" ", true)] // Single space
|
|
[InlineData("ValidPass!@#", true)] // Valid special characters
|
|
[InlineData("ValidPassWithLength1234567890", true)] // Long valid password
|
|
public void IsValidPassword_ValidatesCorrectly(string password, bool expected)
|
|
{
|
|
Assert.Equal(expected, AccountHandler.IsValidPassword(password));
|
|
}
|
|
}
|