<!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>[163034] trunk/Tools</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">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163034">163034</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-29 12:23:00 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit Bot Watcher's Dashboard: Add support for using HTTP authentication with Buildbot
https://bugs.webkit.org/show_bug.cgi?id=127784
Reviewed by Alexey Proskuryakov.
Implement support for querying a Buildbot that requires HTTP authentication to access it.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot): Add optional argument, options, to pass a dictionary of Buildbot options.
For now, we only support a single option, needsAuthentication, to indicate whether the
Buildbots requires HTTP authentication (defaults to false - HTTP authentication is
not required).
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype.loadLayoutTestResults): Modified to pass JSONP callback name
to JSON.load() using the option dictionary.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue.prototype.update): Modified to pass withCredentials to JSON.load().
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
(JSON.load): Removed optional argument jsonpCallbackName and added optional argument options,
which is a dictionary. The argument jsonpCallbackName is now specified as an entry in the
options dictionary. Added boolean options withCredentials to toggle querying with HTTP
authentication credentials.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (163033 => 163034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-29 20:17:37 UTC (rev 163033)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2014-01-29 20:23:00 UTC (rev 163034)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-Buildbot = function(baseURL, queuesInfo)
</del><ins>+Buildbot = function(baseURL, queuesInfo, options)
</ins><span class="cx"> {
</span><span class="cx"> BaseObject.call(this);
</span><span class="cx">
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> this.baseURL = baseURL;
</span><span class="cx"> this.queues = {};
</span><ins>+ this.needsAuthentication = typeof options === "object" && options.needsAuthentication === true;
</ins><span class="cx">
</span><span class="cx"> for (var id in queuesInfo)
</span><span class="cx"> this.queues[id] = new BuildbotQueue(this, id, queuesInfo[id]);
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (163033 => 163034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-29 20:17:37 UTC (rev 163033)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-29 20:23:00 UTC (rev 163034)
</span><span class="lines">@@ -357,6 +357,6 @@
</span><span class="cx"> console.assert(data.num_missing === this.layoutTestResults.testsWithMissingResults.length);
</span><span class="cx">
</span><span class="cx"> callback();
</span><del>- }.bind(this), "ADD_RESULTS");
</del><ins>+ }.bind(this), {jsonpCallbackName: "ADD_RESULTS"});
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (163033 => 163034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2014-01-29 20:17:37 UTC (rev 163033)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js 2014-01-29 20:23:00 UTC (rev 163034)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> this.sortIterations();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(BuildbotQueue.Event.IterationsAdded, {addedIterations: newIterations});
</span><del>- }.bind(this));
</del><ins>+ }.bind(this), {withCredentials: this.buildbot.needsAuthentication});
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> sortIterations: function()
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js (163033 => 163034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2014-01-29 20:17:37 UTC (rev 163033)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js 2014-01-29 20:23:00 UTC (rev 163034)
</span><span class="lines">@@ -23,13 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-JSON.load = function(url, callback, jsonpCallbackName)
</del><ins>+JSON.load = function(url, callback, options)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(url);
</span><span class="cx">
</span><span class="cx"> if (!(callback instanceof Function))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (typeof options !== "object")
+ options = {};
+
</ins><span class="cx"> var request = new XMLHttpRequest;
</span><span class="cx"> request.onreadystatechange = function() {
</span><span class="cx"> if (this.readyState !== 4)
</span><span class="lines">@@ -37,8 +40,8 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> var responseText = request.responseText;
</span><del>- if (jsonpCallbackName)
- responseText = responseText.replace(new RegExp("^" + jsonpCallbackName + "\\((.*)\\);?$"), "$1");
</del><ins>+ if (options.hasOwnProperty("jsonpCallbackName"))
+ responseText = responseText.replace(new RegExp("^" + options[jsonpCallbackName] + "\\((.*)\\);?$"), "$1");
</ins><span class="cx"> var data = JSON.parse(responseText);
</span><span class="cx"> } catch (e) {
</span><span class="cx"> var data = {error: e.message};
</span><span class="lines">@@ -50,6 +53,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> request.open("GET", url);
</span><ins>+ if (options.hasOwnProperty("withCredentials"))
+ request.withCredentials = options.withCredentials;
</ins><span class="cx"> request.send();
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163033 => 163034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-29 20:17:37 UTC (rev 163033)
+++ trunk/Tools/ChangeLog 2014-01-29 20:23:00 UTC (rev 163034)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-29 Daniel Bates <dabates@apple.com>
+
+ WebKit Bot Watcher's Dashboard: Add support for using HTTP authentication with Buildbot
+ https://bugs.webkit.org/show_bug.cgi?id=127784
+
+ Reviewed by Alexey Proskuryakov.
+
+ Implement support for querying a Buildbot that requires HTTP authentication to access it.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot): Add optional argument, options, to pass a dictionary of Buildbot options.
+ For now, we only support a single option, needsAuthentication, to indicate whether the
+ Buildbots requires HTTP authentication (defaults to false - HTTP authentication is
+ not required).
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (BuildbotIteration.prototype.loadLayoutTestResults): Modified to pass JSONP callback name
+ to JSON.load() using the option dictionary.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
+ (BuildbotQueue.prototype.update): Modified to pass withCredentials to JSON.load().
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Utilities.js:
+ (JSON.load): Removed optional argument jsonpCallbackName and added optional argument options,
+ which is a dictionary. The argument jsonpCallbackName is now specified as an entry in the
+ options dictionary. Added boolean options withCredentials to toggle querying with HTTP
+ authentication credentials.
+
</ins><span class="cx"> 2014-01-29 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> build.webkit.org/dashboard links to an old failing build rather than the most recent
</span></span></pre>
</div>
</div>
</body>
</html>