Fix: forbidden peers cache

Author: xtrime-ru

app/AccessControl/ForbiddenPeers.php

@@ -29,8 +29,10 @@ public static function add(string $peer, string $error): void {
             case 'BOTS NOT ALLOWED':
             case 'This is not a public channel':
                 $peer = mb_strtolower($peer);
-                self::$peers[$peer] = $error;
-                self::getFilePointer()->write(self::str_putcsv([$peer, $error]) . PHP_EOL);
+                if ((self::$peers[$peer] ?? null) !== $error) {
+                    self::$peers[$peer] = $error;
+                    self::getFilePointer()->write(self::str_putcsv([$peer, $error]) . PHP_EOL);
+                }
                 break;
         }
     }

app/Controller/RequestValidatorMiddleware.php

@@ -22,9 +22,15 @@ public function __construct(
 
     public function handleRequest(Request $request, RequestHandler $requestHandler): Response
     {
-        $request->setAttribute('channel', self::getChannel($request));
-        $this->validatePeer($request);
-        return $requestHandler->handleRequest($request);
+        $channel = self::getChannel($request);
+        $request->setAttribute('channel', $channel);
+        try {
+            $this->validatePeer($request);
+            return $requestHandler->handleRequest($request);
+        } catch (\Throwable $exception) {
+            ForbiddenPeers::add($channel, $exception->getMessage());
+            throw $exception;
+        }
     }
 
     public static function getChannel(Request $request): string

app/Server/ErrorResponse.php

@@ -6,7 +6,6 @@
 use Amp\Http\Server\ErrorHandler;
 use Amp\Http\Server\Request;
 use Amp\Http\Server\Response;
-use Amp\Http\Server\Trailers;
 
 class ErrorResponse implements ErrorHandler
 {