<!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>[14307] sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php: API: Credits: Return credits with SHA256 hashes.</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="http://meta.trac.wordpress.org/changeset/14307">14307</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/14307","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-12-18 03:14:25 +0000 (Wed, 18 Dec 2024)</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'>API: Credits: Return credits with SHA256 hashes.
Props haozi, SergeyBiryukov, dd32.
Closes https://github.com/WordPress/wordpress.org/pull/454.
Fixes <a href="http://meta.trac.wordpress.org/ticket/7860">#7860</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorecreditswpcreditsphp">sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcorecreditswpcreditsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php 2024-12-18 02:34:38 UTC (rev 14306)
+++ sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php 2024-12-18 03:14:25 UTC (rev 14307)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,9 +221,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->user_nicename == 'nacin' ) // I stopped taking Spanish in 11th grade, don't show me as a validator when I'm testing things.
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user->display_name && $user->display_name != $user->user_nicename && false === strpos( $user->display_name , '?') )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $validators[ $user->user_nicename ] = array( $this->_encode( $user->display_name ), md5( $user->user_email ), $user->user_nicename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $validators[ $user->user_nicename ] = array( $this->_encode( $user->display_name ), $this->hash( $user->user_email ), $user->user_nicename );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $validators[ $user->user_nicename ] = array( $user->user_nicename, md5( $user->user_email ), $user->user_nicename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $validators[ $user->user_nicename ] = array( $user->user_nicename, $this->hash( $user->user_email ), $user->user_nicename );
</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"> return $validators;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,14 +299,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->names_in_groups[] = strtolower( $k );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $person[2] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // array( 'Andrew Nacin', 'Lead Developer', 'md5 hash' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // array( 'Andrew Nacin', 'Lead Developer', 'gravatar hash' )
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_data['title'] = $person[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $new_data['hash'] = $person[2];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $person[1] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // array( 'Andrew Nacin' )
</span><span class="cx" style="display: block; padding: 0 10px"> $fetch_emails_from_user_cache[ $k ] = $group_slug;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strlen( $person[1] ) === 32 && preg_match('/^[a-f0-9]{32}$/', $person[1] ) ) {
- // array( 'Andrew Nacin', 'md5 hash' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->is_hashed( $person[1] ) ) {
+ // array( 'Andrew Nacin', 'gravatar hash' )
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_data['hash'] = $person[1];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // array( 'Andrew Nacin', 'Lead Developer' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,8 +315,8 @@
</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"> // Temporary:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strlen( $new_data['hash'] ) != 32 || strpos( $new_data['hash'], '@' ) ) {
- $new_data['hash'] = md5( $new_data['hash'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->is_hashed( $new_data['hash'] ) ) {
+ $new_data['hash'] = $this->hash( $new_data['hash'] );
</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"> $group_data['data'][ $k ] = array_values( $new_data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_cache_get( $username, 'userlogins' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_object = wp_cache_get( $user_id, 'users' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groups[ $group ]['data'][ $username ][1] = md5( strtolower( $user_object->user_email ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groups[ $group ]['data'][ $username ][1] = $this->hash( $user_object->user_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $fetch_emails_from_db[ $username ] = $group;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $fetch_emails_from_db ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fetched = $wpdb->get_results( "SELECT user_login, ID, user_email FROM $wpdb->users WHERE user_login IN ('" . implode( "', '", array_keys( $fetch_emails_from_db ) ) . "')", OBJECT_K );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fetched as $username => $row ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $groups[ $fetch_emails_from_db[ $username ] ]['data'][ $username ][1] = md5( strtolower( $row->user_email ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $groups[ $fetch_emails_from_db[ $username ] ]['data'][ $username ][1] = $this->hash( $row->user_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( $username, $row->ID, 'userlogins' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,4 +445,26 @@
</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">+ private function is_hashed( $maybe_hash ) {
+ if (
+ ! is_string( $maybe_hash ) ||
+ strpos( $maybe_hash, '@' ) !== false
+ ) {
+ return false;
+ }
+
+ switch ( strlen( $maybe_hash ) ) {
+ case 32:
+ return preg_match( '/^[a-f0-9]{32}$/', $maybe_hash );
+ case 64:
+ return preg_match( '/^[a-f0-9]{64}$/', $maybe_hash );
+ }
+
+ return false;
+ }
+
+ private function hash( $email ) {
+ return hash( 'sha256', strtolower( $email ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>