<!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>[47237] trunk: Privacy: Include session tokens in Personal Data Export.</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/47237">47237</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/47237","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-10 05:42:52 +0000 (Mon, 10 Feb 2020)</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: Include session tokens in Personal Data Export.
Session tokens contain an IP address and user agent.
Props garrett-eclipse, nickylimjj, lakenh, xkon, rconde.
Fixes <a href="https://core.trac.wordpress.org/ticket/45889">#45889</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2020-02-10 05:30:03 UTC (rev 47236)
+++ trunk/src/wp-includes/user.php 2020-02-10 05:42:52 UTC (rev 47237)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2939,6 +2939,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Finds and exports personal data associated with an email address from the user and user_meta table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0 Added 'Community Events Location' group to the export data.
+ * @since 5.4.0 Added 'Session Tokens' group to the export data.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $email_address The users email address.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3012,11 +3014,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $user_data_to_export,
</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">- /**
- * Introduce any Community Events Location data that is available.
- *
- * @since 5.4.0
- */
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $user_meta['community-events-location'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = maybe_unserialize( $user_meta['community-events-location'][0] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3048,6 +3045,42 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $user_meta['session_tokens'] ) ) {
+ $session_tokens = maybe_unserialize( $user_meta['session_tokens'][0] );
+
+ $session_tokens_props_to_export = array(
+ 'expiration' => __( 'Expiration' ),
+ 'ip' => __( 'IP' ),
+ 'ua' => __( 'User Agent' ),
+ 'login' => __( 'Last Login' ),
+ );
+
+ foreach ( $session_tokens as $token_key => $session_token ) {
+ $session_tokens_data_to_export = array();
+
+ foreach ( $session_tokens_props_to_export as $key => $name ) {
+ if ( ! empty( $session_token[ $key ] ) ) {
+ $value = $session_token[ $key ];
+ if ( in_array( $key, array( 'expiration', 'login' ) ) ) {
+ $value = date_i18n( 'F d, Y H:i A', $value );
+ }
+ $session_tokens_data_to_export[] = array(
+ 'name' => $name,
+ 'value' => $value,
+ );
+ }
+ }
+
+ $data_to_export[] = array(
+ 'group_id' => 'session-tokens',
+ 'group_label' => __( 'Session Tokens' ),
+ 'group_description' => __( 'User’s Session Tokens data.' ),
+ 'item_id' => "session-tokens-{$user->ID}-{$token_key}",
+ 'data' => $session_tokens_data_to_export,
+ );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => $data_to_export,
</span><span class="cx" style="display: block; padding: 0 10px"> 'done' => true,
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2020-02-10 05:30:03 UTC (rev 47236)
+++ trunk/tests/phpunit/tests/user.php 2020-02-10 05:42:52 UTC (rev 47237)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1751,4 +1751,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '-84.5143900', $actual['data'][1]['data'][3]['value'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Testing the `wp_user_personal_data_exporter()` function
+ * with Session Tokens data.
+ *
+ * @ticket 45889
+ */
+ function test_wp_session_tokens_personal_data_exporter() {
+ $test_user = new WP_User( self::$contrib_id );
+
+ $session_tokens_data = array(
+ 'yft87y56457687sfd897867545fg76ds78iyuhgjyui7865' => array(
+ 'expiration' => 1580461981,
+ 'ip' => '0.0.0.0',
+ 'ua' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',
+ 'login' => 1580289181,
+ ),
+ );
+ update_user_option( $test_user->ID, 'session_tokens', $session_tokens_data, true );
+
+ $actual = wp_user_personal_data_exporter( $test_user->user_email );
+
+ $this->assertTrue( $actual['done'] );
+
+ // Contains Session Tokens.
+ $this->assertEquals( 'Session Tokens', $actual['data'][1]['group_label'] );
+
+ // Contains Expiration.
+ $this->assertEquals( 'Expiration', $actual['data'][1]['data'][0]['name'] );
+ $this->assertEquals( 'January 31, 2020 09:13 AM', $actual['data'][1]['data'][0]['value'] );
+
+ // Contains IP.
+ $this->assertEquals( 'IP', $actual['data'][1]['data'][1]['name'] );
+ $this->assertEquals( '0.0.0.0', $actual['data'][1]['data'][1]['value'] );
+
+ // Contains IP.
+ $this->assertEquals( 'User Agent', $actual['data'][1]['data'][2]['name'] );
+ $this->assertEquals( 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36', $actual['data'][1]['data'][2]['value'] );
+
+ // Contains IP.
+ $this->assertEquals( 'Last Login', $actual['data'][1]['data'][3]['name'] );
+ $this->assertEquals( 'January 29, 2020 09:13 AM', $actual['data'][1]['data'][3]['value'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>