Prepare anti-spam entry processing for CF7.

Author: kagg-design

src/php/CF7/CF7.php

@@ -170,8 +170,8 @@ public function cf7_hcaptcha_shortcode( $attr = [] ): string {
 	/**
 	 * Check rest nonce and remove it for not logged-in users.
 	 *
-	 * @param WP_Error|mixed $result Error from another authentication handler,
-	 *                               null if we should handle it, or another value if not.
+	 * @param WP_Error|mixed $result Error from another authentication handler.
+	 *                               It is null if we should handle it, or another value if not.
 	 *
 	 * @return WP_Error|mixed
 	 */
@@ -226,8 +226,7 @@ public function verify_hcaptcha( $result, $tag ) {
 		}
 
 		$data           = $submission->get_posted_data();
-		$response       = $data['h-captcha-response'] ?? '';
-		$captcha_result = API::verify_request( $response );
+		$captcha_result = API::verify( $this->get_entry( $data ) );
 
 		if ( null !== $captcha_result ) {
 			return $this->get_invalidated_result( $result, $captcha_result );
@@ -401,4 +400,43 @@ static function ( &$value, $key ) {
 
 		return str_replace( $cf7_hcap_shortcode, "[$updated_cf_hcap_sc]", $output );
 	}
+
+	/**
+	 * Get entry.
+	 *
+	 * @param array $data Entry data.
+	 *
+	 * @return array
+	 */
+	private function get_entry( array $data ): array {
+		$entry = [
+			'data' => [],
+		];
+
+		$submission = WPCF7_Submission::get_instance();
+
+		if ( ! $submission ) {
+			return $entry;
+		}
+
+		$contact_form           = $submission->get_contact_form();
+		$form_id                = $contact_form->id();
+		$post                   = get_post( $form_id );
+		$entry['form_date_gmt'] = $post->post_modified_gmt ?? null;
+		$form_tags              = $contact_form->scan_form_tags();
+
+		foreach ( $form_tags as $form_tag ) {
+			$type  = $form_tag->type;
+			$name  = $form_tag->name;
+			$value = $data[ $name ] ?? '';
+
+			if ( 'email' === $type ) {
+				$entry['data']['email'] = $value;
+			}
+
+			$entry['data'][ $name ] = $value;
+		}
+
+		return $entry;
+	}
 }

tests/php/integration/CF7/CF7Test.php

@@ -395,6 +395,7 @@ public function test_verify_hcaptcha(): void {
 		$form_fields       = [ $field ];
 
 		$contact_form = Mockery::mock( WPCF7_ContactForm::class );
+		$contact_form->shouldReceive( 'id' )->andReturn( $wpcf7_id );
 		$contact_form->shouldReceive( 'scan_form_tags' )->andReturn( $form_fields );
 
 		$submission = Mockery::mock( WPCF7_Submission::class );
@@ -515,12 +516,14 @@ public function test_verify_hcaptcha_without_mode_set(): void {
 	 */
 	public function test_verify_hcaptcha_without_posted_data(): void {
 		$data              = [];
+		$wpcf7_id          = 23;
 		$hcaptcha_site_key = 'some site key';
 		$field             = Mockery::mock( WPCF7_FormTag::class );
 		$field->type       = 'some';
 		$form_fields       = [ $field ];
 
 		$contact_form = Mockery::mock( WPCF7_ContactForm::class );
+		$contact_form->shouldReceive( 'id' )->andReturn( $wpcf7_id );
 		$contact_form->shouldReceive( 'scan_form_tags' )->andReturn( $form_fields );
 
 		$submission = Mockery::mock( WPCF7_Submission::class );
@@ -561,11 +564,13 @@ public function test_verify_hcaptcha_without_posted_data(): void {
 	 */
 	public function test_verify_hcaptcha_without_site_key(): void {
 		$data        = [];
+		$wpcf7_id    = 23;
 		$field       = Mockery::mock( WPCF7_FormTag::class );
 		$field->type = 'some';
 		$form_fields = [ $field ];
 
 		$contact_form = Mockery::mock( WPCF7_ContactForm::class );
+		$contact_form->shouldReceive( 'id' )->andReturn( $wpcf7_id );
 		$contact_form->shouldReceive( 'scan_form_tags' )->andReturn( $form_fields );
 
 		$submission = Mockery::mock( WPCF7_Submission::class );
@@ -619,6 +624,7 @@ public function test_verify_hcaptcha_without_response(): void {
 		$form_fields       = [ $field ];
 
 		$contact_form = Mockery::mock( WPCF7_ContactForm::class );
+		$contact_form->shouldReceive( 'id' )->andReturn( $wpcf7_id );
 		$contact_form->shouldReceive( 'scan_form_tags' )->andReturn( $form_fields );
 
 		$submission = Mockery::mock( WPCF7_Submission::class );
@@ -687,6 +693,7 @@ public function test_verify_hcaptcha_not_verified(): void {
 		$form_fields       = [ $field ];
 
 		$contact_form = Mockery::mock( WPCF7_ContactForm::class );
+		$contact_form->shouldReceive( 'id' )->andReturn( $wpcf7_id );
 		$contact_form->shouldReceive( 'scan_form_tags' )->andReturn( $form_fields );
 
 		$submission = Mockery::mock( WPCF7_Submission::class );