Cookie data

src/protocol/OfflineMessage.php

@@ -46,4 +46,4 @@ protected function writeMagic(BinaryStream $out){
 	public function isValid() : bool{
 		return $this->magic === self::MAGIC;
 	}
-}
+}

src/protocol/OpenConnectionReply1.php

@@ -23,13 +23,12 @@ class OpenConnectionReply1 extends OfflineMessage{
 
 	public int $serverID;
 	public bool $serverSecurity;
-	public ?int $cookie;
+	public ?int $cookie = null;
 	public int $mtuSize;
 
 	public static function create(int $serverId, ?int $cookie, int $mtuSize) : self{
 		$result = new self;
 		$result->serverID = $serverId;
-		$result->serverSecurity = $cookie !== null;
 		$result->cookie = $cookie;
 		$result->mtuSize = $mtuSize;
 		return $result;
@@ -38,8 +37,8 @@ public static function create(int $serverId, ?int $cookie, int $mtuSize) : self{
 	protected function encodePayload(PacketSerializer $out) : void{
 		$this->writeMagic($out);
 		$out->putLong($this->serverID);
-		$out->putByte($this->serverSecurity ? 1 : 0);
-		if ($this->serverSecurity && $this->cookie !== null) {
+		$out->putByte($this->cookie !== null ? 1 : 0);
+		if ($this->cookie !== null) {
 			$out->putInt($this->cookie);
 		}
 		$out->putShort($this->mtuSize);

src/server/Server.php

@@ -27,7 +27,7 @@
 use raklib\protocol\NACK;
 use raklib\protocol\Packet;
 use raklib\protocol\PacketSerializer;
-use raklib\utils\Cookie;
+use raklib\utils\CookieCache;
 use raklib\utils\ExceptionTraceCleaner;
 use raklib\utils\InternetAddress;
 use function asort;
@@ -78,7 +78,7 @@ class Server implements ServerInterface{
 
 	protected int $nextSessionId = 0;
 
-	public ?Cookie $cookie = null;
+	public ?CookieCache $cookie = null;
 
 	/**
 	 * @phpstan-param positive-int $recvMaxSplitParts
@@ -104,7 +104,7 @@ public function __construct(
 		$this->unconnectedMessageHandler = new UnconnectedMessageHandler($this, $protocolAcceptor);
 
 		// If you don't want to use security on the server, just delete this line.
-		$this->cookie = new Cookie();
+		$this->cookie = new CookieCache();
 	}
 
 	public function getPort() : int{
@@ -119,7 +119,7 @@ public function getLogger() : \Logger{
 		return $this->logger;
 	}
 
-	public function getCookie() : ?Cookie {
+	public function getCookie() : ?CookieCache {
 		return $this->cookie;
 	}
 

src/server/UnconnectedMessageHandler.php

@@ -30,7 +30,7 @@
 use raklib\protocol\UnconnectedPingOpenConnections;
 use raklib\protocol\UnconnectedPong;
 use raklib\utils\InternetAddress;
-use raklib\utils\Cookie;
+use raklib\utils\CookieCache;
 use function get_class;
 use function min;
 use function ord;
@@ -83,9 +83,8 @@
 				$this->server->getLogger()->notice("Refused connection from $address due to incompatible RakNet protocol version (version $packet->protocol)");
 			}else{
 				$cookie = null;
-				if ($this->server->getCookie() instanceof Cookie) {
-					$this->server->getCookie()->add($address);
-					$cookie = $this->server->getCookie()->get($address);
+				if ($this->server->getCookie() instanceof CookieCache) {
+					$cookie = $this->server->getCookie()->add($address);
 				}
 				//IP header size (20 bytes) + UDP header size (8 bytes)
 				$this->server->sendPacket(OpenConnectionReply1::create($this->server->getID(), $cookie, $packet->mtuSize + 28), $address);
@@ -104,8 +103,8 @@
 					$this->server->getLogger()->debug("Not creating session for $address due to session already opened");
 					return true;
 				}
-				if ($this->server->getCookie() instanceof Cookie) { // womp womp
+				if ($this->server->getCookie() instanceof CookieCache) { // womp womp
 					if (!$this->server->getCookie()->check($address, $packet->cookie)) {
 						// Disconnect if OpenConnectionReply1 and the cookie in the OpenConnectionRequest2 packet do not match
 						$this->server->getLogger()->debug("Not creating session for $address due to session mismatched cookies");
 						return true;

src/utils/Cookie.php

@@ -21,20 +21,13 @@
 use function random_int;
 use function crc32;
 
-final class Cookie{
+final class CookieCache{
 
 	/**
 	 * @var array<string, int> $cookies
 	 */
 	private array $cookies = [];
 
-	public function get(InternetAddress $address) : ?int{
-		if (isset($this->cookies[$address->toString()])) {
-			return $this->cookies[$address->toString()];
-		}
-		return null;
-	}
-
 	public function check(InternetAddress $address, int $cookie) : bool{
 		$addressStr = $address->toString();
 
@@ -48,13 +41,13 @@ public function check(InternetAddress $address, int $cookie) : bool{
 		return false;
 	}
 
-	public function add(InternetAddress $address) : void{
-		if (!isset($this->cookies[$address->toString()])) {
-			$this->cookies[$address->toString()] = $this->generate($address);
-		}
+	public function add(InternetAddress $address) : int{
+		$cookie = $this->generate($address);
+		$this->cookies[$address->toString()] = $cookie;
+		return $cookie;
 	}
 
 	private function generate(InternetAddress $address) : int{
-		return crc32(Binary::writeLInt(random_int(0, 0xffffffff)) . Binary::writeLShort($address->getPort()) . $address->getIp());
+		return crc32(Binary::writeLInt(random_int(0, 0xffffffff)));
 	}
 }