187153 2018-06-28 13:07:53 -0700 Early return when handling fetch event in case service worker origin does not match origin of a subresource load 2018-07-02 17:44:37 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez commit-queue ggaren tsavell webkit-bug-importer oldest_to_newest 1437505 0 youennf 2018-06-28 13:07:53 -0700 Early return when handling fetch event in case service worker origin does not match origin of a subresource load 1437506 1 youennf 2018-06-28 13:08:08 -0700 <rdar://problem/41329832> 1437512 2 343841 youennf 2018-06-28 13:21:12 -0700 Created attachment 343841 Patch 1437513 3 343841 cdumez 2018-06-28 13:28:25 -0700 Comment on attachment 343841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343841&action=review > Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:190 > + RELEASE_LOG_ERROR(ServiceWorker, "%{public}s: service worker is %{public}s://...:%d, request URL is %{public}s://...:%d", message, serviceWorkerURL.protocol().utf8().data(), serviceWorkerPort, requestOriginURL.protocol().utf8().data(), requestOriginURLPort); I do not believe logging URLs is OK. 1437536 4 343850 youennf 2018-06-28 14:13:34 -0700 Created attachment 343850 Patch 1437538 5 343850 cdumez 2018-06-28 14:16:31 -0700 Comment on attachment 343850 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343850&action=review > Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:195 > + RELEASE_ASSERT_WITH_MESSAGE(request.url().host() == serviceWorkerURL.host(), "Hosts do not match"); I think we may want this one first as it is the most important, no? > Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:205 > + ASSERT(url.host() == serviceWorkerURL.host()); ditto. 1437587 6 343860 youennf 2018-06-28 15:27:39 -0700 Created attachment 343860 Patch for landing 1437590 7 youennf 2018-06-28 15:28:17 -0700 > > Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:195 > > + RELEASE_ASSERT_WITH_MESSAGE(request.url().host() == serviceWorkerURL.host(), "Hosts do not match"); > > I think we may want this one first as it is the most important, no? Done 1437600 8 343860 commit-queue 2018-06-28 15:45:26 -0700 Comment on attachment 343860 Patch for landing Clearing flags on attachment: 343860 Committed r233335: <https://trac.webkit.org/changeset/233335> 1437601 9 commit-queue 2018-06-28 15:45:28 -0700 All reviewed patches have been landed. Closing bug. 1438611 10 tsavell 2018-07-02 13:49:52 -0700 It looks like after r233335 this test became a flakey timeout: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=imported%2Fw3c%2Fweb-platform-tests%2Fservice-workers%2Fservice-worker%2Fclaim-with-redirect.https.html I built r233335 locally and ran: run-webkit-tests imported/w3c/web-platform-tests/service-workers/service-worker/claim-with-redirect.https.html --iterations 500 -f and out of 500 runs got 18 timeouts. I reproduced this multiple times. I built r233334 locally and ran the same command and received 0 timeout through multiple runs. 1438620 11 youennf 2018-07-02 13:58:16 -0700 (In reply to Truitt Savell from comment #10) > It looks like after r233335 this test became a flakey timeout: > https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard. > html#showAllRuns=true&tests=imported%2Fw3c%2Fweb-platform-tests%2Fservice- > workers%2Fservice-worker%2Fclaim-with-redirect.https.html That is great news!! We are crashing in debug builds: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x0000000207754020 WTFCrash + 16 (Assertions.cpp:267) 1 com.apple.WebKit 0x0000000106b766d3 WebKit::isValidFetch(WebCore::ResourceRequest const&, WebCore::FetchOptions const&, WebCore::URL const&, WTF::String const&) + 1219 (WebSWContextManagerConnection.cpp:204) 2 com.apple.WebKit 0x0000000106b75fad WebKit::WebSWContextManagerConnection::startFetch(WTF::ObjectIdentifier<WebCore::SWServerConnectionIdentifierType>, WTF::ObjectIdentifier<WebCore::ServiceWorkerIdentifierType>, WTF::ObjectIdentifier<WebCore::FetchIdentifierType>, WebCore::ResourceRequest&&, WebCore::FetchOptions&&, IPC::FormDataReference&&, WTF::String&&) + 285 (WebSWContextManagerConnection.cpp:226) 1438625 12 cdumez 2018-07-02 14:06:40 -0700 (In reply to youenn fablet from comment #11) > (In reply to Truitt Savell from comment #10) > > It looks like after r233335 this test became a flakey timeout: > > https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard. > > html#showAllRuns=true&tests=imported%2Fw3c%2Fweb-platform-tests%2Fservice- > > workers%2Fservice-worker%2Fclaim-with-redirect.https.html > > That is great news!! > > We are crashing in debug builds: > Thread 0 Crashed:: Dispatch queue: com.apple.main-thread > 0 com.apple.JavaScriptCore 0x0000000207754020 WTFCrash + 16 > (Assertions.cpp:267) > 1 com.apple.WebKit 0x0000000106b766d3 > WebKit::isValidFetch(WebCore::ResourceRequest const&, WebCore::FetchOptions > const&, WebCore::URL const&, WTF::String const&) + 1219 > (WebSWContextManagerConnection.cpp:204) > 2 com.apple.WebKit 0x0000000106b75fad > WebKit::WebSWContextManagerConnection::startFetch(WTF:: > ObjectIdentifier<WebCore::SWServerConnectionIdentifierType>, > WTF::ObjectIdentifier<WebCore::ServiceWorkerIdentifierType>, > WTF::ObjectIdentifier<WebCore::FetchIdentifierType>, > WebCore::ResourceRequest&&, WebCore::FetchOptions&&, > IPC::FormDataReference&&, WTF::String&&) + 285 > (WebSWContextManagerConnection.cpp:226) So the host is not even matching :/ Seems bad :) 1438734 13 youennf 2018-07-02 17:44:37 -0700 OK, this is just a mistake made in this patch, fix is at https://bugs.webkit.org/show_bug.cgi?id=187282 343841 2018-06-28 13:21:12 -0700 2018-06-28 14:12:21 -0700 Patch bug-187153-20180628132111.patch text/plain 4685 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxYjcyYzgxYzNlMjI3NDQz ZGFjYzU1NWUwYzhmNTk5NWNhNzJhODguLjNmZGFiN2U5ZmM5MDNkODFmNjJmYTdhNjMyNmI4NmIw YWZhNDE4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDYtMjggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEVhcmx5IHJldHVybiB3aGVuIGhh bmRsaW5nIGZldGNoIGV2ZW50IGluIGNhc2Ugc2VydmljZSB3b3JrZXIgb3JpZ2luIGRvZXMgbm90 IG1hdGNoIG9yaWdpbiBvZiBhIHN1YnJlc291cmNlIGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzE1MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDEzMjk4MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3RvcCBjcmFzaGluZyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2VzcyBpbiBjYXNlIGEg c3VicmVzb3VyY2UgbG9hZCBvcmlnaW4gaXMgbm90IG1hdGNoaW5nIGEgc2VydmljZSB3b3JrZXIg b3JpZ2luLgorICAgICAgICBJbnN0ZWFkLCBqdXN0IHJldHVybiBlYXJseSBzbyB0aGF0IHRoZSBs b2FkIHdpbGwgYmUgaGFuZGxlZCBieSB0aGUgbmV0d29yayBwcm9jZXNzLgorCisgICAgICAgIEtl ZXAgY3Jhc2hpbmcgaW4gY2FzZSBhIG5hdmlnYXRpb24gbG9hZCBpcyBub3QgbWF0Y2hpbmcgaXRz IHNlcnZpY2Ugd29ya2VyIG9yaWdpbi4KKyAgICAgICAgQWRkIG1vcmUgbG9nZ2luZyB0byBoZWxw IHdpdGggdGhlIGRlYnVnZ2luZy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJT V0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmxvZ1ZhbGlk RmV0Y2hFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OmlzVmFsaWRGZXRjaCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKToKKwogMjAx OC0wNi0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSGFu ZGxlIHRoZSBjYXNlIG9mIHJlZ2lzdGVyTUROU05hbWVDYWxsYmFjayBjYWxsZWQgc2V2ZXJhbCB0 aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0 b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IDJjZmIzY2ExZDNj YzJhZGY0ZjQ1NmNkY2UwZjY0NzdhNTdmMjA0YzQuLmM1MTVhNTAzZTY1YzBkNjc5NzJmNTY1MDRm N2Q5MDVmNmJkYjQyZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAg LTE4MywyMSArMTgzLDMyIEBAIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246OnNl cnZpY2VXb3JrZXJTdGFydGVkV2l0aE1lc3NhZ2Uoc3RkOjpvcHRpb25hCiAgICAgICAgIG1fY29u bmVjdGlvblRvU3RvcmFnZVByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlNXU2VydmVyVG9Db250 ZXh0Q29ubmVjdGlvbjo6U2NyaXB0Q29udGV4dEZhaWxlZFRvU3RhcnQoam9iRGF0YUlkZW50aWZp ZXIsIHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBleGNlcHRpb25NZXNzYWdlKSwgMCk7CiB9CiAK K3N0YXRpYyBpbmxpbmUgdm9pZCBsb2dWYWxpZEZldGNoRXJyb3IoY29uc3QgY2hhciogbWVzc2Fn ZSwgY29uc3QgVVJMJiBzZXJ2aWNlV29ya2VyVVJMLCBjb25zdCBVUkwmIHJlcXVlc3RPcmlnaW5V UkwpCit7CisgICAgYXV0byBzZXJ2aWNlV29ya2VyUG9ydCA9IHNlcnZpY2VXb3JrZXJVUkwucG9y dCgpID8gKnNlcnZpY2VXb3JrZXJVUkwucG9ydCgpIDogMDsKKyAgICBhdXRvIHJlcXVlc3RPcmln aW5VUkxQb3J0ID0gcmVxdWVzdE9yaWdpblVSTC5wb3J0KCkgPyAqcmVxdWVzdE9yaWdpblVSTC5w b3J0KCkgOiAwOworICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3JrZXIsICIle3B1Ymxp Y31zOiBzZXJ2aWNlIHdvcmtlciBpcyAle3B1YmxpY31zOi8vLi4uOiVkLCByZXF1ZXN0IFVSTCBp cyAle3B1YmxpY31zOi8vLi4uOiVkIiwgbWVzc2FnZSwgc2VydmljZVdvcmtlclVSTC5wcm90b2Nv bCgpLnV0ZjgoKS5kYXRhKCksIHNlcnZpY2VXb3JrZXJQb3J0LCByZXF1ZXN0T3JpZ2luVVJMLnBy b3RvY29sKCkudXRmOCgpLmRhdGEoKSwgcmVxdWVzdE9yaWdpblVSTFBvcnQpOworfQorCiBzdGF0 aWMgaW5saW5lIGJvb2wgaXNWYWxpZEZldGNoKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgY29uc3QgRmV0Y2hPcHRpb25zJiBvcHRpb25zLCBjb25zdCBVUkwmIHNlcnZpY2VXb3JrZXJV UkwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIpCiB7CiAgICAgLy8gRm9yIGV4b3RpYyBzZXJ2aWNl IHdvcmtlcnMsIGRvIG5vdCBlbmZvcmNlIGNoZWNrcy4KICAgICBpZiAoIXNlcnZpY2VXb3JrZXJV UkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAg IGlmIChvcHRpb25zLm1vZGUgPT0gRmV0Y2hPcHRpb25zOjpNb2RlOjpOYXZpZ2F0ZSkKLSAgICAg ICAgcmV0dXJuIHByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbChyZXF1ZXN0LnVybCgpLCBzZXJ2 aWNlV29ya2VyVVJMKTsKKyAgICBpZiAob3B0aW9ucy5tb2RlID09IEZldGNoT3B0aW9uczo6TW9k ZTo6TmF2aWdhdGUgJiYgIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbChyZXF1ZXN0LnVybCgp LCBzZXJ2aWNlV29ya2VyVVJMKSkgeworICAgICAgICBsb2dWYWxpZEZldGNoRXJyb3IoIkNhbm5v dCBpbnRlcmNlcHQgYSBuYXZpZ2F0aW9uIGxvYWQgdGhhdCBpcyBub3Qgc2FtZS1vcmlnaW4gYXMg dGhlIHNlcnZpY2Ugd29ya2VyIFVSTCIsIHNlcnZpY2VXb3JrZXJVUkwsIHJlcXVlc3QudXJsKCkp OworICAgICAgICBDUkFTSCgpOworICAgIH0KIAogICAgIFN0cmluZyBvcmlnaW4gPSByZXF1ZXN0 Lmh0dHBPcmlnaW4oKTsKICAgICBVUkwgdXJsIHsgVVJMKCksIG9yaWdpbi5pc0VtcHR5KCkgPyBy ZWZlcnJlciA6IG9yaWdpbiB9OwotICAgIGlmICghdXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHko KSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKHVybC5wcm90b2NvbElzSW5IVFRQRmFt aWx5KCkgJiYgIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbCh1cmwsIHNlcnZpY2VXb3JrZXJV UkwpKSB7CisgICAgICAgIGxvZ1ZhbGlkRmV0Y2hFcnJvcigiVHJ5aW5nIHRvIGludGVyY2VwdCBh IG5vbiBuYXZpZ2F0aW9uIGxvYWQgdGhhdCBpcyBub3Qgb3JpZ2luYXRpbmcgZnJvbSBhIHNhbWUt b3JpZ2luIGNvbnRleHQgYXMgdGhlIHNlcnZpY2Ugd29ya2VyIFVSTCIsIHNlcnZpY2VXb3JrZXJV UkwsIHVybCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKLSAgICByZXR1cm4gcHJv dG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFsKHVybCwgc2VydmljZVdvcmtlclVSTCk7CisgICAgcmV0 dXJuIHRydWU7CiB9CiAKIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246OmNhbmNl bEZldGNoKFNXU2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIgc2VydmVyQ29ubmVjdGlvbklkZW50 aWZpZXIsIFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyIHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBG ZXRjaElkZW50aWZpZXIgZmV0Y2hJZGVudGlmaWVyKQpAQCAtMjE0LDcgKzIyNSwxMCBAQCB2b2lk IFdlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKFNXU2VydmVyQ29ubmVj dGlvbklkZW50aWZpZXIgc2VydgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgUkVMRUFT RV9BU1NFUlQoaXNWYWxpZEZldGNoKHJlcXVlc3QsIG9wdGlvbnMsIHNlcnZpY2VXb3JrZXJUaHJl YWRQcm94eS0+c2NyaXB0VVJMKCksIHJlZmVycmVyKSk7CisgICAgaWYgKCFpc1ZhbGlkRmV0Y2go cmVxdWVzdCwgb3B0aW9ucywgc2VydmljZVdvcmtlclRocmVhZFByb3h5LT5zY3JpcHRVUkwoKSwg cmVmZXJyZXIpKSB7CisgICAgICAgIG1fY29ubmVjdGlvblRvU3RvcmFnZVByb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OlN0b3JhZ2VQcm9jZXNzOjpEaWROb3RIYW5kbGVGZXRjaCB7IHNlcnZlckNvbm5l Y3Rpb25JZGVudGlmaWVyLCBmZXRjaElkZW50aWZpZXIgfSwgMCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CiAKICAgICBhdXRvIGNsaWVudCA9IFdlYlNlcnZpY2VXb3JrZXJGZXRjaFRhc2tDbGll bnQ6OmNyZWF0ZShtX2Nvbm5lY3Rpb25Ub1N0b3JhZ2VQcm9jZXNzLmNvcHlSZWYoKSwgc2Vydmlj ZVdvcmtlcklkZW50aWZpZXIsIHNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBmZXRjaElkZW50 aWZpZXIpOwogICAgIHN0ZDo6b3B0aW9uYWw8U2VydmljZVdvcmtlckNsaWVudElkZW50aWZpZXI+ IGNsaWVudElkOwo= 343850 2018-06-28 14:13:34 -0700 2018-06-28 15:27:38 -0700 Patch bug-187153-20180628141333.patch text/plain 4223 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxYjcyYzgxYzNlMjI3NDQz ZGFjYzU1NWUwYzhmNTk5NWNhNzJhODguLjNmZGFiN2U5ZmM5MDNkODFmNjJmYTdhNjMyNmI4NmIw YWZhNDE4NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDYtMjggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEVhcmx5IHJldHVybiB3aGVuIGhh bmRsaW5nIGZldGNoIGV2ZW50IGluIGNhc2Ugc2VydmljZSB3b3JrZXIgb3JpZ2luIGRvZXMgbm90 IG1hdGNoIG9yaWdpbiBvZiBhIHN1YnJlc291cmNlIGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzE1MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDEzMjk4MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3RvcCBjcmFzaGluZyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2VzcyBpbiBjYXNlIGEg c3VicmVzb3VyY2UgbG9hZCBvcmlnaW4gaXMgbm90IG1hdGNoaW5nIGEgc2VydmljZSB3b3JrZXIg b3JpZ2luLgorICAgICAgICBJbnN0ZWFkLCBqdXN0IHJldHVybiBlYXJseSBzbyB0aGF0IHRoZSBs b2FkIHdpbGwgYmUgaGFuZGxlZCBieSB0aGUgbmV0d29yayBwcm9jZXNzLgorCisgICAgICAgIEtl ZXAgY3Jhc2hpbmcgaW4gY2FzZSBhIG5hdmlnYXRpb24gbG9hZCBpcyBub3QgbWF0Y2hpbmcgaXRz IHNlcnZpY2Ugd29ya2VyIG9yaWdpbi4KKyAgICAgICAgQWRkIG1vcmUgbG9nZ2luZyB0byBoZWxw IHdpdGggdGhlIGRlYnVnZ2luZy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJT V0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmxvZ1ZhbGlk RmV0Y2hFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OmlzVmFsaWRGZXRjaCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKToKKwogMjAx OC0wNi0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSGFu ZGxlIHRoZSBjYXNlIG9mIHJlZ2lzdGVyTUROU05hbWVDYWxsYmFjayBjYWxsZWQgc2V2ZXJhbCB0 aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0 b3JhZ2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IDJjZmIzY2ExZDNj YzJhZGY0ZjQ1NmNkY2UwZjY0NzdhNTdmMjA0YzQuLmU0MjdlMjk0NzBhZTdhNGI2ZWVhYzMxNzU5 YmRjNDVjZTNjNTdkNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAg LTE4OSwxNSArMTg5LDI0IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1ZhbGlkRmV0Y2goY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBGZXRjaE9wdGlvCiAgICAgaWYgKCFzZXJ2 aWNlV29ya2VyVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIHRy dWU7CiAKLSAgICBpZiAob3B0aW9ucy5tb2RlID09IEZldGNoT3B0aW9uczo6TW9kZTo6TmF2aWdh dGUpCi0gICAgICAgIHJldHVybiBwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwocmVxdWVzdC51 cmwoKSwgc2VydmljZVdvcmtlclVSTCk7CisgICAgaWYgKG9wdGlvbnMubW9kZSA9PSBGZXRjaE9w dGlvbnM6Ok1vZGU6Ok5hdmlnYXRlICYmICFwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwocmVx dWVzdC51cmwoKSwgc2VydmljZVdvcmtlclVSTCkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJS T1IoU2VydmljZVdvcmtlciwgIlNob3VsZCBub3QgaW50ZXJjZXB0IGEgbmF2aWdhdGlvbiBsb2Fk IHRoYXQgaXMgbm90IHNhbWUtb3JpZ2luIGFzIHRoZSBzZXJ2aWNlIHdvcmtlciBVUkwiKTsKKyAg ICAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9NRVNTQUdFKHJlcXVlc3QudXJsKCkucHJvdG9jb2wo KSA9PSBzZXJ2aWNlV29ya2VyVVJMLnByb3RvY29sKCksICJQcm90b2NvbHMgZG8gbm90IG1hdGNo Iik7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRShyZXF1ZXN0LnVybCgpLmhv c3QoKSA9PSBzZXJ2aWNlV29ya2VyVVJMLmhvc3QoKSwgIkhvc3RzIGRvIG5vdCBtYXRjaCIpOwor ICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX01FU1NBR0UocmVxdWVzdC51cmwoKS5wb3J0KCkg PT0gc2VydmljZVdvcmtlclVSTC5wb3J0KCksICJQb3J0cyBkbyBub3QgbWF0Y2giKTsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIFN0cmluZyBvcmlnaW4gPSByZXF1ZXN0Lmh0 dHBPcmlnaW4oKTsKICAgICBVUkwgdXJsIHsgVVJMKCksIG9yaWdpbi5pc0VtcHR5KCkgPyByZWZl cnJlciA6IG9yaWdpbiB9OwotICAgIGlmICghdXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkK LSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICByZXR1cm4gcHJvdG9jb2xIb3N0QW5kUG9ydEFy ZUVxdWFsKHVybCwgc2VydmljZVdvcmtlclVSTCk7CisgICAgaWYgKHVybC5wcm90b2NvbElzSW5I VFRQRmFtaWx5KCkgJiYgIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbCh1cmwsIHNlcnZpY2VX b3JrZXJVUkwpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3JrZXIsICJT aG91bGQgbm90IGludGVyY2VwdCBhIG5vbiBuYXZpZ2F0aW9uIGxvYWQgdGhhdCBpcyBub3Qgb3Jp Z2luYXRpbmcgZnJvbSBhIHNhbWUtb3JpZ2luIGNvbnRleHQgYXMgdGhlIHNlcnZpY2Ugd29ya2Vy IFVSTCIpOworICAgICAgICBBU1NFUlQodXJsLnByb3RvY29sKCkgPT0gc2VydmljZVdvcmtlclVS TC5wcm90b2NvbCgpKTsKKyAgICAgICAgQVNTRVJUKHVybC5ob3N0KCkgPT0gc2VydmljZVdvcmtl clVSTC5ob3N0KCkpOworICAgICAgICBBU1NFUlQodXJsLnBvcnQoKSA9PSBzZXJ2aWNlV29ya2Vy VVJMLnBvcnQoKSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRy dWU7CiB9CiAKIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246OmNhbmNlbEZldGNo KFNXU2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIgc2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIs IFNlcnZpY2VXb3JrZXJJZGVudGlmaWVyIHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBGZXRjaElk ZW50aWZpZXIgZmV0Y2hJZGVudGlmaWVyKQpAQCAtMjE0LDcgKzIyMywxMCBAQCB2b2lkIFdlYlNX Q29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKFNXU2VydmVyQ29ubmVjdGlvbklk ZW50aWZpZXIgc2VydgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgUkVMRUFTRV9BU1NF UlQoaXNWYWxpZEZldGNoKHJlcXVlc3QsIG9wdGlvbnMsIHNlcnZpY2VXb3JrZXJUaHJlYWRQcm94 eS0+c2NyaXB0VVJMKCksIHJlZmVycmVyKSk7CisgICAgaWYgKCFpc1ZhbGlkRmV0Y2gocmVxdWVz dCwgb3B0aW9ucywgc2VydmljZVdvcmtlclRocmVhZFByb3h5LT5zY3JpcHRVUkwoKSwgcmVmZXJy ZXIpKSB7CisgICAgICAgIG1fY29ubmVjdGlvblRvU3RvcmFnZVByb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OlN0b3JhZ2VQcm9jZXNzOjpEaWROb3RIYW5kbGVGZXRjaCB7IHNlcnZlckNvbm5lY3Rpb25J ZGVudGlmaWVyLCBmZXRjaElkZW50aWZpZXIgfSwgMCk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CiAKICAgICBhdXRvIGNsaWVudCA9IFdlYlNlcnZpY2VXb3JrZXJGZXRjaFRhc2tDbGllbnQ6OmNy ZWF0ZShtX2Nvbm5lY3Rpb25Ub1N0b3JhZ2VQcm9jZXNzLmNvcHlSZWYoKSwgc2VydmljZVdvcmtl cklkZW50aWZpZXIsIHNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBmZXRjaElkZW50aWZpZXIp OwogICAgIHN0ZDo6b3B0aW9uYWw8U2VydmljZVdvcmtlckNsaWVudElkZW50aWZpZXI+IGNsaWVu dElkOwo= 343860 2018-06-28 15:27:39 -0700 2018-06-28 15:45:26 -0700 Patch for landing bug-187153-20180628152739.patch text/plain 4220 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxYjcyYzgxYzNlMjI3NDQz ZGFjYzU1NWUwYzhmNTk5NWNhNzJhODguLmQ4ODgzMmZlN2ZlYWM4OWUzMjczNTgyNmRhOGVkYmUz MDRjYTViZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDYtMjggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEVhcmx5IHJldHVybiB3aGVuIGhh bmRsaW5nIGZldGNoIGV2ZW50IGluIGNhc2Ugc2VydmljZSB3b3JrZXIgb3JpZ2luIGRvZXMgbm90 IG1hdGNoIG9yaWdpbiBvZiBhIHN1YnJlc291cmNlIGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzE1MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDEzMjk4MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAg ICAgU3RvcCBjcmFzaGluZyB0aGUgc2VydmljZSB3b3JrZXIgcHJvY2VzcyBpbiBjYXNlIGEgc3Vi cmVzb3VyY2UgbG9hZCBvcmlnaW4gaXMgbm90IG1hdGNoaW5nIGEgc2VydmljZSB3b3JrZXIgb3Jp Z2luLgorICAgICAgICBJbnN0ZWFkLCBqdXN0IHJldHVybiBlYXJseSBzbyB0aGF0IHRoZSBsb2Fk IHdpbGwgYmUgaGFuZGxlZCBieSB0aGUgbmV0d29yayBwcm9jZXNzLgorCisgICAgICAgIEtlZXAg Y3Jhc2hpbmcgaW4gY2FzZSBhIG5hdmlnYXRpb24gbG9hZCBpcyBub3QgbWF0Y2hpbmcgaXRzIHNl cnZpY2Ugd29ya2VyIG9yaWdpbi4KKyAgICAgICAgQWRkIG1vcmUgbG9nZ2luZyB0byBoZWxwIHdp dGggdGhlIGRlYnVnZ2luZy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTV0Nv bnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OmxvZ1ZhbGlkRmV0 Y2hFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OmlzVmFsaWRGZXRjaCk6CisgICAgICAgIChXZWJL aXQ6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKToKKwogMjAxOC0w Ni0yOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxl IHRoZSBjYXNlIG9mIHJlZ2lzdGVyTUROU05hbWVDYWxsYmFjayBjYWxsZWQgc2V2ZXJhbCB0aW1l cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU1dDb250 ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCmluZGV4IDJjZmIzY2ExZDNjYzJh ZGY0ZjQ1NmNkY2UwZjY0NzdhNTdmMjA0YzQuLmI3ZWU0ZDFmMmU1ZmFlMzMyODRkYThmMjIzY2Q2 NGVlYzNlNDdiMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdl L1dlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvU3RvcmFnZS9XZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKQEAgLTE4 OSwxNSArMTg5LDI0IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1ZhbGlkRmV0Y2goY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBGZXRjaE9wdGlvCiAgICAgaWYgKCFzZXJ2aWNl V29ya2VyVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKLSAgICBpZiAob3B0aW9ucy5tb2RlID09IEZldGNoT3B0aW9uczo6TW9kZTo6TmF2aWdhdGUp Ci0gICAgICAgIHJldHVybiBwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwocmVxdWVzdC51cmwo KSwgc2VydmljZVdvcmtlclVSTCk7CisgICAgaWYgKG9wdGlvbnMubW9kZSA9PSBGZXRjaE9wdGlv bnM6Ok1vZGU6Ok5hdmlnYXRlICYmICFwcm90b2NvbEhvc3RBbmRQb3J0QXJlRXF1YWwocmVxdWVz dC51cmwoKSwgc2VydmljZVdvcmtlclVSTCkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1Io U2VydmljZVdvcmtlciwgIlNob3VsZCBub3QgaW50ZXJjZXB0IGEgbmF2aWdhdGlvbiBsb2FkIHRo YXQgaXMgbm90IHNhbWUtb3JpZ2luIGFzIHRoZSBzZXJ2aWNlIHdvcmtlciBVUkwiKTsKKyAgICAg ICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9NRVNTQUdFKHJlcXVlc3QudXJsKCkuaG9zdCgpID09IHNl cnZpY2VXb3JrZXJVUkwuaG9zdCgpLCAiSG9zdHMgZG8gbm90IG1hdGNoIik7CisgICAgICAgIFJF TEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRShyZXF1ZXN0LnVybCgpLnByb3RvY29sKCkgPT0gc2Vy dmljZVdvcmtlclVSTC5wcm90b2NvbCgpLCAiUHJvdG9jb2xzIGRvIG5vdCBtYXRjaCIpOworICAg ICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX01FU1NBR0UocmVxdWVzdC51cmwoKS5wb3J0KCkgPT0g c2VydmljZVdvcmtlclVSTC5wb3J0KCksICJQb3J0cyBkbyBub3QgbWF0Y2giKTsKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIFN0cmluZyBvcmlnaW4gPSByZXF1ZXN0Lmh0dHBP cmlnaW4oKTsKICAgICBVUkwgdXJsIHsgVVJMKCksIG9yaWdpbi5pc0VtcHR5KCkgPyByZWZlcnJl ciA6IG9yaWdpbiB9OwotICAgIGlmICghdXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKLSAg ICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICByZXR1cm4gcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVx dWFsKHVybCwgc2VydmljZVdvcmtlclVSTCk7CisgICAgaWYgKHVybC5wcm90b2NvbElzSW5IVFRQ RmFtaWx5KCkgJiYgIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbCh1cmwsIHNlcnZpY2VXb3Jr ZXJVUkwpKSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3JrZXIsICJTaG91 bGQgbm90IGludGVyY2VwdCBhIG5vbiBuYXZpZ2F0aW9uIGxvYWQgdGhhdCBpcyBub3Qgb3JpZ2lu YXRpbmcgZnJvbSBhIHNhbWUtb3JpZ2luIGNvbnRleHQgYXMgdGhlIHNlcnZpY2Ugd29ya2VyIFVS TCIpOworICAgICAgICBBU1NFUlQodXJsLmhvc3QoKSA9PSBzZXJ2aWNlV29ya2VyVVJMLmhvc3Qo KSk7CisgICAgICAgIEFTU0VSVCh1cmwucHJvdG9jb2woKSA9PSBzZXJ2aWNlV29ya2VyVVJMLnBy b3RvY29sKCkpOworICAgICAgICBBU1NFUlQodXJsLnBvcnQoKSA9PSBzZXJ2aWNlV29ya2VyVVJM LnBvcnQoKSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7 CiB9CiAKIHZvaWQgV2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246OmNhbmNlbEZldGNoKFNX U2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIgc2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIsIFNl cnZpY2VXb3JrZXJJZGVudGlmaWVyIHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyLCBGZXRjaElkZW50 aWZpZXIgZmV0Y2hJZGVudGlmaWVyKQpAQCAtMjE0LDcgKzIyMywxMCBAQCB2b2lkIFdlYlNXQ29u dGV4dE1hbmFnZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKFNXU2VydmVyQ29ubmVjdGlvbklkZW50 aWZpZXIgc2VydgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgUkVMRUFTRV9BU1NFUlQo aXNWYWxpZEZldGNoKHJlcXVlc3QsIG9wdGlvbnMsIHNlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS0+ c2NyaXB0VVJMKCksIHJlZmVycmVyKSk7CisgICAgaWYgKCFpc1ZhbGlkRmV0Y2gocmVxdWVzdCwg b3B0aW9ucywgc2VydmljZVdvcmtlclRocmVhZFByb3h5LT5zY3JpcHRVUkwoKSwgcmVmZXJyZXIp KSB7CisgICAgICAgIG1fY29ubmVjdGlvblRvU3RvcmFnZVByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OlN0b3JhZ2VQcm9jZXNzOjpEaWROb3RIYW5kbGVGZXRjaCB7IHNlcnZlckNvbm5lY3Rpb25JZGVu dGlmaWVyLCBmZXRjaElkZW50aWZpZXIgfSwgMCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAK ICAgICBhdXRvIGNsaWVudCA9IFdlYlNlcnZpY2VXb3JrZXJGZXRjaFRhc2tDbGllbnQ6OmNyZWF0 ZShtX2Nvbm5lY3Rpb25Ub1N0b3JhZ2VQcm9jZXNzLmNvcHlSZWYoKSwgc2VydmljZVdvcmtlcklk ZW50aWZpZXIsIHNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBmZXRjaElkZW50aWZpZXIpOwog ICAgIHN0ZDo6b3B0aW9uYWw8U2VydmljZVdvcmtlckNsaWVudElkZW50aWZpZXI+IGNsaWVudElk Owo=