199223 2019-06-26 05:30:57 -0700 [SOUP] WebSockets: handle TLS certificate and errors 2019-06-27 01:59:03 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 199151 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1548005 0 cgarcia 2019-06-26 05:30:57 -0700 We need to decide based on the session policy. 1548006 1 372918 cgarcia 2019-06-26 05:33:13 -0700 Created attachment 372918 Patch 1548011 2 372918 mcatanzaro 2019-06-26 06:55:04 -0700 Comment on attachment 372918 Patch So now this is a third place where we check the TLS certificate: (1) the normal non-WebSocket codepath, (2) SocketStreamHandleImplSoup.cpp for the previous WebSocket codepath, and (3) now here, for the new WebSocket codepath. Correct? I think this is OK if SocketStreamHandleImplSoup.cpp goes away and is no longer used with new WebSockets. Is that right? 1548013 3 cgarcia 2019-06-26 07:00:35 -0700 Right, SocketStreamHandleImplSoup.cpp will be removed when we enable the new code patch. 1548064 4 mcatanzaro 2019-06-26 11:02:34 -0700 Honestly it'd make more sense to include this in your patch adding the new WebSocket backend, but whatever. 1548402 5 cgarcia 2019-06-27 01:59:03 -0700 Committed r246878: <https://trac.webkit.org/changeset/246878> 372918 2019-06-26 05:33:13 -0700 2019-06-26 11:01:49 -0700 Patch wk2-websockets-tls.diff text/plain 3012 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYjUyY2JhYzhhNzkuLjUwMDI2NWZkZjg0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE5LTA2LTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbU09VUF0gV2ViU29ja2V0czogaGFuZGxlIFRMUyBjZXJ0aWZpY2F0 ZSBhbmQgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTkyMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb25uZWN0IHRvIGFjY2VwdC1jZXJ0aWZpY2F0ZSBzaWduYWwgb24gdGhlIFdlYlNvY2tl dCBtZXNzYWdlIGNvbm5lY3Rpb24gdG8gZGVjaWRlIHdoYXQgdG8gZG8gaW4gY2FzZSBvZiBUTFMg ZXJyb3JzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNv dXAuY3BwOgorICAgICAgICAoV2ViS2l0Ojp3ZWJTb2NrZXRBY2NlcHRDZXJ0aWZpY2F0ZUNhbGxi YWNrKToKKyAgICAgICAgKFdlYktpdDo6d2ViU29ja2V0TWVzc2FnZU5ldHdvcmtFdmVudENhbGxi YWNrKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Tb3VwOjpjcmVhdGVXZWJTb2Nr ZXRUYXNrKToKKwogMjAxOS0wNi0yNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgV2ViU29ja2V0czogYWRkIHN1cHBvcnQgZm9yIHNlbmRpbmcg YmxvYiBtZXNzYWdlcyB3aGVuIHVzaW5nIHdlYiBzb2NrZXRzIHBsYXRmb3JtIEFQSXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNv dXAuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9u U291cC5jcHAKaW5kZXggNTMzN2Y4NDE3ZTUuLjcwZDkxMzdjNTlkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNw cApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIk5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJh bWV0ZXJzLmgiCiAjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgogI2luY2x1ZGUgIldlYlNv Y2tldFRhc2tTb3VwLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9EZXByZWNhdGVkR2xvYmFsU2V0dGlu Z3MuaD4KICNpbmNsdWRlIDxXZWJDb3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb3VwTmV0 d29ya1Nlc3Npb24uaD4KQEAgLTY3LDYgKzY4LDIyIEBAIHZvaWQgTmV0d29ya1Nlc3Npb25Tb3Vw OjpjbGVhckNyZWRlbnRpYWxzKCkKICNlbmRpZgogfQogCitzdGF0aWMgZ2Jvb2xlYW4gd2ViU29j a2V0QWNjZXB0Q2VydGlmaWNhdGVDYWxsYmFjayhHVGxzQ29ubmVjdGlvbiosIEdUbHNDZXJ0aWZp Y2F0ZSogY2VydGlmaWNhdGUsIEdUbHNDZXJ0aWZpY2F0ZUZsYWdzIGVycm9ycywgU291cE1lc3Nh Z2UqIHNvdXBNZXNzYWdlKQoreworICAgIGlmIChEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmFs bG93c0FueVNTTENlcnRpZmljYXRlKCkpCisgICAgICAgIHJldHVybiBUUlVFOworCisgICAgcmV0 dXJuICFTb3VwTmV0d29ya1Nlc3Npb246OmNoZWNrVExTRXJyb3JzKHNvdXBVUklUb1VSTChzb3Vw X21lc3NhZ2VfZ2V0X3VyaShzb3VwTWVzc2FnZSkpLCBjZXJ0aWZpY2F0ZSwgZXJyb3JzKTsKK30K Kworc3RhdGljIHZvaWQgd2ViU29ja2V0TWVzc2FnZU5ldHdvcmtFdmVudENhbGxiYWNrKFNvdXBN ZXNzYWdlKiBzb3VwTWVzc2FnZSwgR1NvY2tldENsaWVudEV2ZW50IGV2ZW50LCBHSU9TdHJlYW0q IGNvbm5lY3Rpb24pCit7CisgICAgaWYgKGV2ZW50ICE9IEdfU09DS0VUX0NMSUVOVF9UTFNfSEFO RFNIQUtJTkcpCisgICAgICAgIHJldHVybjsKKworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY29ubmVj dGlvbiwgImFjY2VwdC1jZXJ0aWZpY2F0ZSIsIEdfQ0FMTEJBQ0sod2ViU29ja2V0QWNjZXB0Q2Vy dGlmaWNhdGVDYWxsYmFjayksIHNvdXBNZXNzYWdlKTsKK30KKwogc3RkOjp1bmlxdWVfcHRyPFdl YlNvY2tldFRhc2s+IE5ldHdvcmtTZXNzaW9uU291cDo6Y3JlYXRlV2ViU29ja2V0VGFzayhOZXR3 b3JrU29ja2V0Q2hhbm5lbCYgY2hhbm5lbCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQogewogICAgIEdVbmlxdWVQdHI8U291cFVSST4gc291 cFVSSSA9IHJlcXVlc3QuY3JlYXRlU291cFVSSSgpOwpAQCAtNzUsNiArOTIsOCBAQCBzdGQ6OnVu aXF1ZV9wdHI8V2ViU29ja2V0VGFzaz4gTmV0d29ya1Nlc3Npb25Tb3VwOjpjcmVhdGVXZWJTb2Nr ZXRUYXNrKE5ldHdvcmtTbwogCiAgICAgR1JlZlB0cjxTb3VwTWVzc2FnZT4gc291cE1lc3NhZ2Ug PSBhZG9wdEdSZWYoc291cF9tZXNzYWdlX25ld19mcm9tX3VyaShTT1VQX01FVEhPRF9HRVQsIHNv dXBVUkkuZ2V0KCkpKTsKICAgICByZXF1ZXN0LnVwZGF0ZVNvdXBNZXNzYWdlKHNvdXBNZXNzYWdl LmdldCgpKTsKKyAgICBpZiAocmVxdWVzdC51cmwoKS5wcm90b2NvbElzKCJ3c3MiKSkKKyAgICAg ICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVzc2FnZS5nZXQoKSwgIm5ldHdvcmstZXZlbnQiLCBH X0NBTExCQUNLKHdlYlNvY2tldE1lc3NhZ2VOZXR3b3JrRXZlbnRDYWxsYmFjayksIG51bGxwdHIp OwogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFdlYlNvY2tldFRhc2s+KGNoYW5uZWwsIHNv dXBTZXNzaW9uKCksIHNvdXBNZXNzYWdlLmdldCgpLCBwcm90b2NvbCk7CiB9CiAK