<!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>[10410] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory: Theme Directory: Add a callback to an experimental theme-review workflow.</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/10410">10410</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/10410","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>2020-10-27 02:41:36 +0000 (Tue, 27 Oct 2020)</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'>Theme Directory: Add a callback to an experimental theme-review workflow.
Props dufresnesteven.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/adhocore-php-jwt/</li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorylibclassgithubphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-github.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectoryclasswporgthemesuploadphp"></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/theme-directory/class-wporg-themes-upload.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/theme-directory/class-wporg-themes-upload.php 2020-10-26 06:59:10 UTC (rev 10409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php 2020-10-27 02:41:36 UTC (rev 10410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\Theme_Directory\Lib\GitHub;
</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"> * Class WPORG_Themes_Upload
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,6 +324,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'theme_upload', $this->theme, $this->theme_post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Initiate a GitHub actions run for the theme.
+ $this->trigger_e2e_run( $ticket_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Success!
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: theme name, 2: Trac ticket URL */
</span><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Thank you for uploading %1$s to the WordPress Theme Directory. We’ve sent you an email verifying that we’ve received it. Feedback will be provided at <a href="%2$s">%2$s</a>', 'wporg-themes' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,6 +951,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $this->author->user_email, $email_subject, $email_content, 'From: themes@wordpress.org' );
</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">+ /**
+ * Triggers a GitHub actions run for the upload.
+ */
+ public function trigger_e2e_run( $ticket_id ) {
+ $api = GitHub::api(
+ '/repos/' . WPORG_THEMES_E2E_REPO . '/dispatches',
+ json_encode([
+ 'event_type' => $this->theme->display( 'Name' ),
+ 'client_payload' => [
+ 'theme_slug' => $this->theme_slug,
+ 'theme_zip' => "https://wordpress.org/themes/download/{$this->theme_slug}.{$this->theme->display( 'Version' )}.zip?nostats=1",
+ 'accessible_ready' => in_array( 'accessibility-ready', $this->theme->get( 'Tags' ) ),
+ 'trac_ticket_id' => $ticket_id,
+ ],
+ ])
+ );
+
+ // Upon failure a message is returned, success returns nothing.
+ return empty( $api );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Helper
</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_htmlwpcontentpluginsthemedirectorylibclassgithubphpfromrev10409sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclientsclassgithubphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-github.php (from rev 10409, sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-github.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/theme-directory/lib/class-github.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/lib/class-github.php 2020-10-27 02:41:36 UTC (rev 10410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,128 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Theme_Directory\Lib;
+use Ahc\Jwt\JWT;
+
+/**
+ * Simple GitHub API client.
+ *
+ * @package WordPressdotorg\Theme_Directory
+ */
+class GitHub {
+
+ public static function api( $url, $args = null, $headers = [], $method = null ) {
+ // Verify the configuration variables are available.
+ // This re-uses the Plugin Directory constants deliberately.
+ if ( ! defined( 'PLUGIN_GITHUB_APP_ID' ) || ! defined( 'PLUGIN_GITHUB_APP_PRIV_KEY' ) ) {
+ return false;
+ }
+
+ // Prepend GitHub URL for relative URLs, not all API URI's are on api.github.com, which is why we support full URI's.
+ if ( '/' === substr( $url, 0, 1 ) ) {
+ $url = 'https://api.github.com' . $url;
+ }
+
+ $request = wp_remote_request(
+ $url,
+ array(
+ 'method' => $method ?: ( is_null( $args ) ? 'GET' : 'POST' ),
+ 'headers' => array_merge(
+ [
+ 'Accept' => 'application/vnd.github.machine-man-preview+json',
+ 'Authorization' => 'BEARER ' . self::get_app_install_token(),
+ ],
+ $headers
+ ),
+ 'body' => $args ?: null,
+ )
+ );
+
+ return json_decode( wp_remote_retrieve_body( $request ) );
+ }
+
+ /**
+ * Fetch an App Authorization token for accessing Github Resources.
+ */
+ protected static function get_app_install_token() {
+ $token = get_site_transient( __CLASS__ . 'app_install_token' );
+ if ( $token && is_array( $token ) && $token['exp'] > time() ) {
+ return $token['token'];
+ }
+
+ $jwt_token = self::get_jwt_app_token();
+ if ( ! $jwt_token ) {
+ return false;
+ }
+
+ $installs = wp_remote_get(
+ 'https://api.github.com/app/installations',
+ array(
+ 'headers' => array(
+ 'Accept' => 'application/vnd.github.machine-man-preview+json',
+ 'Authorization' => 'BEARER ' . $jwt_token,
+ ),
+ )
+ );
+
+ $installs = is_wp_error( $installs ) ? false : json_decode( wp_remote_retrieve_body( $installs ) );
+
+ if ( ! $installs || empty( $installs[0]->access_tokens_url ) ) {
+ return false;
+ }
+
+ $access_token = wp_remote_post(
+ $installs[0]->access_tokens_url,
+ array(
+ 'headers' => array(
+ 'Accept' => 'application/vnd.github.machine-man-preview+json',
+ 'Authorization' => 'BEARER ' . $jwt_token,
+ ),
+ )
+ );
+
+ $access_token = is_wp_error( $access_token ) ? false : json_decode( wp_remote_retrieve_body( $access_token ) );
+ if ( ! $access_token || empty( $access_token->token ) ) {
+ return false;
+ }
+
+ $token = $access_token->token;
+ $token_exp = strtotime( $access_token->expires_at );
+
+ // Cache the token for 1 minute less than what it's valid for.
+ $exp = $token_exp - time() - MINUTE_IN_SECONDS;
+ set_site_transient( __CLASS__ . 'app_install_token', [ 'exp' => time() + $exp, 'token' => $token ], $exp );
+
+ return $token;
+ }
+
+ /**
+ * Generate a JWT Authorization token for the Github /app API endpoints.
+ */
+ protected static function get_jwt_app_token() {
+ $token = get_site_transient( __CLASS__ . 'app_token' );
+ if ( $token && is_array( $token ) && $token['exp'] > time() ) {
+ return $token['token'];
+ }
+
+ // This should be replaced with an Autoloader.
+ if ( ! class_exists( 'Ahc\Jwt\JWT' ) ) {
+ require_once __DIR__ . '/adhocore-php-jwt/JWTException.php';
+ require_once __DIR__ . '/adhocore-php-jwt/ValidatesJWT.php';
+ require_once __DIR__ . '/adhocore-php-jwt/JWT.php';
+ }
+
+ $key = openssl_pkey_get_private( base64_decode( PLUGIN_GITHUB_APP_PRIV_KEY ) );
+ $jwt = new JWT( $key, 'RS256' );
+
+ $token = $jwt->encode( array(
+ 'iat' => time(),
+ 'exp' => time() + 10 * MINUTE_IN_SECONDS,
+ 'iss' => PLUGIN_GITHUB_APP_ID,
+ ) );
+
+ // Cache it for 9 mins (It's valid for 10min).
+ $exp = 9 * MINUTE_IN_SECONDS;
+ set_site_transient( __CLASS__ . 'app_token', [ 'exp' => time() + $exp, 'token' => $token ], $exp );
+
+ return $token;
+ }
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></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/theme-directory/theme-directory.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/theme-directory/theme-directory.php 2020-10-26 06:59:10 UTC (rev 10409)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2020-10-27 02:41:36 UTC (rev 10410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +34,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include __DIR__ . '/jobs/class-trac-sync.php';
</span><span class="cx" style="display: block; padding: 0 10px"> new WordPressdotorg\Theme_Directory\Jobs\Manager();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Load the GitHub API client.
+include __DIR__ . '/lib/class-github.php';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WPORG_THEMES_DEFAULT_BROWSE', 'popular' );
</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( 'WPORG_THEMES_E2E_REPO', 'WordPress/theme-review-e2e' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Things to change on activation.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>