Changeset 43186

Timestamp:

05/09/2018 02:29:25 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Reuse existing archive filenames to maintain URLs.

Whenever an admin initiates a download or email of a personal data export, a fresh copy of the file is generated. Previously, a new filename was used each time, which could lead to situations where a URL that was emailed to a data subject is broken.

That can be avoided by reusing the same filename when building fresh archives.

Props desrosj, tz-media, allendav.
Merges [43180] to the 4.9 branch.
Fixes #43905.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/file.php (modified) (3 diffs)

branches/4.9/src/wp-admin/includes/file.php

@@ -1991 +1991 @@
     fclose( $file );
 
-    // Now, generate the ZIP.
+    /*
+     * Now, generate the ZIP.
+     *
+     * If an archive has already been generated, then remove it and reuse the
+     * filename, to avoid breaking any URLs that may have been previously sent
+     * via email.
+     */
     $error            = false;
-    $archive_filename = $file_basename . '.zip';
-    $archive_pathname = $exports_dir . $archive_filename;
-    $archive_url      = $exports_url . $archive_filename;
+    $archive_url      = get_post_meta( $request_id, '_export_file_url', true );
+    $archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
+
+    if ( empty( $archive_pathname ) || empty( $archive_url ) ) {
+        $archive_filename = $file_basename . '.zip';
+        $archive_pathname = $exports_dir . $archive_filename;
+        $archive_url      = $exports_url . $archive_filename;
+
+        update_post_meta( $request_id, '_export_file_url', $archive_url );
+        update_post_meta( $request_id, '_export_file_path', $archive_pathname );
+    }
+
+    if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
+        wp_delete_file( $archive_pathname );
+    }
 
     $zip = new ZipArchive;
@@ -2027 +2045 @@
         wp_send_json_error( $error );
     }
-
-    // Save the export file in the request.
-    update_post_meta( $request_id, '_export_file_url', $archive_url );
-    update_post_meta( $request_id, '_export_file_path', $archive_pathname );
 }
 
@@ -2206 +2220 @@
     update_post_meta( $request_id, '_export_data_grouped', $groups );
 
-    // And now, generate the export file, cleaning up any previous file
-    $export_path = get_post_meta( $request_id, '_export_file_path', true );
-    if ( ! empty( $export_path ) ) {
-        delete_post_meta( $request_id, '_export_file_path' );
-        @unlink( $export_path );
-    }
-    delete_post_meta( $request_id, '_export_file_url' );
-
     // Generate the export file from the collected, grouped personal data.
     do_action( 'wp_privacy_personal_data_export_file', $request_id );