227023 2021-06-15 05:24:15 -0700 [GLIB] Pass a GTlsCertificate to soup_server_new() 2021-06-17 01:39:26 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro webkit-bug-importer oldest_to_newest 1769755 0 cgarcia 2021-06-15 05:24:15 -0700 Instead of using soup_server_set_ssl_cert_file() that will be removed from libsoup soon. 1769756 1 431425 cgarcia 2021-06-15 05:25:57 -0700 Created attachment 431425 Patch 1769758 2 431425 mcatanzaro 2021-06-15 05:38:51 -0700 Comment on attachment 431425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431425&action=review > Tools/TestWebKitAPI/glib/WebKitGLib/WebKitTestServer.cpp:40 > + certificate = adoptGRef(g_tls_certificate_new_from_files(sslCertificateFile.get(), sslKeyFile.get(), nullptr)); Bonus points if you pass an error parameter and g_assert_no_error() before the g_assert_nonnull(). That will give us a better error message in the unlikely event that it ever starts to fail in the future. 1770549 3 cgarcia 2021-06-17 01:38:57 -0700 Committed r278977 (238903@main): <https://commits.webkit.org/238903@main> 1770550 4 webkit-bug-importer 2021-06-17 01:39:26 -0700 <rdar://problem/79439185> 431425 2021-06-15 05:25:57 -0700 2021-06-15 08:00:22 -0700 Patch wk-soup-server-cert.diff text/plain 2087 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlZDcx NGZmODMxMTQuLjJmMjhjMjkwODQ0MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA2LTE1ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR0xJQl0gUGFzcyBh IEdUbHNDZXJ0aWZpY2F0ZSB0byBzb3VwX3NlcnZlcl9uZXcoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MDIzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiB1c2luZyBzb3VwX3NlcnZl cl9zZXRfc3NsX2NlcnRfZmlsZSgpIHRoYXQgd2lsbCBiZSByZW1vdmVkIGZyb20gbGlic291cCBz b29uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvV2ViS2l0VGVz dFNlcnZlci5jcHA6CisgICAgICAgIChXZWJLaXRUZXN0U2VydmVyOjpXZWJLaXRUZXN0U2VydmVy KToKKwogMjAyMS0wNi0wOCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1QGFwcGxlLmNvbT4KIAogICAg ICAgICBJbmNyZWFzZSBodHRwIHNlcnZlciBsYXVuY2ggdGltZW91dCBvbiBydW4tYmVuY2htYXJr IHNjcmlwdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGli L1dlYktpdFRlc3RTZXJ2ZXIuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdM aWIvV2ViS2l0VGVzdFNlcnZlci5jcHAKaW5kZXggN2QwY2FlM2RhMzM4Li5jNTgzODdmNDY3MTAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dlYktpdFRl c3RTZXJ2ZXIuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ2xpYi9XZWJLaXRHTGliL1dl YktpdFRlc3RTZXJ2ZXIuY3BwCkBAIC0zMiwxNCArMzIsMTYgQEAgV2ViS2l0VGVzdFNlcnZlcjo6 V2ViS2l0VGVzdFNlcnZlcihTZXJ2ZXJPcHRpb25zQml0U2V0IG9wdGlvbnMpCiAgICAgICAgIG1f cXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgiV2ViS2l0VGVzdFNlcnZlciIpOwogICAgIH0KIAot ICAgIG1fc291cFNlcnZlciA9IGFkb3B0R1JlZihzb3VwX3NlcnZlcl9uZXcoInNlcnZlci1oZWFk ZXIiLCAiV2ViS2l0VGVzdFNlcnZlciAiLCBudWxscHRyKSk7Ci0KKyAgICBHUmVmUHRyPEdUbHND ZXJ0aWZpY2F0ZT4gY2VydGlmaWNhdGU7CiAgICAgaWYgKG9wdGlvbnNbU2VydmVySFRUUFNdKSB7 CiAgICAgICAgIENTdHJpbmcgcmVzb3VyY2VzRGlyID0gVGVzdDo6Z2V0UmVzb3VyY2VzRGlyKCk7 CiAgICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gc3NsQ2VydGlmaWNhdGVGaWxlKGdfYnVpbGRfZmls ZW5hbWUocmVzb3VyY2VzRGlyLmRhdGEoKSwgInRlc3QtY2VydC5wZW0iLCBudWxscHRyKSk7CiAg ICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gc3NsS2V5RmlsZShnX2J1aWxkX2ZpbGVuYW1lKHJlc291 cmNlc0Rpci5kYXRhKCksICJ0ZXN0LWtleS5wZW0iLCBudWxscHRyKSk7Ci0gICAgICAgIGdfYXNz ZXJ0X3RydWUoc291cF9zZXJ2ZXJfc2V0X3NzbF9jZXJ0X2ZpbGUobV9zb3VwU2VydmVyLmdldCgp LCBzc2xDZXJ0aWZpY2F0ZUZpbGUuZ2V0KCksIHNzbEtleUZpbGUuZ2V0KCksIG51bGxwdHIpKTsK KyAgICAgICAgY2VydGlmaWNhdGUgPSBhZG9wdEdSZWYoZ190bHNfY2VydGlmaWNhdGVfbmV3X2Zy b21fZmlsZXMoc3NsQ2VydGlmaWNhdGVGaWxlLmdldCgpLCBzc2xLZXlGaWxlLmdldCgpLCBudWxs cHRyKSk7CisgICAgICAgIGdfYXNzZXJ0X25vbm51bGwoY2VydGlmaWNhdGUuZ2V0KCkpOwogICAg IH0KKworICAgIG1fc291cFNlcnZlciA9IGFkb3B0R1JlZihzb3VwX3NlcnZlcl9uZXcoInNlcnZl ci1oZWFkZXIiLCAiV2ViS2l0VGVzdFNlcnZlciAiLCAidGxzLWNlcnRpZmljYXRlIiwgY2VydGlm aWNhdGUuZ2V0KCksIG51bGxwdHIpKTsKIH0KIAogdm9pZCBXZWJLaXRUZXN0U2VydmVyOjpydW4o U291cFNlcnZlckNhbGxiYWNrIHNlcnZlckNhbGxiYWNrKQo=