Make wpt server generate its certificates in layout test results folder
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Aug 2016 21:06:36 +0000 (21:06 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Aug 2016 21:06:36 +0000 (21:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160422

Patch by Youenn Fablet <youenn@apple.com> on 2016-08-01
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

* resources/_wpt_certs/.gitignore: Removed.
* resources/_wpt_certs/localhost.key: Removed.
* resources/_wpt_certs/localhost.pem: Removed.
* resources/config.json:

Tools:

* Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
(WebPlatformTestServer._copy_webkit_test_files): Setting certificate folder to layout tests results directory.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203987 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/resources/_wpt_certs/.gitignore [deleted file]
LayoutTests/imported/w3c/resources/_wpt_certs/localhost.key [deleted file]
LayoutTests/imported/w3c/resources/_wpt_certs/localhost.pem [deleted file]
LayoutTests/imported/w3c/resources/config.json
Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py

index d257001..e068a47 100644 (file)
@@ -1,3 +1,15 @@
+2016-08-01  Youenn Fablet  <youenn@apple.com>
+
+        Make wpt server generate its certificates in layout test results folder
+        https://bugs.webkit.org/show_bug.cgi?id=160422
+
+        Reviewed by Chris Dumez.
+
+        * resources/_wpt_certs/.gitignore: Removed.
+        * resources/_wpt_certs/localhost.key: Removed.
+        * resources/_wpt_certs/localhost.pem: Removed.
+        * resources/config.json:
+
 2016-07-30  Chris Dumez  <cdumez@apple.com>
 
         Enable strict type checking for Window dictionary members
diff --git a/LayoutTests/imported/w3c/resources/_wpt_certs/.gitignore b/LayoutTests/imported/w3c/resources/_wpt_certs/.gitignore
deleted file mode 100644 (file)
index 65ce1fb..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-index.txt
-serial
diff --git a/LayoutTests/imported/w3c/resources/_wpt_certs/localhost.key b/LayoutTests/imported/w3c/resources/_wpt_certs/localhost.key
deleted file mode 100644 (file)
index 88bb821..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA0ws4osSNePrryd7FI9TWVDnqtfqv3Q3bnETLnR++6JsB/CaS
-ZKxiabp3ZkzPgofJl+s875aJD170jQNaIkWChuaXCg+SQ0J7ujD1aSKygZ/Rn4zl
-+IE0RN7E02RkVFqB2HuXUBJAxl2y42FeoOKLkxeM5jeKxQqxFDWznvUOD7GkCJRk
-WzRuH12raPgFvJ7znTZb90n7Rc1DN63ezG7+HtmVhk/rOnFYgLgkOaTlMEfYyIt0
-K7A21hsakyTW/cg+gfX8N2uvcJ2mT5Y3rP/IEFBMaCIuDfz1WBBrGbPwB7dB9KOR
-QJY+FyumaNF5BiVERbeKSJwT/PHX0ATAoXDTUQIDAQABAoIBAQCSGS2O+JSbkNFU
-QaSmBnyNeD601iOS2zoRt0phro1hx5UbMrSbfv7uBIkNx9TLnyb+xXm8vrCJdInF
-aPGn0gjnTJB5BYiSiV7P6X6q1rtOow3h7w9w9jjyCGmnkdMm1jUXYY/BfbFb4Zeq
-c0ioBczr+hyvbvnhKGKoA/kh7LFcSLJFjwFHGKzkdL6R1AS8NJnPFmQzLMdDy1jk
-NgF+hU4/ofCWrg48gfeQkf4XuBep4jUtnuS6m39v4qhd78AEP/PUZGE3TzCkj+dV
-RIvK/a4dV0D6I+p1BiumMJh50cDfvlfynK102qoXrZk3AmyUFKrEdqjeMwDQjMg5
-t4njogwBAoGBAPbux5KSjUglB4rFLSiVlQbKrbiDLl8yCwd16TJY45xJed8mRXfF
-BSsyIWyoT58jxgUUkuKLKFh1zaHHC56/O8BOufo2dHbvExrFtmu4Y26eoHZlkgwq
-K9JslL6mQ+eFTX0/pxl2sRaQsRwEN4tDxY2TTohX32/HwRr7WLKMqMjBAoGBANrL
-FA2FijUZb1mQoeai8AC4VArBY6hlvhZ+29DQp4pGRTUwhUwE7K0KpI9wY/QczcJk
-dd3seqdEqK2AadSXDD3N+2heR/MwFj7h81Y1O6VE/VXnRTB7aHNjILjeNLsldJZH
-ng+VWbKGDqYPmlfNxrcDHTmvQroXpdzccArV8J6RAoGAXNfgn8KMbmDF2i5S0VyU
-gM45zRM9nztQnEiAGpcDVWLm+LkKC4M/c0NQ/+q0rTAlJwnaRGVwEPqSC06sls5u
-J9sx39sTpRg0xa8q7IuSjygDSyDbbcl5Wo/KyXf4NheP0BTbvh47bTGP9em7/JfJ
-snZ9Y5QuhXfEqmFwswlh+MECgYEAwt3QlGJ1v+lRdVIOAJ7qZ5nEsHehzSAg92Qx
-X4AXWF5R0ZfPgO955HzwKBkPzSHCWPqkx+2RKF1MZotSttd5Paqx2jjumDgh+AvC
-cOukngQeJl5/Dzk6xFprkHvIN06a0iYjLvn0E762WUzYSI+sBuAtLW1dXuUlAtsK
-p3v4fSECgYEAiOCXWf7JiushOwuRIVdYdAphMpU0fLKTyShksar8ljeZZUys3J8l
-3CPR0/hXKweqgj757l3k8TUtz45uxCPqpujldrHw/Cv7Afr0EWn40fRPrq662owy
-0zfXxhBGhIBMbCmenI5TO7I8xzK+BL6ZPS/GVrMYNZitxIUbC5UNCF8=
------END RSA PRIVATE KEY-----
diff --git a/LayoutTests/imported/w3c/resources/_wpt_certs/localhost.pem b/LayoutTests/imported/w3c/resources/_wpt_certs/localhost.pem
deleted file mode 100644 (file)
index acb3742..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 8520248 (0x820238)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=web-platform-tests
-        Validity
-            Not Before: Jun 30 06:45:36 2016 GMT
-            Not After : Jul 30 06:45:36 2016 GMT
-        Subject: CN=localhost
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (2048 bit)
-                Modulus (2048 bit):
-                    00:d3:0b:38:a2:c4:8d:78:fa:eb:c9:de:c5:23:d4:
-                    d6:54:39:ea:b5:fa:af:dd:0d:db:9c:44:cb:9d:1f:
-                    be:e8:9b:01:fc:26:92:64:ac:62:69:ba:77:66:4c:
-                    cf:82:87:c9:97:eb:3c:ef:96:89:0f:5e:f4:8d:03:
-                    5a:22:45:82:86:e6:97:0a:0f:92:43:42:7b:ba:30:
-                    f5:69:22:b2:81:9f:d1:9f:8c:e5:f8:81:34:44:de:
-                    c4:d3:64:64:54:5a:81:d8:7b:97:50:12:40:c6:5d:
-                    b2:e3:61:5e:a0:e2:8b:93:17:8c:e6:37:8a:c5:0a:
-                    b1:14:35:b3:9e:f5:0e:0f:b1:a4:08:94:64:5b:34:
-                    6e:1f:5d:ab:68:f8:05:bc:9e:f3:9d:36:5b:f7:49:
-                    fb:45:cd:43:37:ad:de:cc:6e:fe:1e:d9:95:86:4f:
-                    eb:3a:71:58:80:b8:24:39:a4:e5:30:47:d8:c8:8b:
-                    74:2b:b0:36:d6:1b:1a:93:24:d6:fd:c8:3e:81:f5:
-                    fc:37:6b:af:70:9d:a6:4f:96:37:ac:ff:c8:10:50:
-                    4c:68:22:2e:0d:fc:f5:58:10:6b:19:b3:f0:07:b7:
-                    41:f4:a3:91:40:96:3e:17:2b:a6:68:d1:79:06:25:
-                    44:45:b7:8a:48:9c:13:fc:f1:d7:d0:04:c0:a1:70:
-                    d3:51
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            X509v3 Subject Key Identifier: 
-                08:5C:1A:E2:46:32:A0:FE:12:5C:EF:AE:46:EA:1E:4C:7C:33:38:66
-            X509v3 Authority Key Identifier: 
-                keyid:BF:E0:6C:A6:B2:1C:ED:B6:5A:DB:83:D6:8E:88:98:F2:42:5F:1F:AC
-
-            X509v3 Key Usage: 
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-            X509v3 Subject Alternative Name: 
-                DNS:localhost, DNS:www.localhost, DNS:xn--n8j6ds53lwwkrqhv28a.localhost, DNS:xn--lve-6lad.localhost, DNS:www2.localhost, DNS:www1.localhost
-    Signature Algorithm: sha256WithRSAEncryption
-        0f:2c:e2:88:04:93:1c:b0:86:c7:55:bd:4e:89:77:c3:cc:a6:
-        4a:68:da:b9:26:2f:16:f4:ec:5a:ec:6c:60:62:e6:5e:7b:a6:
-        2a:92:6a:d5:fc:b6:3e:7f:a1:4b:b7:c2:81:39:ab:66:fd:95:
-        05:e9:41:2f:75:75:70:6c:6e:ce:1d:f2:25:2c:98:49:43:4c:
-        21:6e:33:9e:ae:34:4c:42:2c:17:fa:cf:d1:fb:35:7e:ac:b7:
-        f4:d4:8c:a4:ce:75:19:e0:35:ad:66:8f:c3:c6:7d:2f:cb:af:
-        ee:94:ae:12:b6:17:3d:52:60:a9:1b:a9:91:4c:ce:ee:d1:02:
-        ac:a5:5a:c5:75:65:e6:7f:60:45:77:b9:6d:32:e1:90:0b:5d:
-        d4:67:bd:05:27:82:3b:bb:b1:db:19:b1:84:72:56:17:73:67:
-        a8:b5:13:ba:76:a1:b6:0b:27:20:96:f4:9f:ee:88:db:a0:fb:
-        47:36:4d:21:04:48:28:44:73:7e:22:a4:90:92:b2:54:90:b3:
-        3b:97:c9:79:f8:d6:0f:8a:b3:16:46:b3:b6:b8:13:b9:a4:c7:
-        37:e7:e9:82:b5:49:07:45:3b:06:51:32:6c:54:95:c7:57:fc:
-        12:d4:e0:9e:c0:93:4b:a3:6d:0d:73:8f:78:d8:14:b3:5c:75:
-        e5:b5:60:b9
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIEAIICODANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJ3
-ZWItcGxhdGZvcm0tdGVzdHMwHhcNMTYwNjMwMDY0NTM2WhcNMTYwNzMwMDY0NTM2
-WjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDTCziixI14+uvJ3sUj1NZUOeq1+q/dDducRMudH77omwH8JpJkrGJp
-undmTM+Ch8mX6zzvlokPXvSNA1oiRYKG5pcKD5JDQnu6MPVpIrKBn9GfjOX4gTRE
-3sTTZGRUWoHYe5dQEkDGXbLjYV6g4ouTF4zmN4rFCrEUNbOe9Q4PsaQIlGRbNG4f
-Xato+AW8nvOdNlv3SftFzUM3rd7Mbv4e2ZWGT+s6cViAuCQ5pOUwR9jIi3QrsDbW
-GxqTJNb9yD6B9fw3a69wnaZPljes/8gQUExoIi4N/PVYEGsZs/AHt0H0o5FAlj4X
-K6Zo0XkGJURFt4pInBP88dfQBMChcNNRAgMBAAGjgfAwge0wCQYDVR0TBAIwADAd
-BgNVHQ4EFgQUCFwa4kYyoP4SXO+uRuoeTHwzOGYwHwYDVR0jBBgwFoAUv+BsprIc
-7bZa24PWjoiY8kJfH6wwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoGCCsGAQUFBwMB
-MH4GA1UdEQR3MHWCCWxvY2FsaG9zdIINd3d3LmxvY2FsaG9zdIIheG4tLW44ajZk
-czUzbHd3a3JxaHYyOGEubG9jYWxob3N0ghZ4bi0tbHZlLTZsYWQubG9jYWxob3N0
-gg53d3cyLmxvY2FsaG9zdIIOd3d3MS5sb2NhbGhvc3QwDQYJKoZIhvcNAQELBQAD
-ggEBAA8s4ogEkxywhsdVvU6Jd8PMpkpo2rkmLxb07FrsbGBi5l57piqSatX8tj5/
-oUu3woE5q2b9lQXpQS91dXBsbs4d8iUsmElDTCFuM56uNExCLBf6z9H7NX6st/TU
-jKTOdRngNa1mj8PGfS/Lr+6UrhK2Fz1SYKkbqZFMzu7RAqylWsV1ZeZ/YEV3uW0y
-4ZALXdRnvQUngju7sdsZsYRyVhdzZ6i1E7p2obYLJyCW9J/uiNug+0c2TSEESChE
-c34ipJCSslSQszuXyXn41g+KsxZGs7a4E7mkxzfn6YK1SQdFOwZRMmxUlcdX/BLU
-4J7Ak0ujbQ1zj3jYFLNcdeW1YLk=
------END CERTIFICATE-----
index 4e879a5..3de1b96 100644 (file)
          "openssl": {
              "openssl_binary": "openssl",
              "base_path": "%CERTS_DIR%",
-             "base_conf_path": null,
              "force_regenerate": false
          },
          "pregenerated": {
-             "host_key_path":  "%CERTS_DIR%/localhost.key",
-             "host_cert_path":  "%CERTS_DIR%/localhost.pem"
+             "host_key_path": null,
+             "host_cert_path": null
          },
          "none": {}
         }
index 0b920be..8e0dbd5 100644 (file)
@@ -1,3 +1,13 @@
+2016-08-01  Youenn Fablet  <youenn@apple.com>
+
+        Make wpt server generate its certificates in layout test results folder
+        https://bugs.webkit.org/show_bug.cgi?id=160422
+
+        Reviewed by Chris Dumez.
+
+        * Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:
+        (WebPlatformTestServer._copy_webkit_test_files): Setting certificate folder to layout tests results directory.
+
 2016-08-01  Jonathan Bedard  <jbedard@apple.com>
 
         Function Call on NULL Object
index d0753f9..51c95bb 100755 (executable)
@@ -115,7 +115,7 @@ class WebPlatformTestServer(http_server_base.HttpServerBase):
         _log.debug('Copying WebKit web platform server config.json')
         config_wk_filename = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "config.json")
         if self._filesystem.isfile(config_wk_filename):
-            config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "_wpt_certs"))
+            config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "_wpt_certs"))
             self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json)
 
         wpt_testharnessjs_file = self._filesystem.join(self._doc_root, "resources", "testharness.js")