<!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>[9147] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Login: Add reCaptcha v3 in logging-only mode for registration.</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/9147">9147</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/9147","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>2019-09-23 06:26:14 +0000 (Mon, 23 Sep 2019)</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'>Login: Add reCaptcha v3 in logging-only mode for registration.
See <a href="http://meta.trac.wordpress.org/ticket/4739">#4739</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp"></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/themes/pub/wporg-login/functions-registration.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/themes/pub/wporg-login/functions-registration.php 2019-09-23 03:52:23 UTC (rev 9146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2019-09-23 06:26:14 UTC (rev 9147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,19 +5,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- $verify = array(
- 'secret' => RECAPTCHA_INVIS_PRIVKEY,
- 'remoteip' => $_SERVER['REMOTE_ADDR'],
- 'response' => $_POST['g-recaptcha-response'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wporg_login_recaptcha_api(
+ $_POST['g-recaptcha-response'],
+ RECAPTCHA_INVIS_PRIVKEY
</ins><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">- $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', array( 'body' => $verify ) );
- if ( is_wp_error( $resp ) || 200 != wp_remote_retrieve_response_code( $resp ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $result = json_decode( wp_remote_retrieve_body( $resp ), true );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return (bool) $result['success'];
</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">@@ -54,6 +49,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'scores' => array()
</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">+ // reCaptcha v3 logging.
+ if ( isset( $_POST['_reCaptcha_v3_token'] ) ) {
+ $recaptcha_api = wporg_login_recaptcha_api(
+ $_POST['_reCaptcha_v3_token'],
+ RECAPTCHA_V3_PRIVKEY
+ );
+ $pending_user['scores']['pending'] = -1;
+ if ( $recaptcha_api && $recaptcha_api['success'] && 'register' == $recaptcha_api['action'] ) {
+ $pending_user['scores']['pending'] = $recaptcha_api['score'];
+ }
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $inserted = wporg_update_pending_user( $pending_user );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $inserted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error! Something went wrong with your registration. Try again?', 'wporg' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +175,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_user['created'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_user['created_date'] = gmdate( 'Y-m-d H:i:s' );
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_user['meta']['confirmed_ip'] = $_SERVER['REMOTE_ADDR']; // Spam/Fraud purposes, will be deleted once not needed.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // reCaptcha v3 logging.
+ if ( isset( $_POST['_reCaptcha_v3_token'] ) ) {
+ $recaptcha_api = wporg_login_recaptcha_api(
+ $_POST['_reCaptcha_v3_token'],
+ RECAPTCHA_V3_PRIVKEY
+ );
+ $pending_user['scores']['create'] = -1;
+ if ( $recaptcha_api && $recaptcha_api['success'] && 'pending_create' == $recaptcha_api['action'] ) {
+ $pending_user['scores']['create'] = $recaptcha_api['score'];
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wporg_update_pending_user( $pending_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_mailinglist ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp"></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/themes/pub/wporg-login/functions.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/themes/pub/wporg-login/functions.php 2019-09-23 03:52:23 UTC (rev 9146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2019-09-23 06:26:14 UTC (rev 9147)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +80,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'wporg-registration', 'wporg_registration', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_url' => esc_url_raw( rest_url( "wporg/v1" ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // reCaptcha v3 is loaded on all login pages, not just the registration flow.
+ wp_enqueue_script( 'recaptcha-api-v3', 'https://www.google.com/recaptcha/api.js?onload=reCaptcha_v3_init&render=' . RECAPTCHA_V3_PUBKEY, array(), '3' );
+ wp_add_inline_script(
+ 'recaptcha-api-v3',
+ 'function reCaptcha_v3_init() {
+ grecaptcha.execute(' .
+ json_encode( RECAPTCHA_V3_PUBKEY ) .
+ ', {action: ' . json_encode(
+ str_replace( '-', '_', WP_WPOrg_SSO::$matched_route ?: 'login' ) // Must match ^[a-Z_ ]$, but we use -
+ ) .' }
+ ).then( function( token ) {
+ // Add the token to the "primary" form
+ var input = document.createElement( "input" );
+ input.setAttribute( "type", "hidden" );
+ input.setAttribute( "name", "_reCaptcha_v3_token" );
+ input.setAttribute( "value", token );
+
+ document.getElementsByTagName("form")[0].appendChild( input );
+ });
+ }'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wporg_login_register_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,3 +294,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', 'wporg_login_language_switcher', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'login_footer', 'wporg_login_language_switcher', 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Simple API for accessing the reCaptcha verify api.
+ */
+function wporg_login_recaptcha_api( $token, $key ) {
+ $verify = array(
+ 'secret' => $key,
+ 'remoteip' => $_SERVER['REMOTE_ADDR'],
+ 'response' => $token,
+ );
+
+ $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', array( 'body' => $verify ) );
+ if ( is_wp_error( $resp ) || 200 != wp_remote_retrieve_response_code( $resp ) ) {
+ return false;
+ }
+
+ return json_decode( wp_remote_retrieve_body( $resp ), true );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>