SInPacket now tracks decryption/decompression failure.
Previously there was no way to tell if an incoming packet was incorrectly formatted. The new function SInPacket.isValid() can be called after decryption/decompression to determine if the packet wasn't decrypted and/or decompressed properly. * Added "valid" attribute to SInPacket. * Decryption routine unsets "valid" if buffer is not divisible by 16. * Decompression routine unsets "valid" on receiving zlib error code.
This commit is contained in:
parent
bcdf5b317c
commit
967378ae98
|
@ -154,10 +154,14 @@ class SInPacket
|
||||||
/// Returns the size in bytes of the packet.
|
/// Returns the size in bytes of the packet.
|
||||||
u32 getSize();
|
u32 getSize();
|
||||||
|
|
||||||
|
/// Returns true if the packet decompresses/decrypts successfully.
|
||||||
|
bool isValid();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
u32 pos;
|
u32 pos;
|
||||||
core::array<c8> buff;
|
core::array<c8> buff;
|
||||||
u16 playerid;
|
u16 playerid;
|
||||||
|
bool valid;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // Close Net Namespace
|
} // Close Net Namespace
|
||||||
|
|
|
@ -225,7 +225,7 @@ void SOutPacket::decryptPacket(const c8 key[16])
|
||||||
buff = tmpbuff;
|
buff = tmpbuff;
|
||||||
}
|
}
|
||||||
|
|
||||||
SInPacket::SInPacket(const c8* buff, const u32 size) : pos(0), playerid(0)
|
SInPacket::SInPacket(const c8* buff, const u32 size) : pos(0), playerid(0), valid(true)
|
||||||
{
|
{
|
||||||
SInPacket::buff.set_used(size);
|
SInPacket::buff.set_used(size);
|
||||||
memcpy(SInPacket::buff.pointer(), buff, size);
|
memcpy(SInPacket::buff.pointer(), buff, size);
|
||||||
|
@ -435,10 +435,19 @@ void SInPacket::deCompressPacket()
|
||||||
newBuff.set_used(newSize);
|
newBuff.set_used(newSize);
|
||||||
|
|
||||||
uLongf destLen = newSize;
|
uLongf destLen = newSize;
|
||||||
uncompress((Bytef*)newBuff.pointer(), &destLen, (Bytef*)buff.pointer() + 4, buff.size() - 4);
|
int ret = uncompress((Bytef*)newBuff.pointer(), &destLen, (Bytef*)buff.pointer() + 4, buff.size() - 4);
|
||||||
newBuff.set_used(destLen);
|
|
||||||
|
|
||||||
|
if (ret != Z_OK)
|
||||||
|
{
|
||||||
|
valid = false;
|
||||||
|
newBuff.set_used(0);
|
||||||
|
newBuff.clear();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newBuff.set_used(destLen);
|
||||||
buff = newBuff;
|
buff = newBuff;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SInPacket::encryptPacket(const c8 key[16])
|
void SInPacket::encryptPacket(const c8 key[16])
|
||||||
|
@ -457,6 +466,12 @@ void SInPacket::encryptPacket(const c8 key[16])
|
||||||
|
|
||||||
void SInPacket::decryptPacket(const c8 key[16])
|
void SInPacket::decryptPacket(const c8 key[16])
|
||||||
{
|
{
|
||||||
|
if (buff.size() % 16 != 0)
|
||||||
|
{
|
||||||
|
valid = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
CEncryption::SetEncryptionKey((u8*)&key[0]);
|
CEncryption::SetEncryptionKey((u8*)&key[0]);
|
||||||
const u32 newSize = buff.size();
|
const u32 newSize = buff.size();
|
||||||
core::array<c8> tmpbuff;
|
core::array<c8> tmpbuff;
|
||||||
|
@ -473,5 +488,10 @@ u32 SInPacket::getSize()
|
||||||
return buff.size();
|
return buff.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool SInPacket::isValid()
|
||||||
|
{
|
||||||
|
return valid;
|
||||||
|
}
|
||||||
|
|
||||||
} // Close Net Namespace
|
} // Close Net Namespace
|
||||||
} // Close Irr namespace
|
} // Close Irr namespace
|
||||||
|
|
Loading…
Reference in New Issue