Changeset 229541 in webkit

Timestamp:

Mar 12, 2018 11:05:36 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[webkitpy] Remove openssl command dependency.
​https://bugs.webkit.org/show_bug.cgi?id=183494

Patch by Basuke Suzuki <Basuke Suzuki> on 2018-03-12
Reviewed by Ryosuke Niwa.

Added Python implementation of PEM file perser and switched to use that
from external openssl command.

• Scripts/webkitpy/common/system/pemfile.py: Added.

(load):
(BadFormatError):
(Pem):
(Pem.init):
(Pem.get):
(Pem.get_all):
(Pem.certificate):
(Pem.private_key):
(Pem.csr):
(Pem.certificate_request):
(Pem.certificate_signing_request):
(_parse_pem_format):
(_parse_pem_format.find_begin):
(_parse_pem_format.find_end):
(_parse_pem_format.sections):

• Scripts/webkitpy/common/system/pemfile_unittest.py: Added.

(PemFileTest):
(PemFileTest.test_parse):
(PemFileTest.test_parse_bad_format):

• Scripts/webkitpy/port/base.py:

(Port.start_websocket_server):
(Port._extract_certificate_from_pem): Deleted.
(Port._extract_private_key_from_pem): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/pemfile.py (added)
• Scripts/webkitpy/common/system/pemfile_unittest.py (added)
• Scripts/webkitpy/port/base.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-03-12  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [webkitpy] Remove openssl command dependency.
+        https://bugs.webkit.org/show_bug.cgi?id=183494
+
+        Reviewed by Ryosuke Niwa.
+
+        Added Python implementation of PEM file perser and switched to use that
+        from external `openssl` command.
+
+        * Scripts/webkitpy/common/system/pemfile.py: Added.
+        (load):
+        (BadFormatError):
+        (Pem):
+        (Pem.__init__):
+        (Pem.get):
+        (Pem.get_all):
+        (Pem.certificate):
+        (Pem.private_key):
+        (Pem.csr):
+        (Pem.certificate_request):
+        (Pem.certificate_signing_request):
+        (_parse_pem_format):
+        (_parse_pem_format.find_begin):
+        (_parse_pem_format.find_end):
+        (_parse_pem_format.sections):
+        * Scripts/webkitpy/common/system/pemfile_unittest.py: Added.
+        (PemFileTest):
+        (PemFileTest.test_parse):
+        (PemFileTest.test_parse_bad_format):
+        * Scripts/webkitpy/port/base.py:
+        (Port.start_websocket_server):
+        (Port._extract_certificate_from_pem): Deleted.
+        (Port._extract_private_key_from_pem): Deleted.
+
 2018-03-12  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -48 +48 @@
 from webkitpy.common.memoized import memoized
 from webkitpy.common.prettypatch import PrettyPatch
-from webkitpy.common.system import path
+from webkitpy.common.system import path, pemfile
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE, VersionNameMap
@@ -992 +992 @@
         return web_platform_test_server.is_wpt_server_running(self)
 
-    def _extract_certificate_from_pem(self, pem_file, destination_certificate_file):
-        return self._executive.run_command(['openssl', 'x509', '-outform', 'pem', '-in', pem_file, '-out', destination_certificate_file], return_exit_code=True) == 0
-
-    def _extract_private_key_from_pem(self, pem_file, destination_private_key_file):
-        return self._executive.run_command(['openssl', 'rsa', '-in', pem_file, '-out', destination_private_key_file], return_exit_code=True) == 0
-
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
@@ -1008 +1002 @@
         self._websocket_server = server
 
+        websocket_server_temporary_directory = self._filesystem.mkdtemp(prefix='webkitpy-websocket-server')
+        self._websocket_server_temporary_directory = websocket_server_temporary_directory
+
         pem_file = self._filesystem.join(self.layout_tests_dir(), "http", "conf", "webkit-httpd.pem")
-        websocket_server_temporary_directory = self._filesystem.mkdtemp(prefix='webkitpy-websocket-server')
+        pem = pemfile.load(self._filesystem, pem_file)
         certificate_file = self._filesystem.join(str(websocket_server_temporary_directory), 'webkit-httpd.crt')
+        self._filesystem.write_text_file(certificate_file, pem.certificate)
         private_key_file = self._filesystem.join(str(websocket_server_temporary_directory), 'webkit-httpd.key')
-        self._websocket_server_temporary_directory = websocket_server_temporary_directory
-        if self._extract_certificate_from_pem(pem_file, certificate_file) and self._extract_private_key_from_pem(pem_file, private_key_file):
-            secure_server = self._websocket_secure_server = websocket_server.PyWebSocket(self, self.results_directory(),
-                                use_tls=True, port=websocket_server.PyWebSocket.DEFAULT_WSS_PORT, private_key=private_key_file, certificate=certificate_file)
-            secure_server.start()
-            self._websocket_secure_server = secure_server
+        self._filesystem.write_text_file(private_key_file, pem.private_key)
+
+        secure_server = self._websocket_secure_server = websocket_server.PyWebSocket(self, self.results_directory(),
+            use_tls=True, port=websocket_server.PyWebSocket.DEFAULT_WSS_PORT, private_key=private_key_file, certificate=certificate_file)
+        secure_server.start()
+        self._websocket_secure_server = secure_server
 
     def start_web_platform_test_server(self, additional_dirs=None, number_of_servers=None):