<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50038] branches/5.6: Privacy: Ensure that exported user data reports can't be found with directory listings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50038">50038</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50038","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-01-27 23:47:43 +0000 (Wed, 27 Jan 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Privacy: Ensure that exported user data reports can't be found with directory listings.
By moving from .html to .php files, we can prevent directory listings, and ensure that WordPress can load.
This brings the changes from <a href="https://core.trac.wordpress.org/changeset/50037">[50037]</a> to the 5.6 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/52299">#52299</a>.
Props lucasbustamante, xkon, freewebmentor, SergeyBiryukov, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches56srcwpadminincludesprivacytoolsphp">branches/5.6/src/wp-admin/includes/privacy-tools.php</a></li>
<li><a href="#branches56srcwpincludesfunctionsphp">branches/5.6/src/wp-includes/functions.php</a></li>
<li><a href="#branches56testsphpunittestsprivacywpPrivacyDeleteOldExportFilesphp">branches/5.6/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php</a></li>
<li><a href="#branches56testsphpunittestsprivacywpPrivacyGeneratePersonalDataExportFilephp">branches/5.6/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches56">branches/5.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.6 2021-01-27 23:45:29 UTC (rev 50037)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.6 2021-01-27 23:47:43 UTC (rev 50038)
</ins><a id="branches56"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49917,49920-49921,49979,50003,50035
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49917,49920-49921,49979,50003,50035,50037
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches56srcwpadminincludesprivacytoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-admin/includes/privacy-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-admin/includes/privacy-tools.php 2021-01-27 23:45:29 UTC (rev 50037)
+++ branches/5.6/src/wp-admin/includes/privacy-tools.php 2021-01-27 23:47:43 UTC (rev 50038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,13 +322,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Protect export folder from browsing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index_pathname = $exports_dir . 'index.html';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_pathname = $exports_dir . 'index.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $index_pathname ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = fopen( $index_pathname, 'w' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'Unable to protect user privacy export folder from browsing.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fwrite( $file, '<!-- Silence is golden. -->' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fwrite( $file, '<?php // Silence is golden.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> fclose( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches56srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/functions.php 2021-01-27 23:45:29 UTC (rev 50037)
+++ branches/5.6/src/wp-includes/functions.php 2021-01-27 23:47:43 UTC (rev 50038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7396,7 +7396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/file.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $export_files = list_files( $exports_dir, 100, array( 'index.html' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $export_files = list_files( $exports_dir, 100, array( 'index.php' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the lifetime, in seconds, of a personal data export file.
</span></span></pre></div>
<a id="branches56testsphpunittestsprivacywpPrivacyDeleteOldExportFilesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php 2021-01-27 23:45:29 UTC (rev 50037)
+++ branches/5.6/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php 2021-01-27 23:47:43 UTC (rev 50038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mkdir_p( $exports_dir );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$index_path = $exports_dir . 'index.html';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$index_path = $exports_dir . 'index.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$expired_export_file = $exports_dir . 'wp-personal-data-file-0123456789abcdef.zip';
</span><span class="cx" style="display: block; padding: 0 10px"> self::$active_export_file = $exports_dir . 'wp-personal-data-file-fedcba9876543210.zip';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches56testsphpunittestsprivacywpPrivacyGeneratePersonalDataExportFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php 2021-01-27 23:45:29 UTC (rev 50037)
+++ branches/5.6/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php 2021-01-27 23:47:43 UTC (rev 50038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test that an index.html file can be added to the export directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test that an index.php file can be added to the export directory.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44233
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_privacy_generate_personal_data_export_file( self::$export_request_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( file_exists( self::$exports_dir . 'index.html' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( file_exists( self::$exports_dir . 'index.php' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>