<!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>[12273] sites/trunk/wordpress.org/public_html/wp-content/plugins: Support Forums: Emails: Ensure that the unsubscription link included in emails is unique.</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/12273">12273</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/12273","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>2022-11-23 07:04:37 +0000 (Wed, 23 Nov 2022)</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'>Support Forums: Emails: Ensure that the unsubscription link included in emails is unique.
See <a href="http://meta.trac.wordpress.org/changeset/11562">[11562]</a>, <a href="http://meta.trac.wordpress.org/changeset/11580">[11580]</a>, <a href="http://meta.trac.wordpress.org/ticket/5505">#5505</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassemailsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassemailsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php 2022-11-23 04:47:00 UTC (rev 12272)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-emails.php 2022-11-23 07:04:37 UTC (rev 12273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,18 +104,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent recursive calls.
</span><span class="cx" style="display: block; padding: 0 10px"> $recursive = true;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $dest_emails as $to ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The to is always the current recipient.
- $attrs['to'] = $to;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use a fresh copy of the attrs.
+ $email_attrs = $attrs;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The to is always going to be the current recipient.
+ $email_attrs['to'] = $to;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Filter for w.org plugins to personalize emails.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attrs = apply_filters( 'wporg_bbp_subscription_email', $attrs );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_attrs = apply_filters( 'wporg_bbp_subscription_email', $email_attrs );
+
+ // Send the filtered email.
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter_return = wp_mail(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attrs['to'],
- $attrs['subject'],
- $attrs['message'],
- $attrs['headers'],
- $attrs['attachments']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_attrs['to'],
+ $email_attrs['subject'],
+ $email_attrs['message'],
+ $email_attrs['headers'],
+ $email_attrs['attachments']
</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>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2022-11-23 04:47:00 UTC (rev 12272)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2022-11-23 07:04:37 UTC (rev 12273)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +80,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a banner above the 'forum' about being subscribed to it.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_template_before_topics_index', array( $this, 'before_view' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_compat_before_single_view', array( $this, 'before_view' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Use a custom salt
+ add_filter( 'salt', array( $this, 'forum_subscriptions_salt' ), 10, 2 );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,6 +800,17 @@
</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">+ * Define a custom salt for wp_hash( ..., 'forum_subcriptions' ).
+ */
+ public function forum_subscriptions_salt( $salt, $scheme ) {
+ if ( 'forum_subscriptions' === $scheme && defined( 'FORUM_SUBSCRIPTIONS_SALT' ) ) {
+ $salt = FORUM_SUBSCRIPTIONS_SALT;
+ }
+
+ return $salt;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Generates a unsubscription token for a user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The token form is 'user_id|expiry|hash', and dependant upon the user email, password, and term.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expiry = intval( $expiry );
</span><span class="cx" style="display: block; padding: 0 10px"> $pass_frag = substr( $user->user_pass, 8, 4 ); // Password fragment used by cookie auth.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = wp_hash( $term->term_id . '|' . $term->taxonomy . '|' . $user->user_email . '|' . $pass_frag . '|' . $expiry, 'forum_subcriptions' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = wp_hash( $term->term_id . '|' . $term->taxonomy . '|' . $user->user_email . '|' . $pass_frag . '|' . $expiry, 'forum_subscriptions' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $hash = hash_hmac( 'sha256', $term->term_id . '|' . $term->taxonomy . '|' . $user->user_email . '|' . $expiry, $key );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $user->ID . '|' . $expiry . '|' . $hash;
</span></span></pre>
</div>
</div>
</body>
</html>