PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 07:24:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix LoginMessage and ConnectToWorldReqMsg token

Browse source 
The decoding was wrong. ASCII was the wrong choice. We needed a cstring
and to add padding instead of assuming a fixed size.

Fixes and closes #2
This commit is contained in:
Chord 2016-05-19 03:11:15 -04:00
parent f1fae83548
commit 5ed40e73b3
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/src/main/scala/net/psforever/packet/game/ConnectToWorldRequestMessage.scala
View file

@ -8,6 +8,7 @@ import scodec.codecs._
// NOTE: this packet has a ton of bytes left over at the end and is usually all zeros // NOTE: this packet has a ton of bytes left over at the end and is usually all zeros
// except for the server name and a 0x80 near the end // except for the server name and a 0x80 near the end
final case class ConnectToWorldRequestMessage(server : String, final case class ConnectToWorldRequestMessage(server : String,
token : String,
majorVersion : Long, majorVersion : Long,
minorVersion : Long, minorVersion : Long,
revision : Long, revision : Long,
@ -21,7 +22,7 @@ final case class ConnectToWorldRequestMessage(server : String,
object ConnectToWorldRequestMessage extends Marshallable[ConnectToWorldRequestMessage] { object ConnectToWorldRequestMessage extends Marshallable[ConnectToWorldRequestMessage] {
implicit val codec : Codec[ConnectToWorldRequestMessage] = ( implicit val codec : Codec[ConnectToWorldRequestMessage] = (
("server_name" | PacketHelpers.encodedString) :: ("server_name" | PacketHelpers.encodedString) ::
("unknown" | ignore(32*8)) :: ("token" | paddedFixedSizeBytes(32, cstring, ignore(8))) :: // must be an ignore 8 as the memory might not be 0x00
("major_version" | uint32L) :: ("major_version" | uint32L) ::
("minor_version" | uint32L) :: ("minor_version" | uint32L) ::
("revision" | uint32L) :: ("revision" | uint32L) ::

2
common/src/main/scala/net/psforever/packet/game/LoginMessage.scala
View file

@ -25,7 +25,7 @@ final case class LoginMessage(majorVersion : Long,
object LoginMessage extends Marshallable[LoginMessage] { object LoginMessage extends Marshallable[LoginMessage] {
private def username = PacketHelpers.encodedStringAligned(7) private def username = PacketHelpers.encodedStringAligned(7)
private def password = PacketHelpers.encodedString private def password = PacketHelpers.encodedString
private def tokenPath = fixedSizeBytes(32, ascii) :: username private def tokenPath = paddedFixedSizeBytes(32, cstring, ignore(8)) :: username
private def passwordPath = username :: password private def passwordPath = username :: password
type Struct = String :: Option[String] :: Option[String] :: HNil type Struct = String :: Option[String] :: Option[String] :: HNil

5
common/src/test/scala/GamePacketTest.scala
View file

@ -15,8 +15,9 @@ class GamePacketTest extends Specification {
"decode" in { "decode" in {
PacketCoding.DecodePacket(string).require match { PacketCoding.DecodePacket(string).require match {
case ConnectToWorldRequestMessage(serverName, majorVersion, minorVersion, revision, buildDate, unk) => case ConnectToWorldRequestMessage(serverName, token, majorVersion, minorVersion, revision, buildDate, unk) =>
serverName mustEqual "gemini" serverName mustEqual "gemini"
token mustEqual ""
majorVersion mustEqual 0 majorVersion mustEqual 0
minorVersion mustEqual 0 minorVersion mustEqual 0
revision mustEqual 0 revision mustEqual 0
@ -28,7 +29,7 @@ class GamePacketTest extends Specification {
} }
"encode" in { "encode" in {
val msg = ConnectToWorldRequestMessage("gemini", 0, 0, 0, "", 0) val msg = ConnectToWorldRequestMessage("gemini", "", 0, 0, 0, "", 0)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string pkt mustEqual string