Tiger
/
TigerEmu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed packet reading operations to never return null

main
Tiger 2023-10-20 21:02:11 +02:00
parent 77f3b6a983
commit b1c3bfd2b6
10 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Communication/Messages/Incoming/Catalog/GetCatalogIndexEvent.cs
View File

@ -26,11 +26,11 @@ public class GetCatalogIndexEvent : IMessageEvent
return;
}
var mode = request.ReadString() ?? "normal";
var mode = request.ReadString();
var categories =
_catalogueManager.Pages.Values.Where(
p => p.Parent is null && p.Modes.Contains(mode) && p.MinRank <= gameSession.Habbo.Rank);
p => p.Parent is null && p.Modes.Contains(mode.ToLower()) && p.MinRank <= gameSession.Habbo.Rank);
await gameSession.SendComposerAsync(new CatalogPagesListComposer(categories, mode));
}

8
Communication/Messages/Incoming/Catalog/GetCatalogPageEvent.cs
View File

@ -26,12 +26,12 @@ public class GetCatalogPageEvent : IMessageEvent
return;
}
var pageId = request.ReadInt32() ?? -1;
var offerId = request.ReadInt32() ?? 0;
var mode = request.ReadString() ?? "normal";
var pageId = request.ReadInt32();
var offerId = request.ReadInt32();
var mode = request.ReadString();
if (!_catalogueManager.Pages.TryGetValue(pageId, out var page) || !page.Enabled ||
page.MinRank > gameSession.Habbo.Rank || !page.Modes.Contains(mode))
page.MinRank > gameSession.Habbo.Rank || !page.Modes.Contains(mode.ToLower()))
{
return;
}

10
Communication/Messages/Incoming/Handshake/SsoTicketMessageEvent.cs
View File

@ -32,15 +32,7 @@ public class SsoTicketMessageEvent : IMessageEvent
public async Task HandleAsync(GameSession gameSession, ClientMessage request)
{
var sso = request.ReadString();
if (sso == null)
{
await _gameSessionManager.CloseAsync("Malformed packet", gameSession);
return;
}
var habbo = await _habboRepository.FindOneByAsync(h => h.SsoTicket == sso);
var habbo = await _habboRepository.FindOneByAsync(h => h.SsoTicket == request.ReadString());
if (habbo == null)
{

4
Communication/Messages/Incoming/Inventory/Badges/SetActivatedBadgesEvent.cs
View File

@ -42,13 +42,13 @@ public class SetActivatedBadgesEvent : IMessageEvent
var slotId = request.ReadInt32();
var code = request.ReadString();
if (slotId == null || slotId is < 1 or > 5 || string.IsNullOrEmpty(code)) continue;
if (slotId is < 1 or > 5 || string.IsNullOrEmpty(code)) continue;
var badge = gameSession.Habbo.Badges.FirstOrDefault(b => b.Code == code);
if (badge == null) continue;
badge.Slot = slotId.Value;
badge.Slot = slotId;
wearingBadges.Add(badge);
badgesToUpdate.TryAdd(badge.Id, badge);

8
Communication/Messages/Incoming/Navigator/NavigatorSearchEvent.cs
View File

@ -25,13 +25,9 @@ public class NavigatorSearchEvent : IMessageEvent
await _gameSessionManager.CloseAsync("Not logged in", gameSession);
return;
}
var viewName = request.ReadString();
var query = request.ReadString();
if (viewName is null || query is null ||
!_navigatorManager.NavigatorViews.TryGetValue(viewName, out var navigatorView)) return;
if (!_navigatorManager.NavigatorViews.TryGetValue(request.ReadString(), out var navigatorView)) return;
await gameSession.SendComposerAsync(new NavigatorSearchComposer(navigatorView, query, gameSession.Habbo));
await gameSession.SendComposerAsync(new NavigatorSearchComposer(navigatorView, request.ReadString(), gameSession.Habbo));
}
}

4
Communication/Messages/Incoming/User/Data/UserCurrentBadgesEvent.cs
View File

@ -29,9 +29,7 @@ public class UserCurrentBadgesEvent : IMessageEvent
var habboId = request.ReadInt32();
if (habboId == null) return;
var badges = await _badgeRepository.FindByAsync(b => b.Habbo.Id == habboId && b.Slot > 0);
await gameSession.SendComposerAsync(new UserCurrentBadgesComposer(habboId.Value, badges.ToList()));
await gameSession.SendComposerAsync(new UserCurrentBadgesComposer(habboId, badges.ToList()));
}
}

