Filter the params

chesslablab · Jan 16, 2025 · 37fc6c1 · 37fc6c1
1 parent a71ca86
commit 37fc6c1
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 23 deletions.
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -21,6 +21,11 @@ public function __get($property)
         }
     }
 
+    protected function params(string $params)
+    {
+        return json_decode(stripslashes(str_replace(['\r', '\n'], '', $params)), true);
+    }
+
     abstract public function validate(array $command);
 
     abstract public function run(AbstractSocket $socket, array $argv, int $id);

diff --git a/src/Command/Auth/Blocking/TotpRefreshCommand.php b/src/Command/Auth/Blocking/TotpRefreshCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new TotpRefreshTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Auth/Blocking/TotpSignInCommand.php b/src/Command/Auth/Blocking/TotpSignInCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new TotpSignInTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Binary/Blocking/ImageCommand.php b/src/Command/Binary/Blocking/ImageCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new ImageTask($params), 128000)
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Data/Blocking/AutocompleteBlackCommand.php b/src/Command/Data/Blocking/AutocompleteBlackCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new AutocompleteBlackTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Data/Blocking/AutocompleteEventCommand.php b/src/Command/Data/Blocking/AutocompleteEventCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new AutocompleteEventTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Data/Blocking/AutocompleteWhiteCommand.php b/src/Command/Data/Blocking/AutocompleteWhiteCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new AutocompleteWhiteTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Data/Blocking/OpeningCommand.php b/src/Command/Data/Blocking/OpeningCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new OpeningTask($params), 128000)
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Data/Blocking/SearchCommand.php b/src/Command/Data/Blocking/SearchCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new SearchTask($params), 128000)
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/Blocking/ExtractCommand.php b/src/Command/Game/Blocking/ExtractCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new ExtractTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/Blocking/HeuristicCommand.php b/src/Command/Game/Blocking/HeuristicCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new HeuristicTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/Blocking/LeaveCommand.php b/src/Command/Game/Blocking/LeaveCommand.php
@@ -26,7 +26,7 @@ public function validate(array $argv)
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
         if ($gameMode = $socket->getGameModeStorage()->getById($id)) {
-            $params = json_decode(stripslashes($argv[1]), true);
+            $params = $this->params($argv[1]);
 
             $gameMode->getGame()->setResignation($params['color']);
 

diff --git a/src/Command/Game/Blocking/PlayCommand.php b/src/Command/Game/Blocking/PlayCommand.php
@@ -25,7 +25,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
         $gameMode = $socket->getGameModeStorage()->getById($id);
 
         if (get_class($gameMode) === PlayMode::class) {

diff --git a/src/Command/Game/Blocking/PlayLanCommand.php b/src/Command/Game/Blocking/PlayLanCommand.php
@@ -25,7 +25,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
         $gameMode = $socket->getGameModeStorage()->getById($id);
 
         if (get_class($gameMode) === PlayMode::class) {

diff --git a/src/Command/Game/Blocking/PlayRavCommand.php b/src/Command/Game/Blocking/PlayRavCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new PlayRavTask($params), 128000)
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/Blocking/RecognizerCommand.php b/src/Command/Game/Blocking/RecognizerCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new RecognizerTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/Blocking/ResignCommand.php b/src/Command/Game/Blocking/ResignCommand.php
@@ -25,7 +25,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $gameMode = $socket->getGameModeStorage()->getById($id);
         $gameMode->getGame()->setResignation($params['color']);

diff --git a/src/Command/Game/Blocking/RestartCommand.php b/src/Command/Game/Blocking/RestartCommand.php
@@ -28,7 +28,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
         $gameMode = $socket->getGameModeStorage()->getByJwt($params['jwt']);
 
         $this->pool->add(new RestartTask([

diff --git a/src/Command/Game/Blocking/StockfishCommand.php b/src/Command/Game/Blocking/StockfishCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
         $game = $socket->getGameModeStorage()->getById($id)->getGame();
 
         if (!isset($game->state()->end)) {

diff --git a/src/Command/Game/Blocking/TutorFenCommand.php b/src/Command/Game/Blocking/TutorFenCommand.php
@@ -23,7 +23,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $this->pool->add(new TutorFenTask($params))
             ->then(function ($result) use ($socket, $id) {

diff --git a/src/Command/Game/NonBlocking/AcceptPlayRequestCommand.php b/src/Command/Game/NonBlocking/AcceptPlayRequestCommand.php
@@ -26,7 +26,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         $gameMode = $socket->getGameModeStorage()->getByUid($params['uid']);
 

diff --git a/src/Command/Game/NonBlocking/LegalCommand.php b/src/Command/Game/NonBlocking/LegalCommand.php
@@ -24,7 +24,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
         $gameMode = $socket->getGameModeStorage()->getById($id);
 
         return $socket->getClientStorage()->send([$id],

diff --git a/src/Command/Game/NonBlocking/RandomizerCommand.php b/src/Command/Game/NonBlocking/RandomizerCommand.php
@@ -47,7 +47,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         try {
             if (count($params['items']) === 1) {

diff --git a/src/Command/Game/NonBlocking/StartCommand.php b/src/Command/Game/NonBlocking/StartCommand.php
@@ -41,7 +41,7 @@ public function validate(array $argv)
 
     public function run(AbstractSocket $socket, array $argv, int $id)
     {
-        $params = json_decode(stripslashes($argv[1]), true);
+        $params = $this->params($argv[1]);
 
         if (AnalysisMode::NAME === $params['mode']) {
             try {