<!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>[1801] sites/trunk/api.wordpress.org/public_html/dotorg: Some infrastructure changes for the security team.</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 { 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/1801">1801</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/1801","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-02 01:26:10 +0000 (Sun, 02 Aug 2015)</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'>Some infrastructure changes for the security team.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgslacksecurityteamphp">sites/trunk/api.wordpress.org/public_html/dotorg/slack/security-team.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgtracmentionshandlerphp">sites/trunk/api.wordpress.org/public_html/dotorg/trac/mentions-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgslacksecurityteamphp"></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/dotorg/slack/security-team.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/slack/security-team.php 2015-08-01 13:17:57 UTC (rev 1800)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/slack/security-team.php 2015-08-02 01:26:10 UTC (rev 1801)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require dirname( dirname( __DIR__ ) ) . '/includes/hyperdb/bb-10-hyper-db.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $GLOBALS['wpdb'] ) ) {
+ require dirname( dirname( __DIR__ ) ) . '/includes/hyperdb/bb-10-hyper-db.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"> namespace Dotorg\Slack\Security_Team {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require dirname( dirname( __DIR__ ) ) . '/includes/slack-config.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function api_call( $method, $content = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function slack_api( $method, $content = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content['token'] = SLACK_TOKEN;
</span><span class="cx" style="display: block; padding: 0 10px"> $content = http_build_query( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $context = stream_context_create( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,30 +25,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return json_decode( $response, true );
</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">-header( 'Content-type: text/plain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_security_team() {
+ global $wpdb;
+ $group = slack_api( 'groups.info', array( 'channel' => SECURITY_GROUP_ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Confirm it came from the Trac server.
-if ( $_GET['token'] !== API_TOKEN ) {
- die;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $group['ok'] ) ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$group = api_call( 'groups.info', array( 'channel' => SECURITY_GROUP_ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slack_user_ids = $group['group']['members'];
+ $slack_user_ids = array_filter( $slack_user_ids, function( $user_id ) {
+ return (bool) preg_match( '/^U[A-Z0-9]+$/', $user_id );
+ });
+ $slack_user_ids_for_sql = "'" . implode( "', '", $slack_user_ids ) . "'";
+ $user_ids = $wpdb->get_col( "SELECT user_id FROM slack_users WHERE slack_id IN ($slack_user_ids_for_sql)" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( empty( $group['ok'] ) ) {
- die;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_ids = array_map( 'intval', $user_ids );
+ $user_ids_for_sql = implode( ', ', $user_ids );
+ $user_logins = $wpdb->get_col( "SELECT user_login FROM $wpdb->users WHERE ID IN ($user_ids_for_sql)" );
+ return $user_logins;
</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">-$slack_user_ids = $group['group']['members'];
-$slack_user_ids = array_filter( $slack_user_ids, function( $user_id ) {
- return (bool) preg_match( '/^U[A-Z0-9]+$/', $user_id );
-});
-$slack_user_ids_for_sql = "'" . implode( "', '", $slack_user_ids ) . "'";
-$user_ids = $wpdb->get_col( "SELECT user_id FROM slack_users WHERE slack_id IN ($slack_user_ids_for_sql)" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function api_call() {
+ header( 'Content-type: text/plain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$user_ids = array_map( 'intval', $user_ids );
-$user_ids_for_sql = implode( ', ', $user_ids );
-$user_logins = $wpdb->get_col( "SELECT user_login FROM $wpdb->users WHERE ID IN ($user_ids_for_sql)" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Confirm it came from the Trac server.
+ if ( $_GET['token'] !== API_TOKEN ) {
+ exit;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-echo implode( "\n", $user_logins ) . "\n"; // Trailing newline critical.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $team = get_security_team();
+ if ( $team === false ) {
+ exit;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo implode( "\n", $team ) . "\n"; // Trailing newline critical.
+ exit;
</ins><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( $_SERVER['REQUEST_URI'] ) && false !== strpos( $_SERVER['REQUEST_URI'], '/security-team.php?token=' ) ) {
+ api_call();
+}
+
+}
</ins></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgtracmentionshandlerphp"></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/dotorg/trac/mentions-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/trac/mentions-handler.php 2015-08-01 13:17:57 UTC (rev 1800)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/trac/mentions-handler.php 2015-08-02 01:26:10 UTC (rev 1801)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove reply (quoted) text.
</span><span class="cx" style="display: block; padding: 0 10px"> $search_text = preg_replace( "/^>.*\n\n/sm", '', $search_text );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login = $payload->author;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( $payload->trac === 'security' ) {
+ // Security Trac only handles comments.
+ // Ticket data is found via a HTTP request, comments are from parsing the email.
+ exit;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $search_text = $payload->summary . ' ' . $payload->description;
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login = $payload->reporter;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,10 +57,27 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wporg_mentions_limit_to_security_team( $usernames, $data ) {
+ require_once dirname( __DIR__ ) . '/slack/security-team.php';
+ $team = \Dotorg\Slack\Security_Team\get_security_team();
+
+ if ( ! empty( $data['object']->cc ) ) {
+ // Add single ticket access users.
+ $ccs = explode( ", ", $data['object']->cc );
+ $team = array_merge( $team, $ccs );
+ }
+
+ return $team;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wporg_user_has_visited_trac( $user_login ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( 'trac_users', compact( 'user_login' ) );
</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 ( $payload->trac === 'security' ) {
+ add_filter( 'wporg_notifications_notifiable_usernames', 'wporg_mentions_limit_to_security_team', 10, 2 );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_notifications_notify_username', function( $notify, $username ) use ( $type, $payload, $wpdb ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Core Trac has notifications configured.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $payload->trac === 'core' ) {
</span></span></pre>
</div>
</div>
</body>
</html>