Title: [260965] trunk/Tools
Revision
260965
Author
[email protected]
Date
2020-04-30 14:15:19 -0700 (Thu, 30 Apr 2020)

Log Message

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-_javascript_core-tests:
(uploadResults): Do not allow insecure requests.
* Scripts/webkitpy/results/upload.py:
(Upload.upload): Verify ssl certificates.
(Upload.upload_archive): Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (260964 => 260965)


--- trunk/Tools/ChangeLog	2020-04-30 20:50:33 UTC (rev 260964)
+++ trunk/Tools/ChangeLog	2020-04-30 21:15:19 UTC (rev 260965)
@@ -1,3 +1,17 @@
+2020-04-30  Jonathan Bedard  <[email protected]>
+
+        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-_javascript_core-tests:
+        (uploadResults): Do not allow insecure requests.
+        * Scripts/webkitpy/results/upload.py:
+        (Upload.upload): Verify ssl certificates.
+        (Upload.upload_archive): Ditto.
+
 2020-04-30  Alex Christensen  <[email protected]>
 
         Add SPI to change a WKWebView's CORS disabling pattern after initialization

Modified: trunk/Tools/Scripts/run-_javascript_core-tests (260964 => 260965)


--- trunk/Tools/Scripts/run-_javascript_core-tests	2020-04-30 20:50:33 UTC (rev 260964)
+++ trunk/Tools/Scripts/run-_javascript_core-tests	2020-04-30 21:15:19 UTC (rev 260965)
@@ -938,13 +938,8 @@
     }
 
     print "Uploading results to $report\n";
+    open(HANDLE, "|-", "curl -X POST $report/api/upload -H 'Content-Type: application/json' -f -d '\@-'") or die "Failed to open curl";
 
-    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";
-
     # Json conforming to https://results.webkit.org/documentation#API-Uploads.
     my $encodedUpload = encode_json(\%upload);
     print HANDLE "$encodedUpload\n\0";

Modified: trunk/Tools/Scripts/webkitpy/results/upload.py (260964 => 260965)


--- 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)
@@ -184,7 +184,6 @@
                 '{}{}'.format(hostname, self.UPLOAD_ENDPOINT),
                 headers={'Content-type': 'application/json'},
                 data=""
-                verify=False,
             )
         except requests.exceptions.ConnectionError:
             log_line_func(' ' * 4 + 'Failed to upload to {}, results server not online'.format(hostname))
@@ -222,7 +221,6 @@
                 '{}{}'.format(hostname, self.ARCHIVE_UPLOAD_ENDPOINT),
                 data=""
                 files=dict(file=archive),
-                verify=False,
             )
 
         except requests.exceptions.ConnectionError:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to