Changeset 49090 for trunk/src/wp-includes/user.php

Timestamp:

10/04/2020 03:21:38 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Improve clarity of privacy error strings.

Primarily this adds "user privacy" to the strings for privacy requests, so they are more easily distinguished from other system actions within logs.

Props garrett-eclipse, carike, birgire.
Fixes #51351.

File:

• trunk/src/wp-includes/user.php (modified) (5 diffs)

trunk/src/wp-includes/user.php

@@ -3613 +3613 @@
 
     if ( $requests_query->found_posts ) {
-        return new WP_Error( 'duplicate_request', __( 'An incomplete request for this email address already exists.' ) );
+        return new WP_Error( 'duplicate_request', __( 'An incomplete user privacy request for this email address already exists.' ) );
     }
 
@@ -3681 +3681 @@
 
     if ( ! $request ) {
-        return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) );
+        return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
     }
 
@@ -3863 +3863 @@
     global $wp_hasher;
 
-    $request_id = absint( $request_id );
-    $request    = wp_get_user_request( $request_id );
-
-    if ( ! $request ) {
-        return new WP_Error( 'invalid_request', __( 'Invalid request.' ) );
+    $request_id       = absint( $request_id );
+    $request          = wp_get_user_request( $request_id );
+    $saved_key        = $request->confirm_key;
+    $key_request_time = $request->modified_timestamp;
+
+    if ( ! $request || ! $saved_key || ! $key_request_time ) {
+        return new WP_Error( 'invalid_request', __( 'Invalid user privacy request.' ) );
     }
 
     if ( ! in_array( $request->status, array( 'request-pending', 'request-failed' ), true ) ) {
-        return new WP_Error( 'expired_link', __( 'This link has expired.' ) );
+        return new WP_Error( 'expired_request', __( 'This user privacy request has expired.' ) );
     }
 
     if ( empty( $key ) ) {
-        return new WP_Error( 'missing_key', __( 'Missing confirm key.' ) );
+        return new WP_Error( 'missing_key', __( 'This user privacy request is missing the confirmation key.' ) );
     }
 
@@ -3883 +3885 @@
     }
 
-    $key_request_time = $request->modified_timestamp;
-    $saved_key        = $request->confirm_key;
-
-    if ( ! $saved_key ) {
-        return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
-    }
-
-    if ( ! $key_request_time ) {
-        return new WP_Error( 'invalid_key', __( 'Invalid action.' ) );
-    }
-
     /**
      * Filters the expiration time of confirm keys.
@@ -3905 +3896 @@
 
     if ( ! $wp_hasher->CheckPassword( $key, $saved_key ) ) {
-        return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
+        return new WP_Error( 'invalid_key', __( 'This user privacy request confirmation key is invalid.' ) );
     }
 
     if ( ! $expiration_time || time() > $expiration_time ) {
-        return new WP_Error( 'expired_key', __( 'The confirmation email has expired.' ) );
+        return new WP_Error( 'expired_key', __( 'This user privacy request confirmation key has expired.' ) );
     }