213596 2020-06-25 05:46:51 -0700 [GTK][WPE] Add webkit_authentication_request_get_security_origin 2020-06-29 00:39:44 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply ews-watchlist gustavo mcatanzaro oldest_to_newest 1666018 0 cgarcia 2020-06-25 05:46:51 -0700 I'm not sure if we should deprecate get_port and get_host, they are convenient to avoid creating a security origin when you just want to get the host, for example. 1666019 1 402727 cgarcia 2020-06-25 05:48:35 -0700 Created attachment 402727 Patch 1666020 2 ews-watchlist 2020-06-25 05:49:43 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1666028 3 402727 mcatanzaro 2020-06-25 07:17:47 -0700 Comment on attachment 402727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402727&action=review > Source/WebKit/UIProcess/API/glib/WebKitAuthenticationRequest.cpp:368 > + return webkitSecurityOriginCreate(SecurityOrigin::create(protocol, protectionSpace.host(), protectionSpace.port())); You could ASSERT(!protocol.isEmpty()) here, just in case. webkitSecurityOriginCreate really will allow creating an invalid WebKitSecurityOrigin with empty protocol. > Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationRequest.h:30 > #include <webkit2/WebKitCredential.h> > +#include <webkit2/WebKitSecurityOrigin.h> > #include <webkit2/WebKitDefines.h> It's misalphabetized. 1666994 4 cgarcia 2020-06-29 00:38:12 -0700 (In reply to Michael Catanzaro from comment #3) > Comment on attachment 402727 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402727&action=review > > > Source/WebKit/UIProcess/API/glib/WebKitAuthenticationRequest.cpp:368 > > + return webkitSecurityOriginCreate(SecurityOrigin::create(protocol, protectionSpace.host(), protectionSpace.port())); > > You could ASSERT(!protocol.isEmpty()) here, just in case. > webkitSecurityOriginCreate really will allow creating an invalid > WebKitSecurityOrigin with empty protocol. How can it be empty if it's set to a literal in a switch handling al possible cases? > > Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationRequest.h:30 > > #include <webkit2/WebKitCredential.h> > > +#include <webkit2/WebKitSecurityOrigin.h> > > #include <webkit2/WebKitDefines.h> > > It's misalphabetized. 1666995 5 cgarcia 2020-06-29 00:39:44 -0700 Committed r263645: <https://trac.webkit.org/changeset/263645> 402727 2020-06-25 05:48:35 -0700 2020-06-25 07:17:47 -0700 Patch wk2-auth-origin.diff text/plain 10335 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNTZlN2M5NDdiMzJiLi43ZWM0ZDI3YzliNzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTkgQEAKKzIwMjAtMDYtMjUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gQWRkIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9y ZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzU5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJldHVybnMgdGhlIHNlY3VyaXR5IG9yaWdpbiBmb3IgdGhlIGF1 dGhlbnRpY2F0aW9uIHByb3RlY3Rpb24gc3BhY2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2dsaWIvV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0LmNwcDoKKyAgICAgICAgKHdlYmtpdF9h dXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0OgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdC5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvd3BlL2RvY3Mvd3BlLTEuMC1zZWN0aW9ucy50eHQ6CisK IDIwMjAtMDYtMjQgIEphbWVzIFNhdmFnZSAgPGphbWVzLnNhdmFnZUBhcHBsZS5jb20+CiAKICAg ICAgICAgVXBzdHJlYW0gaVBhZE9TIDEzLjAgbXVsdGktd2luZG93IHN1cHBvcnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdEF1dGhlbnRpY2F0aW9u UmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRBdXRo ZW50aWNhdGlvblJlcXVlc3QuY3BwCmluZGV4IDYwMDQwYWJkNWVlMC4uYjY0NWNlNTZhMmJkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRBdXRoZW50 aWNhdGlvblJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGli L1dlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdC5jcHAKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNs dWRlICJXZWJDcmVkZW50aWFsLmgiCiAjaW5jbHVkZSAiV2ViS2l0QXV0aGVudGljYXRpb25SZXF1 ZXN0UHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdENyZWRlbnRpYWxQcml2YXRlLmgiCisjaW5j bHVkZSAiV2ViS2l0U2VjdXJpdHlPcmlnaW5Qcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViUHJvdGVj dGlvblNwYWNlLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5o PgogI2luY2x1ZGUgPFdlYkNvcmUvUHJvdGVjdGlvblNwYWNlLmg+CkBAIC0zMjgsNiArMzI5LDQ1 IEBAIGd1aW50IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9wb3J0KFdlYktpdEF1 dGhlbnRpY2F0aW9uUmVxdWVzdCogcmVxdWVzCiAgICAgcmV0dXJuIHJlcXVlc3QtPnByaXYtPmF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLT5jb3JlKCkucHJvdGVjdGlvblNwYWNlKCkucG9ydCgpOwog fQogCisvKioKKyAqIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9v cmlnaW46CisgKiBAcmVxdWVzdDogYSAjV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0CisgKgor ICogR2V0IHRoZSAjV2ViS2l0U2VjdXJpdHlPcmlnaW4gdGhhdCB0aGlzIGF1dGhlbnRpY2F0aW9u IGNoYWxsZW5nZSBpcyBhcHBsaWNhYmxlIHRvLgorICoKKyAqIFJldHVybnM6ICh0cmFuc2ZlciBm dWxsKTogYSBuZXdseSBjcmVhdGVkICNXZWJLaXRTZWN1cml0eU9yaWdpbi4KKyAqCisgKiBTaW5j ZTogMi4zMAorICovCitXZWJLaXRTZWN1cml0eU9yaWdpbiogd2Via2l0X2F1dGhlbnRpY2F0aW9u X3JlcXVlc3RfZ2V0X3NlY3VyaXR5X29yaWdpbihXZWJLaXRBdXRoZW50aWNhdGlvblJlcXVlc3Qq IHJlcXVlc3QpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0FVVEhFTlRJ Q0FUSU9OX1JFUVVFU1QocmVxdWVzdCksIG51bGxwdHIpOworCisgICAgY29uc3QgYXV0byYgcHJv dGVjdGlvblNwYWNlID0gcmVxdWVzdC0+cHJpdi0+YXV0aGVudGljYXRpb25DaGFsbGVuZ2UtPmNv cmUoKS5wcm90ZWN0aW9uU3BhY2UoKTsKKyAgICBTdHJpbmcgcHJvdG9jb2w7CisgICAgc3dpdGNo IChwcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHlwZSgpKSB7CisgICAgY2FzZSBQcm90ZWN0aW9uU3Bh Y2VTZXJ2ZXJIVFRQOgorICAgIGNhc2UgUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQOgorICAgICAg ICBwcm90b2NvbCA9ICJodHRwIl9zOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFByb3RlY3Rp b25TcGFjZVNlcnZlckhUVFBTOgorICAgIGNhc2UgUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQUzoK KyAgICAgICAgcHJvdG9jb2wgPSAiaHR0cHMiX3M7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug UHJvdGVjdGlvblNwYWNlU2VydmVyRlRQOgorICAgIGNhc2UgUHJvdGVjdGlvblNwYWNlUHJveHlG VFA6CisgICAgICAgIHByb3RvY29sID0gImZ0cCJfczsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJGVFBTOgorICAgICAgICBwcm90b2NvbCA9ICJmdHBzIl9z OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFByb3RlY3Rpb25TcGFjZVByb3h5U09DS1M6Cisg ICAgICAgIHByb3RvY29sID0gInNvY2tzIl9zOworICAgICAgICBicmVhazsKKyAgICB9CisgICAg cmV0dXJuIHdlYmtpdFNlY3VyaXR5T3JpZ2luQ3JlYXRlKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo cHJvdG9jb2wsIHByb3RlY3Rpb25TcGFjZS5ob3N0KCksIHByb3RlY3Rpb25TcGFjZS5wb3J0KCkp KTsKK30KKwogLyoqCiAgKiB3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9nZXRfcmVhbG06 CiAgKiBAcmVxdWVzdDogYSAjV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uUmVx dWVzdC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRBdXRoZW50aWNh dGlvblJlcXVlc3QuaAppbmRleCBiMzExYTQ1ZjYzZmQuLjM2MDIxOTJiNjc2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRBdXRoZW50aWNhdGlvblJl cXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhl bnRpY2F0aW9uUmVxdWVzdC5oCkBAIC0yNiw2ICsyNiw3IEBACiAKICNpbmNsdWRlIDxndGsvZ3Rr Lmg+CiAjaW5jbHVkZSA8d2Via2l0Mi9XZWJLaXRDcmVkZW50aWFsLmg+CisjaW5jbHVkZSA8d2Vi a2l0Mi9XZWJLaXRTZWN1cml0eU9yaWdpbi5oPgogI2luY2x1ZGUgPHdlYmtpdDIvV2ViS2l0RGVm aW5lcy5oPgogCiBHX0JFR0lOX0RFQ0xTCkBAIC0xMDksNiArMTEwLDkgQEAgd2Via2l0X2F1dGhl bnRpY2F0aW9uX3JlcXVlc3RfZ2V0X2hvc3QgICAgICAgICAgICAgICAgKFdlYktpdEF1dGhlbnRp Y2F0aW9uUmVxdWUKIFdFQktJVF9BUEkgZ3VpbnQKIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1 ZXN0X2dldF9wb3J0ICAgICAgICAgICAgICAgIChXZWJLaXRBdXRoZW50aWNhdGlvblJlcXVlc3Qg KnJlcXVlc3QpOwogCitXRUJLSVRfQVBJIFdlYktpdFNlY3VyaXR5T3JpZ2luICoKK3dlYmtpdF9h dXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4gICAgIChXZWJLaXRBdXRo ZW50aWNhdGlvblJlcXVlc3QgKnJlcXVlc3QpOworCiBXRUJLSVRfQVBJIGNvbnN0IGdjaGFyICoK IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9yZWFsbSAgICAgICAgICAgICAgIChX ZWJLaXRBdXRoZW50aWNhdGlvblJlcXVlc3QgKnJlcXVlc3QpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMu dHh0IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4w LXNlY3Rpb25zLnR4dAppbmRleCBkNDIxMGE4ZDY1YWQuLjYyYjBlMTA4NmIwOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNl Y3Rpb25zLnR4dAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Vi a2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC0zNDgsNiArMzQ4LDcgQEAgd2Via2l0X2F1dGhl bnRpY2F0aW9uX3JlcXVlc3RfY2FuX3NhdmVfY3JlZGVudGlhbHMKIHdlYmtpdF9hdXRoZW50aWNh dGlvbl9yZXF1ZXN0X3NldF9jYW5fc2F2ZV9jcmVkZW50aWFscwogd2Via2l0X2F1dGhlbnRpY2F0 aW9uX3JlcXVlc3RfZ2V0X2hvc3QKIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9w b3J0Cit3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9nZXRfc2VjdXJpdHlfb3JpZ2luCiB3 ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9pc19yZXRyeQogd2Via2l0X2F1dGhlbnRpY2F0 aW9uX3JlcXVlc3RfZ2V0X3Byb3Bvc2VkX2NyZWRlbnRpYWwKIHdlYmtpdF9hdXRoZW50aWNhdGlv bl9yZXF1ZXN0X3NldF9wcm9wb3NlZF9jcmVkZW50aWFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdC5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRBdXRoZW50aWNhdGlvblJlcXVlc3Qu aAppbmRleCBlNTE0NDE4M2IyMzQuLmJkMTMxZmRhMTk4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XZWJLaXRBdXRoZW50aWNhdGlvblJlcXVlc3QuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dlYktpdEF1dGhlbnRpY2F0aW9uUmVx dWVzdC5oCkBAIC0yNSw2ICsyNSw3IEBACiAjZGVmaW5lIFdlYktpdEF1dGhlbnRpY2F0aW9uUmVx dWVzdF9oCiAKICNpbmNsdWRlIDx3cGUvV2ViS2l0Q3JlZGVudGlhbC5oPgorI2luY2x1ZGUgPHdw ZS9XZWJLaXRTZWN1cml0eU9yaWdpbi5oPgogI2luY2x1ZGUgPHdwZS9XZWJLaXREZWZpbmVzLmg+ CiAKIEdfQkVHSU5fREVDTFMKQEAgLTEwOCw2ICsxMDksOSBAQCB3ZWJraXRfYXV0aGVudGljYXRp b25fcmVxdWVzdF9nZXRfaG9zdCAgICAgICAgICAgICAgICAoV2ViS2l0QXV0aGVudGljYXRpb25S ZXF1ZQogV0VCS0lUX0FQSSBndWludAogd2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0 X3BvcnQgICAgICAgICAgICAgICAgKFdlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdCAqcmVxdWVz dCk7CiAKK1dFQktJVF9BUEkgV2ViS2l0U2VjdXJpdHlPcmlnaW4gKgord2Via2l0X2F1dGhlbnRp Y2F0aW9uX3JlcXVlc3RfZ2V0X3NlY3VyaXR5X29yaWdpbiAgICAgKFdlYktpdEF1dGhlbnRpY2F0 aW9uUmVxdWVzdCAqcmVxdWVzdCk7CisKIFdFQktJVF9BUEkgY29uc3QgZ2NoYXIgKgogd2Via2l0 X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfZ2V0X3JlYWxtICAgICAgICAgICAgICAgKFdlYktpdEF1 dGhlbnRpY2F0aW9uUmVxdWVzdCAqcmVxdWVzdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS93cGUvZG9jcy93cGUtMS4wLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvZG9jcy93cGUtMS4wLXNlY3Rpb25zLnR4dAppbmRleCAw NTkyMDdlNWQ0OWYuLjdkMTIxNGIxY2IxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL3dwZS9kb2NzL3dwZS0xLjAtc2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS93cGUvZG9jcy93cGUtMS4wLXNlY3Rpb25zLnR4dApAQCAtMzUxLDYg KzM1MSw3IEBAIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2Nhbl9zYXZlX2NyZWRlbnRp YWxzCiB3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9zZXRfY2FuX3NhdmVfY3JlZGVudGlh bHMKIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9ob3N0CiB3ZWJraXRfYXV0aGVu dGljYXRpb25fcmVxdWVzdF9nZXRfcG9ydAord2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3Rf Z2V0X3NlY3VyaXR5X29yaWdpbgogd2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfaXNfcmV0 cnkKIHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9wcm9wb3NlZF9jcmVkZW50aWFs CiB3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9zZXRfcHJvcG9zZWRfY3JlZGVudGlhbApk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE1NjMy YWU5MmE4Ni4uMTRmNzAxZmU4NTRiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDYtMjUgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gQWRk IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU5NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgdW5p dCB0ZXN0cyB0byBjaGVjayB0aGUgbmV3IEFQSS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3BwOgorICAgICAgICAodGVzdFdl YlZpZXdBdXRoZW50aWNhdGlvblJlcXVlc3QpOgorICAgICAgICAodGVzdFdlYlZpZXdBdXRoZW50 aWNhdGlvblByb3h5KToKKyAgICAgICAgKHRlc3RXZWJWaWV3QXV0aGVudGljYXRpb25Qcm94eUhU VFBTKToKKwogMjAyMC0wNi0yNCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4K IAogICAgICAgICBtYWNPUyBCaWcgU3VyIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3BwIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RBdXRoZW50aWNhdGlvbi5jcHAK aW5kZXggNTgyNTI4NmFlMDYwLi4xNTQxZjQzMmFkNDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3BwCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0aGVudGljYXRpb24uY3Bw CkBAIC0xMzQsNiArMTM0LDEyIEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3QXV0aGVudGljYXRp b25SZXF1ZXN0KEF1dGhlbnRpY2F0aW9uVGVzdCogdGVzdCwgZ2NvbnN0cG9pCiAgICAgZ19hc3Nl cnRfY21waW50KHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zY2hlbWUocmVxdWVz dCksID09LCBXRUJLSVRfQVVUSEVOVElDQVRJT05fU0NIRU1FX0hUVFBfQkFTSUMpOwogICAgIGdf YXNzZXJ0X2ZhbHNlKHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2lzX2Zvcl9wcm94eShy ZXF1ZXN0KSk7CiAgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVl c3RfaXNfcmV0cnkocmVxdWVzdCkpOworICAgIGF1dG8qIG9yaWdpbiA9IHdlYmtpdF9hdXRoZW50 aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4ocmVxdWVzdCk7CisgICAgZ19hc3Nl cnRfbm9ubnVsbChvcmlnaW4pOworICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlf b3JpZ2luX2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X3NjaGVtZShrU2Vy dmVyLT5iYXNlVVJJKCkpKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIod2Via2l0X3NlY3VyaXR5X29y aWdpbl9nZXRfaG9zdChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X2hvc3Qoa1NlcnZlci0+YmFz ZVVSSSgpKSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dl dF9wb3J0KG9yaWdpbiksID09LCBzb3VwX3VyaV9nZXRfcG9ydChrU2VydmVyLT5iYXNlVVJJKCkp KTsKKyAgICB3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3VucmVmKG9yaWdpbik7CiB9CiAKIHN0YXRp YyB2b2lkIHRlc3RXZWJWaWV3QXV0aGVudGljYXRpb25DYW5jZWwoQXV0aGVudGljYXRpb25UZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQpAQCAtNDYyLDYgKzQ2OCwxMiBAQCBzdGF0aWMgdm9pZCB0 ZXN0V2ViVmlld0F1dGhlbnRpY2F0aW9uUHJveHkoUHJveHlBdXRoZW50aWNhdGlvblRlc3QqIHRl c3QsIGdjb25zdAogICAgIGdfYXNzZXJ0X2NtcGludCh3ZWJraXRfYXV0aGVudGljYXRpb25fcmVx dWVzdF9nZXRfc2NoZW1lKHJlcXVlc3QpLCA9PSwgV0VCS0lUX0FVVEhFTlRJQ0FUSU9OX1NDSEVN RV9IVFRQX0JBU0lDKTsKICAgICBnX2Fzc2VydF90cnVlKHdlYmtpdF9hdXRoZW50aWNhdGlvbl9y ZXF1ZXN0X2lzX2Zvcl9wcm94eShyZXF1ZXN0KSk7CiAgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0 X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfaXNfcmV0cnkocmVxdWVzdCkpOworICAgIGF1dG8qIG9y aWdpbiA9IHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4o cmVxdWVzdCk7CisgICAgZ19hc3NlcnRfbm9ubnVsbChvcmlnaW4pOworICAgIGdfYXNzZXJ0X2Nt cHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgc291 cF91cmlfZ2V0X3NjaGVtZShrU2VydmVyLT5iYXNlVVJJKCkpKTsKKyAgICBnX2Fzc2VydF9jbXBz dHIod2Via2l0X3NlY3VyaXR5X29yaWdpbl9nZXRfaG9zdChvcmlnaW4pLCA9PSwgc291cF91cmlf Z2V0X2hvc3Qoa1NlcnZlci0+YmFzZVVSSSgpKSk7CisgICAgZ19hc3NlcnRfY21wdWludCh3ZWJr aXRfc2VjdXJpdHlfb3JpZ2luX2dldF9wb3J0KG9yaWdpbiksID09LCBzb3VwX3VyaV9nZXRfcG9y dChrU2VydmVyLT5iYXNlVVJJKCkpKTsKKyAgICB3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3VucmVm KG9yaWdpbik7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3QXV0aGVudGljYXRpb25Qcm94 eUhUVFBTKFByb3h5QXV0aGVudGljYXRpb25UZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQpAQCAt NDc4LDYgKzQ5MCwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0F1dGhlbnRpY2F0aW9uUHJv eHlIVFRQUyhQcm94eUF1dGhlbnRpY2F0aW9uVGVzdCogdGVzdCwgZwogICAgIGdfYXNzZXJ0X2Nt cGludCh3ZWJraXRfYXV0aGVudGljYXRpb25fcmVxdWVzdF9nZXRfc2NoZW1lKHJlcXVlc3QpLCA9 PSwgV0VCS0lUX0FVVEhFTlRJQ0FUSU9OX1NDSEVNRV9IVFRQX0JBU0lDKTsKICAgICBnX2Fzc2Vy dF90cnVlKHdlYmtpdF9hdXRoZW50aWNhdGlvbl9yZXF1ZXN0X2lzX2Zvcl9wcm94eShyZXF1ZXN0 KSk7CiAgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfaXNf cmV0cnkocmVxdWVzdCkpOworICAgIGF1dG8qIG9yaWdpbiA9IHdlYmtpdF9hdXRoZW50aWNhdGlv bl9yZXF1ZXN0X2dldF9zZWN1cml0eV9vcmlnaW4ocmVxdWVzdCk7CisgICAgZ19hc3NlcnRfbm9u bnVsbChvcmlnaW4pOworICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2VjdXJpdHlfb3JpZ2lu X2dldF9wcm90b2NvbChvcmlnaW4pLCA9PSwgc291cF91cmlfZ2V0X3NjaGVtZShodHRwc1NlcnZl ci0+YmFzZVVSSSgpKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF9zZWN1cml0eV9vcmln aW5fZ2V0X2hvc3Qob3JpZ2luKSwgPT0sIHNvdXBfdXJpX2dldF9ob3N0KGh0dHBzU2VydmVyLT5i YXNlVVJJKCkpKTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KHdlYmtpdF9zZWN1cml0eV9vcmlnaW5f Z2V0X3BvcnQob3JpZ2luKSwgPT0sIHNvdXBfdXJpX2dldF9wb3J0KGh0dHBzU2VydmVyLT5iYXNl VVJJKCkpKTsKKyAgICB3ZWJraXRfc2VjdXJpdHlfb3JpZ2luX3VucmVmKG9yaWdpbik7CiB9CiAK IHZvaWQgYmVmb3JlQWxsKCkK