<!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>[260965] 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/260965">260965</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2020-04-30 14:15:19 -0700 (Thu, 30 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>results.webkit.org: Sort out certificates on Catalina
https://bugs.webkit.org/show_bug.cgi?id=202837
<rdar://problem/56177210>

Reviewed by Alex Christensen.

* Scripts/run-javascriptcore-tests:
(uploadResults): Do not allow insecure requests.
* Scripts/webkitpy/results/upload.py:
(Upload.upload): Verify ssl certificates.
(Upload.upload_archive): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
<li><a href="#trunkToolsScriptswebkitpyresultsuploadpy">trunk/Tools/Scripts/webkitpy/results/upload.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260964 => 260965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-30 20:50:33 UTC (rev 260964)
+++ trunk/Tools/ChangeLog       2020-04-30 21:15:19 UTC (rev 260965)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2020-04-30  Jonathan Bedard  <jbedard@apple.com>
+
+        results.webkit.org: Sort out certificates on Catalina
+        https://bugs.webkit.org/show_bug.cgi?id=202837
+        <rdar://problem/56177210>
+
+        Reviewed by Alex Christensen.
+
+        * Scripts/run-javascriptcore-tests:
+        (uploadResults): Do not allow insecure requests.
+        * Scripts/webkitpy/results/upload.py:
+        (Upload.upload): Verify ssl certificates.
+        (Upload.upload_archive): Ditto.
+
</ins><span class="cx"> 2020-04-30  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Add SPI to change a WKWebView's CORS disabling pattern after initialization
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (260964 => 260965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests     2020-04-30 20:50:33 UTC (rev 260964)
+++ trunk/Tools/Scripts/run-javascriptcore-tests        2020-04-30 21:15:19 UTC (rev 260965)
</span><span class="lines">@@ -938,13 +938,8 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     print "Uploading results to $report\n";
</span><ins>+    open(HANDLE, "|-", "curl -X POST $report/api/upload -H 'Content-Type: application/json' -f -d '\@-'") or die "Failed to open curl";
</ins><span class="cx"> 
</span><del>-    my $sslOptions = '';
-    if (!isAppleMacWebKit()) {
-        $sslOptions = '--insecure';
-    }
-    open(HANDLE, "|-", "curl -X POST $report/api/upload -H 'Content-Type: application/json' $sslOptions -f -d '\@-'") or die "Failed to open curl";
-
</del><span class="cx">     # Json conforming to https://results.webkit.org/documentation#API-Uploads.
</span><span class="cx">     my $encodedUpload = encode_json(\%upload);
</span><span class="cx">     print HANDLE "$encodedUpload\n\0";
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyresultsuploadpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/results/upload.py (260964 => 260965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/results/upload.py   2020-04-30 20:50:33 UTC (rev 260964)
+++ trunk/Tools/Scripts/webkitpy/results/upload.py      2020-04-30 21:15:19 UTC (rev 260965)
</span><span class="lines">@@ -184,7 +184,6 @@
</span><span class="cx">                 '{}{}'.format(hostname, self.UPLOAD_ENDPOINT),
</span><span class="cx">                 headers={'Content-type': 'application/json'},
</span><span class="cx">                 data=json.dumps(data),
</span><del>-                verify=False,
</del><span class="cx">             )
</span><span class="cx">         except requests.exceptions.ConnectionError:
</span><span class="cx">             log_line_func(' ' * 4 + 'Failed to upload to {}, results server not online'.format(hostname))
</span><span class="lines">@@ -222,7 +221,6 @@
</span><span class="cx">                 '{}{}'.format(hostname, self.ARCHIVE_UPLOAD_ENDPOINT),
</span><span class="cx">                 data=meta_data,
</span><span class="cx">                 files=dict(file=archive),
</span><del>-                verify=False,
</del><span class="cx">             )
</span><span class="cx"> 
</span><span class="cx">         except requests.exceptions.ConnectionError:
</span></span></pre>
</div>
</div>

</body>
</html>