From 5b35174ffab42f0331f1a6527ef6bbab7a3dbdcb Mon Sep 17 00:00:00 2001
From: Daniel Weipert <git@mail.dweipert.de>
Date: Sat, 21 Dec 2024 14:15:11 +0100
Subject: next commit

---
 Game/Lobby/Server/index.php | 7 +++++--
 Game/Lobby/game_lobby.gd    | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'Game/Lobby')

diff --git a/Game/Lobby/Server/index.php b/Game/Lobby/Server/index.php
index ae734a6..1086d24 100644
--- a/Game/Lobby/Server/index.php
+++ b/Game/Lobby/Server/index.php
@@ -36,7 +36,7 @@ if (php_sapi_name() == 'cli') {
   return;
 }
 
-$url = parse_url("$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+$url = parse_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
 $method = $_SERVER['REQUEST_METHOD'];
 
 if ($method == 'POST') {
@@ -49,7 +49,10 @@ if ($method == 'POST') {
 $response = [];
 
 if ($method == 'POST' && $url['path'] == '/host') {
-  $ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
+  $ip = filter_var(
+    $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'],
+    FILTER_VALIDATE_IP
+  );
 
   if ($ip === false) {
     $response = [
diff --git a/Game/Lobby/game_lobby.gd b/Game/Lobby/game_lobby.gd
index 6bfa8be..ffc66f3 100644
--- a/Game/Lobby/game_lobby.gd
+++ b/Game/Lobby/game_lobby.gd
@@ -42,8 +42,8 @@ func request(
 	get_tree().root.add_child(config.node)
 	
 	if config.method == HTTPClient.METHOD_POST:
-		config.set("id", current_game_id)
-		config.set("secret", current_secret)
+		config.data["id"] = current_game_id
+		config.data["secret"] = current_secret
 	
 	var response = HTTPResponse.new()
 	config.node.request_completed.connect(
@@ -60,6 +60,7 @@ func request(
 			
 			get_tree().root.remove_child(config.node)
 	)
+	
 	config.node.request(
 		"%s%s" % [server_base_url, url],
 		config.headers,
-- 
cgit v1.2.3