Signature: Improved naming consistency (#1863)

Author: pfefferle

includes/class-signature.php

@@ -8,7 +8,7 @@
 namespace Activitypub;
 
 use Activitypub\Collection\Actors;
-use Activitypub\Signature\Draft_Cavage_Signature;
+use Activitypub\Signature\Http_Signature_Draft;
 use Activitypub\Signature\Http_Message_Signature;
 
 /**
@@ -47,7 +47,7 @@ public static function sign_request( $args, $url ) {
 			$signature = new Http_Message_Signature();
 			\add_filter( 'http_response', array( self::class, 'maybe_double_knock' ), 10, 3 );
 		} else {
-			$signature = new Draft_Cavage_Signature();
+			$signature = new Http_Signature_Draft();
 		}
 
 		return $signature->sign( $args, $url );
@@ -70,7 +70,7 @@ public static function verify_http_signature( $request ) {
 			$headers['(request-target)'][0] = strtolower( $headers['request_method'][0] ) . ' ' . $headers['request_uri'][0];
 		}
 
-		$signature = isset( $headers['signature_input'] ) ? new Http_Message_Signature() : new Draft_Cavage_Signature();
+		$signature = isset( $headers['signature_input'] ) ? new Http_Message_Signature() : new Http_Signature_Draft();
 
 		return $signature->verify( $headers, $body ?? null );
 	}
@@ -95,7 +95,7 @@ public static function maybe_double_knock( $response, $parsed_args, $url ) {
 			unset( $parsed_args['headers']['Signature'], $parsed_args['headers']['Signature-Input'], $parsed_args['headers']['Content-Digest'] );
 			self::rfc9421_add_unsupported_host( $url );
 
-			$parsed_args = ( new Draft_Cavage_Signature() )->sign( $parsed_args, $url );
+			$parsed_args = ( new Http_Signature_Draft() )->sign( $parsed_args, $url );
 			$response    = \wp_remote_request( $url, $parsed_args );
 		}
 

includes/signature/class-http-message-signature.php

@@ -20,7 +20,7 @@
  *
  * @see https://www.rfc-editor.org/rfc/rfc9421.html
  */
-class Http_Message_Signature implements Signature_Standard {
+class Http_Message_Signature implements Http_Signature {
 
 	/**
 	 * Signature algorithms.

…gnature/class-draft-cavage-signature.php …signature/class-http-signature-draft.phpincludes/signature/class-draft-cavage-signature.php renamed to includes/signature/class-http-signature-draft.php includes/signature/class-draft-cavage-signature.php renamed to includes/signature/class-http-signature-draft.php

@@ -14,13 +14,13 @@
 use Activitypub\Collection\Actors;
 
 /**
- * Class Draft_Cavage.
+ * Class Http_Signature_Draft.
  *
  * Implements the Draft Cavage signature standard for verifying HTTP signatures.
  *
  * @see https://tools.ietf.org/html/draft-cavage-http-signatures-12
  */
-class Draft_Cavage_Signature implements Signature_Standard {
+class Http_Signature_Draft implements Http_Signature {
 
 	/**
 	 * Generate Signature headers for an outgoing HTTP request.

…gnature/interface-signature-standard.php …s/signature/interface-http-signature.phpincludes/signature/interface-signature-standard.php renamed to includes/signature/interface-http-signature.php includes/signature/interface-signature-standard.php renamed to includes/signature/interface-http-signature.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Interface for HTTP Signature Standards.
+ * Interface for HTTP Signature.
  *
  * This interface defines the methods required for verifying HTTP signatures
  * according to various standards, such as Draft Cavage and HTTP Message Signature.
@@ -11,9 +11,9 @@
 namespace Activitypub\Signature;
 
 /**
- * Interface Signature_Standard.
+ * Interface Http_Signature.
  */
-interface Signature_Standard {
+interface Http_Signature {
 
 	/**
 	 * Generate Signature headers for an outgoing HTTP request.

tests/includes/class-test-signature.php

@@ -317,7 +317,7 @@ function () use ( $keys ) {
 			}
 		);
 
-		$signature = new Signature\Draft_Cavage_Signature();
+		$signature = new Signature\Http_Signature_Draft();
 		$args      = $signature->sign(
 			array(
 				'method'      => 'POST',

tests/includes/rest/class-test-actors-inbox-controller.php

@@ -299,7 +299,7 @@ function ( $json, $actor ) {
 		// Mock remote actor URL.
 		$activity->add_cc( $actor->get_id() );
 
-		$signature = new \Activitypub\Signature\Draft_Cavage_Signature();
+		$signature = new \Activitypub\Signature\Http_Signature_Draft();
 		$args      = $signature->sign(
 			array(
 				'method'      => 'POST',