4
Communication/Messages/Incoming/User/Data/UserFigureEvent.cs
View File

@ -33,10 +33,10 @@ public class UserFigureEvent : IMessageEvent
return;
}
var gender = request.ReadString()?.ToUpper();
var gender = request.ReadString().ToUpper();
var figure = request.ReadString();
if (figure is null || (gender != "M" && gender != "F") || (figure == gameSession.Habbo.Figure && gender == gameSession.Habbo.Gender.ToUpper()) /*||
if ((gender != "M" && gender != "F") || (figure == gameSession.Habbo.Figure && gender == gameSession.Habbo.Gender.ToUpper()) /*||
!_figureDataManager.ValidateFigure(figure, gender, gameSession.Habbo)*/)
{
return;

16
Communication/Messages/Incoming/User/Data/UserProfileEvent.cs
View File

@ -21,21 +21,9 @@ public class UserProfileEvent : IMessageEvent
public IncomingHeaders Header => IncomingHeaders.UserProfile;
public async Task HandleAsync(GameSession gameSession, ClientMessage request)
{
var habboId = request.ReadInt32();
if (habboId == null)
{
await _gameSessionManager.CloseAsync("Malformed packet", gameSession);
return;
}
var habbo = await _habboRepository.FindAsync(request.ReadInt32());
var habbo = await _habboRepository.FindAsync(habboId);
if (habbo == null)
{
await _gameSessionManager.CloseAsync("Habbo not found", gameSession);
return;
}
if (habbo == null) return;
await gameSession.SendComposerAsync(new UserProfileComposer(habbo));
}

8
Communication/Messages/MessageHandler.cs
View File

@ -27,20 +27,20 @@ public class MessageHandler : IMessageHandler
public async Task TryHandleAsync(GameSession session, ClientMessage request)
{
if (request.Header == null)
if (request.Header == -1)
{
return;
}
if (_messageEvents.TryGetValue(request.Header.Value, out var messageEvent))
if (_messageEvents.TryGetValue(request.Header, out var messageEvent))
{
_logger.LogInformation("Handling header ID {Header} on class {Class}", request.Header.Value, messageEvent.GetType());
_logger.LogInformation("Handling header ID {Header} on class {Class}", request.Header, messageEvent.GetType());
await messageEvent.HandleAsync(session, request);
}
else
{
_logger.LogWarning("Unregistered header {Header} {Name}", request.Header.Value, _messageNames.TryGetValue(request.Header.Value, out var messageName) ? messageName : string.Empty);
_logger.LogWarning("Unregistered header {Header} {Name}", request.Header, _messageNames.TryGetValue(request.Header, out var messageName) ? messageName : string.Empty);
}
}
}

22
Communication/Messages/Types/ClientMessage.cs
View File

@ -8,7 +8,7 @@ public class ClientMessage
private readonly byte[] _packet;
private int _readerIndex;
public short? Header { get; }
public short Header { get; }
public ClientMessage(byte[] packet)
{
@ -17,42 +17,42 @@ public class ClientMessage
Header = ReadInt16();
}
public short? ReadInt16()
public short ReadInt16()
{
var raw = ReadBytes(2);
if (raw.Length != 2) return null;
if (raw.Length != 2) return -1;
return ByteUtils.GetInt16(raw);
}
public int? ReadInt32()
public int ReadInt32()
{
var raw = ReadBytes(4);
if (raw.Length != 4) return null;
if (raw.Length != 4) return -1;
return ByteUtils.GetInt32(raw);
}
public bool? ReadBoolean()
public bool ReadBoolean()
{
if (_packet.Length - _readerIndex == 0) return null;
if (_packet.Length - _readerIndex == 0) return false;
var result = _packet[_readerIndex];
_readerIndex++;
return result == 1;
}
public string? ReadString()
public string ReadString()
{
var strlen = ReadInt16();
if (strlen == null) return null;
if (strlen == -1) return string.Empty;
var raw = ReadBytes(strlen.Value);
var raw = ReadBytes(strlen);
return raw.Length != strlen ? null : Encoding.UTF8.GetString(raw);
return raw.Length != strlen ? string.Empty : Encoding.UTF8.GetString(raw);
}
private byte[] ReadBytes(int amount)