Skip to content

Commit

Permalink
Add 1200 byte padding to all requests
Browse files Browse the repository at this point in the history
  • Loading branch information
xPaw committed Nov 19, 2020
1 parent 4f88fb0 commit 7231921
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 5 deletions.
1 change: 1 addition & 0 deletions SourceQuery/BaseSocket.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public function __destruct( )
abstract public function Close( ) : void;
abstract public function Open( string $Address, int $Port, int $Timeout, int $Engine ) : void;
abstract public function Write( int $Header, string $String = '' ) : bool;
abstract public function WritePadded( int $Header, string $String = '' ) : bool;
abstract public function Read( int $Length = 1400 ) : Buffer;

protected function ReadInternal( Buffer $Buffer, int $Length, callable $SherlockFunction ) : Buffer
Expand Down
20 changes: 20 additions & 0 deletions SourceQuery/Socket.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,26 @@ public function Write( int $Header, string $String = '' ) : bool
return $Length === FWrite( $this->Socket, $Command, $Length );
}

/**
* Write a request packge to the socket. Pads it up to 1200 bytes to prevent reflective DoS.
*
* @see https://steamcommunity.com/discussions/forum/14/2989789048633291344/
* @return bool Whether fwrite succeeded.
*/
public function WritePadded( int $Header, string $String = '' ) : bool
{
$Command = pack( 'ccccca*', 0xFF, 0xFF, 0xFF, 0xFF, $Header, $String );
$Length = strlen( $Command );

if( $Length < 1200 )
{
$Command .= str_repeat( "\0", 1200 - $Length );
$Length = 1200;
}

return $Length === fwrite( $this->Socket, $Command, $Length );
}

/**
* Reads from socket and returns Buffer.
*
Expand Down
13 changes: 8 additions & 5 deletions SourceQuery/SourceQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public function GetInfo( ) : array
throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
}

$this->Socket->Write( self::A2S_INFO, "Source Engine Query\0" );
$this->Socket->WritePadded( self::A2S_INFO, "Source Engine Query\0" );
$Buffer = $this->Socket->Read( );

$Type = $Buffer->GetByte( );
Expand Down Expand Up @@ -365,7 +365,7 @@ public function GetPlayers( ) : array

$this->GetChallenge( self::A2S_PLAYER, self::S2A_PLAYER );

$this->Socket->Write( self::A2S_PLAYER, $this->Challenge );
$this->Socket->WritePadded( self::A2S_PLAYER, $this->Challenge );
$Buffer = $this->Socket->Read( 14000 ); // Moronic Arma 3 developers do not split their packets, so we have to read more data
// This violates the protocol spec, and they probably should fix it: https://developer.valvesoftware.com/wiki/Server_queries#Protocol

Expand Down Expand Up @@ -411,7 +411,7 @@ public function GetRules( ) : array

$this->GetChallenge( self::A2S_RULES, self::S2A_RULES );

$this->Socket->Write( self::A2S_RULES, $this->Challenge );
$this->Socket->WritePadded( self::A2S_RULES, $this->Challenge );
$Buffer = $this->Socket->Read( );

$Type = $Buffer->GetByte( );
Expand Down Expand Up @@ -452,10 +452,13 @@ private function GetChallenge( int $Header, int $ExpectedResult ) : void

if( $this->UseOldGetChallengeMethod )
{
$Header = self::A2S_SERVERQUERY_GETCHALLENGE;
$this->Socket->Write( self::A2S_SERVERQUERY_GETCHALLENGE, "\xFF\xFF\xFF\xFF" );
}
else
{
$this->Socket->WritePadded( $Header, "\xFF\xFF\xFF\xFF" );
}

$this->Socket->Write( $Header, "\xFF\xFF\xFF\xFF" );
$Buffer = $this->Socket->Read( );

$Type = $Buffer->GetByte( );
Expand Down
5 changes: 5 additions & 0 deletions Tests/Tests.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ public function Write( int $Header, string $String = '' ) : bool
return true;
}

public function WritePadded( int $Header, string $String = '' ) : bool
{
return true;
}

public function Read( int $Length = 1400 ) : Buffer
{
$Buffer = new Buffer( );
Expand Down

0 comments on commit 7231921

Please sign in to comment.