<!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>[10998] sites/trunk/api.wordpress.org/public_html/translations: Translations API: Harden the API against invalid input.</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/10998">10998</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/10998","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>2021-05-27 00:42:54 +0000 (Thu, 27 May 2021)</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'>Translations API: Harden the API against invalid input.
This prevents PHP Warnings and hopefully will flag to users of the API when they call it incorrectly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmltranslationscore10indexphp">sites/trunk/api.wordpress.org/public_html/translations/core/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmltranslationslibphp">sites/trunk/api.wordpress.org/public_html/translations/lib.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmltranslationsplugins10indexphp">sites/trunk/api.wordpress.org/public_html/translations/plugins/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmltranslationsthemes10indexphp">sites/trunk/api.wordpress.org/public_html/translations/themes/1.0/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmltranslationscore10indexphp"></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/translations/core/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/translations/core/1.0/index.php 2021-05-26 23:16:03 UTC (rev 10997)
+++ sites/trunk/api.wordpress.org/public_html/translations/core/1.0/index.php 2021-05-27 00:42:54 UTC (rev 10998)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( $base_dir . '/includes/object-cache.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$version = isset( $_REQUEST['version'] ) ? str_replace( '-src', '', $_REQUEST['version'] ) : WP_CORE_LATEST_RELEASE;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$version = WP_CORE_LATEST_RELEASE;
+if ( isset( $_REQUEST['version'] ) ) {
+ $version = $_REQUEST['version'];
+ if ( ! is_string( $version ) || ! is_numeric( $version[0] ) ) {
+ header( $_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request' );
+ die( '?version= must be a valid WordPress version' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $version = str_replace( '-src', '', $version );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $translations = find_all_translations_for_core( $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Origin: *' );
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmltranslationslibphp"></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/translations/lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/translations/lib.php 2021-05-26 23:16:03 UTC (rev 10997)
+++ sites/trunk/api.wordpress.org/public_html/translations/lib.php 2021-05-27 00:42:54 UTC (rev 10998)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $version = WP_CORE_LATEST_RELEASE;
</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">+ // Optimize against junk inputs.
+ if ( ! $domain || ! is_string( $domain ) ) {
+ return array();
+ }
+ if ( $version && ! is_string( $version ) ) {
+ return array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $cache_group = 'translations-query';
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_time = 900; // 15 min
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key = "$type:$domain:$version";
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmltranslationsplugins10indexphp"></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/translations/plugins/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/translations/plugins/1.0/index.php 2021-05-26 23:16:03 UTC (rev 10997)
+++ sites/trunk/api.wordpress.org/public_html/translations/plugins/1.0/index.php 2021-05-27 00:42:54 UTC (rev 10998)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,9 +7,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( $base_dir . '/includes/object-cache.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$slug = isset( $_REQUEST['slug'] ) ? $_REQUEST['slug'] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$slug = isset( $_REQUEST['slug'] ) ? $_REQUEST['slug'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $version = isset( $_REQUEST['version'] ) ? $_REQUEST['version'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( [ 'slug', 'version' ] as $field ) {
+ if ( $$field && ! is_string( $$field ) ) {
+ header( $_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request' );
+ die( "?{$field}= invalid." );
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $translations = find_all_translations_for_type_and_domain( 'plugin', $slug, $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> call_headers( 'application/json' );
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmltranslationsthemes10indexphp"></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/translations/themes/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/translations/themes/1.0/index.php 2021-05-26 23:16:03 UTC (rev 10997)
+++ sites/trunk/api.wordpress.org/public_html/translations/themes/1.0/index.php 2021-05-27 00:42:54 UTC (rev 10998)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,9 +7,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( $base_dir . '/includes/object-cache.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$slug = isset( $_REQUEST['slug'] ) ? $_REQUEST['slug'] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$slug = isset( $_REQUEST['slug'] ) ? $_REQUEST['slug'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $version = isset( $_REQUEST['version'] ) ? $_REQUEST['version'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( [ 'slug', 'version' ] as $field ) {
+ if ( $$field && ! is_string( $$field ) ) {
+ header( $_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request' );
+ die( "?{$field}= invalid." );
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $translations = find_all_translations_for_type_and_domain( 'theme', $slug, $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> call_headers( 'application/json' );
</span></span></pre>
</div>
</div>
</body>
</html>