<!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>[3054] sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php: Slack/Trac: Update `slack-trac-hook.php` to the latest version.</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/3054">3054</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/3054","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-01 21:24:19 +0000 (Sun, 01 May 2016)</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'>Slack/Trac: Update `slack-trac-hook.php` to the latest version.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunksvnwordpressorgbinslacktrachookphp">sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunksvnwordpressorgbinslacktrachookphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php 2016-04-30 09:56:34 UTC (rev 3053)
+++ sites/trunk/svn.wordpress.org/bin/slack-trac-hook.php 2016-05-01 21:24:19 UTC (rev 3054)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,20 +1,14 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#!/usr/bin/env php
</del><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"> * This script receives mail directly from Trac and sends tickets and commits to Slack.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * New tickets are merely identified here. It is then passed off to the API.
- * That will change when the libraries are merged.
- *
- * New comments are processed here and sent to Slack.
</del><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">-define( 'INC', dirname( __DIR__ ) . '/includes/slack-trac-hooks' );
-// This is a shared secret so the Trac server can ping the API server for processing tickets.
-define( 'NEW_TICKET_API', 'https://api.wordpress.org/dotorg/slack/newticket.php?token=...' );
-// Comments are processed and posted directly from here.
-define( 'SLACK_SENDING_HOOK', 'https://hooks.slack.com/services/...' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require '/home/svn/bin/includes/slack/autoload.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WEBHOOK', 'https://hooks.slack.com/services/...' );
+define( 'MENTIONS_API_HANDLER', 'https://api.wordpress.org/dotorg/trac/mentions-handler.php' );
+define( 'MENTIONS_API_KEY', '...' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $lines = array();
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $line = fgets( STDIN ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lines[] = $line;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,37 +30,79 @@
</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"> if ( empty( $type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- exit( 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return;
</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"> if ( $type === 'ticket' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- slack_ticket_hook( $trac, $ticket );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trac = \Dotorg\Slack\Trac\Trac::get( $trac );
+ if ( ! $trac->is_public() ) {
+ // Comment emails are parsed, but ticket emails are
+ // only used as a trigger for an HTTP request to the
+ // ticket to retrieve a CSV. Bail for non-public tickets.
+ return;
+ }
+
+ $new_ticket = new \Dotorg\Slack\Trac\New_Ticket( $trac, $ticket );
+
+ foreach ( $trac->get_ticket_channels( $new_ticket ) as $channel ) {
+ $send = new \Dotorg\Slack\Send( WEBHOOK );
+ $send->set_user( $new_ticket );
+
+ if ( 'title' === $trac->get_ticket_format( $channel ) ) {
+ $send->set_text( $new_ticket->get_text() );
+ } else {
+ $send->add_attachment( $new_ticket->get_attachment() );
+ }
+
+ $send->send( $channel );
+ }
+ $payload = (array) $new_ticket->fetch();
+ array_shift( $payload );
+ $payload['ticket_id'] = $new_ticket->id;
+ $payload['ticket_url'] = $new_ticket->get_url();
+ $payload['trac'] = $trac->get_slug();
+ maybe_add_ticket_cc_to_payload( $payload );
+ send_mentions_payload( $payload );
</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">- require INC . '/comments.php';
- require INC . '/trac.php';
- require INC . '/config.php';
- $args = Dotorg\SlackTracHooks\Comments\process_message( $lines );
- $args['trac'] = $trac;
- $args['ticket'] = $ticket;
- $args['ticket_url'] = $ticket_url;
- $args['comment_url'] = $comment_url;
- Dotorg\SlackTracHooks\Comments\send( SLACK_SENDING_HOOK, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send = new \Dotorg\Slack\Send( WEBHOOK );
+ $handler = new \Dotorg\Slack\Trac\Comment_Handler( $send, $lines );
+ $handler->run();
+
+ if ( false !== strpos( $handler->comment, '#!CommitTicketReference' ) ) {
+ return;
+ }
+
+ $payload = compact( 'type', 'trac' );
+ $properties = array( 'author', 'comment', 'changes', 'ticket_id', 'ticket_url', 'comment_id', 'comment_url' );
+ foreach ( $properties as $property ) {
+ $payload[ $property ] = $handler->$property;
+ }
+ $payload['summary'] = $handler->title;
+ maybe_add_ticket_cc_to_payload( $payload );
+ send_mentions_payload( $payload );
</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">-function slack_ticket_hook( $trac, $ticket ) {
- $payload = array(
- 'trac' => $trac,
- 'ticket' => $ticket,
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function send_mentions_payload( $payload ) {
+ $payload = json_encode( $payload );
+ $secret = MENTIONS_API_KEY;
+ $content = http_build_query( compact( 'payload', 'secret' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $context = stream_context_create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'method' => 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> 'header' => 'Content-Type: application/x-www-form-urlencoded' . PHP_EOL,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'content' => http_build_query( $payload ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'content' => $content,
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- file_get_contents( NEW_TICKET_API, false, $context );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return file_get_contents( MENTIONS_API_HANDLER, false, $context );
</ins><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 maybe_add_ticket_cc_to_payload( &$payload ) {
+ if ( $payload['trac'] === 'security' && file_exists( __DIR__ . '/security-trac-cc.sh' ) ) {
+ $cc = trim( shell_exec( escapeshellcmd( __DIR__ . '/security-trac-cc.sh ' . escapeshellarg( (int) $payload['ticket_id'] ) ) ) );
+ if ( $cc ) {
+ $payload['cc'] = $cc;
+ }
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>