From 96953dfc7e033036941a2d423981dc506e3adda0 Mon Sep 17 00:00:00 2001
From: Matthias Pfefferle <pfefferle@users.noreply.github.com>
Date: Tue, 9 May 2023 11:57:43 +0200
Subject: [PATCH] fail early and always return $response as fallback

---
 includes/rest/class-server.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/includes/rest/class-server.php b/includes/rest/class-server.php
index 0e8df43..8deac10 100644
--- a/includes/rest/class-server.php
+++ b/includes/rest/class-server.php
@@ -80,24 +80,28 @@ class Server {
 	 */
 	public static function authorize_activitypub_requests( $response, $handler, $request ) {
 		$route = $request->get_route();
-		if ( str_starts_with( $route, '/activitypub' ) ) {
-			if ( 'POST' === $request->get_method() ) {
-				$verified_request = Signature::verify_http_signature( $request );
-				if ( \is_wp_error( $verified_request ) ) {
-					return $verified_request;
-				}
-			} else {
-				if ( '/activitypub/1.0/webfinger' !== $route ) {
-					// SecureMode/Authorized fetch.
-					$secure_mode = \get_option( 'activitypub_use_secure_mode', '0' );
-					if ( $secure_mode ) {
-						$verified_request = Signature::verify_http_signature( $request );
-						if ( \is_wp_error( $verified_request ) ) {
-							return $verified_request;
-						}
+		if ( ! str_starts_with( $route, '/activitypub' ) ) {
+			return $response;
+		}
+
+		if ( 'POST' === $request->get_method() ) {
+			$verified_request = Signature::verify_http_signature( $request );
+			if ( \is_wp_error( $verified_request ) ) {
+				return $verified_request;
+			}
+		} else {
+			if ( '/activitypub/1.0/webfinger' !== $route ) {
+				// SecureMode/Authorized fetch.
+				$secure_mode = \get_option( 'activitypub_use_secure_mode', '0' );
+				if ( $secure_mode ) {
+					$verified_request = Signature::verify_http_signature( $request );
+					if ( \is_wp_error( $verified_request ) ) {
+						return $verified_request;
 					}
 				}
 			}
 		}
+
+		return $response;
 	}
 }