themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed exploit allowing client to send client info packet more than once.

Browse source 
Fixed exploit allowing client to send tile square.
This commit is contained in:
high 2011-06-06 21:00:32 -04:00
parent cfc05e1663
commit 9dee779a27
2 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/TSPlayer.cs
View file

@ -10,6 +10,7 @@ namespace TShockAPI
public bool syncHP; public bool syncHP;
public bool syncMP; public bool syncMP;
public Group group; public Group group;
public bool receivedInfo;
private int player; private int player;
public TSPlayer(int ply) public TSPlayer(int ply)

39
TShockAPI/TShock.cs
View file

@ -199,7 +199,42 @@ namespace TShockAPI
private void GetData(GetDataEventArgs e) private void GetData(GetDataEventArgs e)
{ {
if (e.MsgID == 17) if (e.MsgID == 4)
{
if (players[e.Msg.whoAmI] == null)
{
Tools.Kick(e.Msg.whoAmI, "Player doesn't exist");
e.Handled = true;
}
else if (players[e.Msg.whoAmI].receivedInfo)
{
Tools.Kick(e.Msg.whoAmI, "Sent client info more than once");
e.Handled = true;
}
else
{
players[e.Msg.whoAmI].receivedInfo = true;
}
}
else if (e.MsgID == 0x14)
{
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
{
short size = br.ReadInt16();
int x = br.ReadInt32();
int y = br.ReadInt32();
int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16);
int plyY = Math.Abs((int)Main.player[e.Msg.whoAmI].position.Y / 16);
int tileX = Math.Abs(x);
int tileY = Math.Abs(y);
if (size > 5 || Math.Abs(plyX - tileX) > 10 || Math.Abs(plyY - tileY) > 10)
{
Ban(e.Msg.whoAmI, "Send Tile Square Abuse");
e.Handled = true;
}
}
}
else if (e.MsgID == 17)
{ {
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length))) using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
{ {
@ -586,8 +621,6 @@ namespace TShockAPI
{ {
Tools.Kick(ply, "Not on whitelist."); Tools.Kick(ply, "Not on whitelist.");
} }
players[ply] = new TSPlayer(ply);
players[ply].group = Tools.GetGroupForIP(ip);
} }
private void OnLoadContent(ContentManager obj) private void OnLoadContent(ContentManager obj)