220385 2021-01-06 15:00:42 -0800 Error in layout tests: "Passed ITP enabled state (0) does not match TCC setting (1)" 2021-01-07 19:59:31 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham darin wilander oldest_to_newest 1717779 0 katherine_cheney 2021-01-06 15:00:42 -0800 This error has been appearing when running layout tests. 1717780 1 katherine_cheney 2021-01-06 15:01:09 -0800 <rdar://problem/70730482> 1717786 2 417132 katherine_cheney 2021-01-06 15:14:38 -0800 Created attachment 417132 Patch 1717787 3 katherine_cheney 2021-01-06 15:14:56 -0800 (In reply to katherine_cheney from comment #2) > Created attachment 417132 [details] > Patch Seeing if this causes flaky failures. 1717832 4 417145 katherine_cheney 2021-01-06 19:24:03 -0800 Created attachment 417145 Patch 1718110 5 417145 darin 2021-01-07 15:37:39 -0800 Comment on attachment 417145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417145&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1200 > + // We do not need to log a discrepency between states for WebKitTestRunner or TestWebKitAPI. Spelling error in discrepancy. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1201 > + if (itpEnabled != passedEnabledState && !shouldBeTreatedAsFullBrowser(WebCore::applicationBundleIdentifier())) I don’t understand why shouldBeTreatedAsFullBrowser is the correct check here. I understand that we don’t want logs in testing because this is normal there. But it seems we think it’s important to keep the logs for other cases. What are those cases where we do want logs? Why? Who reads these logs? 1718124 6 katherine_cheney 2021-01-07 15:53:30 -0800 (In reply to Darin Adler from comment #5) > Comment on attachment 417145 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417145&action=review > > > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1200 > > + // We do not need to log a discrepency between states for WebKitTestRunner or TestWebKitAPI. > > Spelling error in discrepancy. > Will fix. > > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1201 > > + if (itpEnabled != passedEnabledState && !shouldBeTreatedAsFullBrowser(WebCore::applicationBundleIdentifier())) > > I don’t understand why shouldBeTreatedAsFullBrowser is the correct check > here. > shouldBeTreatedAsFullBrowser() is a check to determine if the app is WebKitTestRunner or TestWebKitAPI, because most of the time they should be treated as full browser applications to properly run tests. Here it is a convenient way to check for WTR/TWA without duplicating code. > I understand that we don’t want logs in testing because this is normal > there. But it seems we think it’s important to keep the logs for other > cases. What are those cases where we do want logs? Why? Who reads these logs? The intention for this logging was to capture the case where an app manages to have a different ITP state than the user-selected value. We want to note this in case the UIProcess is trying to bypass the TCC check. It was a RELEASE_ASSERT originally but was causing issues (see rdar://60027693). I have been fielding reports of these logs, although I do think the presence of an ASSERT would bring more attention to these logs once rdar://60027693 gets resolved. 1718129 7 417145 darin 2021-01-07 15:59:04 -0800 Comment on attachment 417145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417145&action=review >>> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1201 >>> + if (itpEnabled != passedEnabledState && !shouldBeTreatedAsFullBrowser(WebCore::applicationBundleIdentifier())) >> >> I don’t understand why shouldBeTreatedAsFullBrowser is the correct check here. >> >> I understand that we don’t want logs in testing because this is normal there. But it seems we think it’s important to keep the logs for other cases. What are those cases where we do want logs? Why? Who reads these logs? > > shouldBeTreatedAsFullBrowser() is a check to determine if the app is WebKitTestRunner or TestWebKitAPI, because most of the time they should be treated as full browser applications to properly run tests. Here it is a convenient way to check for WTR/TWA without duplicating code. I don’t understand why a "is running tests" function is named "shouldBeTreatedAsFullBrowser". 1718130 8 417145 darin 2021-01-07 16:00:28 -0800 Comment on attachment 417145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417145&action=review >>>> Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1201 >>>> + if (itpEnabled != passedEnabledState && !shouldBeTreatedAsFullBrowser(WebCore::applicationBundleIdentifier())) >>> >>> I don’t understand why shouldBeTreatedAsFullBrowser is the correct check here. >>> >>> I understand that we don’t want logs in testing because this is normal there. But it seems we think it’s important to keep the logs for other cases. What are those cases where we do want logs? Why? Who reads these logs? >> >> shouldBeTreatedAsFullBrowser() is a check to determine if the app is WebKitTestRunner or TestWebKitAPI, because most of the time they should be treated as full browser applications to properly run tests. Here it is a convenient way to check for WTR/TWA without duplicating code. > > I don’t understand why a "is running tests" function is named "shouldBeTreatedAsFullBrowser". I think we’ll need to rename this or add a second function that does the same thing. 1718132 9 417145 darin 2021-01-07 16:13:11 -0800 Comment on attachment 417145 Patch I’m gong to say review+ but I don’t like leaving behind code that’s mysterious. 1718133 10 darin 2021-01-07 16:13:43 -0800 Like seriously, if you call shouldBeTreatedAsFullBrowser and the UI process is Safari you get false? 1718170 11 417232 katherine_cheney 2021-01-07 17:37:12 -0800 Created attachment 417232 Patch for landing 1718171 12 katherine_cheney 2021-01-07 17:37:46 -0800 Ok, I changed the name to isRunningTest() to be more clear. Thanks for the review! 1718193 13 ews-feeder 2021-01-07 19:59:30 -0800 Committed r271283: <https://trac.webkit.org/changeset/271283> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417232. 417132 2021-01-06 15:14:38 -0800 2021-01-06 19:24:01 -0800 Patch bug-220385-20210106151437.patch text/plain 1567 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5OThjMDFlOGFlZGEyZTEy MTg1YjZmOGYyM2Q4Njc2YTJjZWVlOTQuLjdhYTRjNzM1YmRjMWZhNjM2NmJmOGQzNTJhMjdhYWUy MGZiYjQ0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDEtMDYgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRXJyb3IgaW4gbGF5 b3V0IHRlc3RzOiAiUGFzc2VkIElUUCBlbmFibGVkIHN0YXRlICgwKSBkb2VzIG5vdCBtYXRjaCBU Q0Mgc2V0dGluZyAoMSkiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjAzODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNzMwNDgyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg dGhpcyBoYXMgbm8gYmVoYXZpb3IgY2hhbmdlLiBJdCB3aWxsIGZpeCBleGNlc3NpdmUKKyAgICAg ICAgbG9nZ2luZyB3aGVuIHJ1bm5pbmcgdGVzdHMuCisKKyAgICAgICAgSVRQIHNob3VsZCBiZSBl bmFibGVkIGluIHRoZSBXZWJzaXRlRGF0YVN0b3JlIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oOgorCiAyMDIxLTAxLTA1ICBX ZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9y IHNvbWUgbG9naWMgYXJvdW5kIHRvdWNoIGV2ZW50IGRlZmVycmluZyBnZXN0dXJlIHJlY29nbml6 ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmgKaW5kZXggZDViNGUzZDMyMTE1MjAxYjZhMDk5NDNmOTY1OTdiMDViNmJk ZmY5ZC4uY2QyOWJkOGVkYjgxZmYxNTEyMGRhNmU0ZjYzZDJlOTYzMDM4MTYzNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuaApAQCAtNDAxLDcgKzQwMSw3IEBAIHByaXZhdGU6CiAKICNpZiBFTkFCTEUoUkVTT1VSQ0Vf TE9BRF9TVEFUSVNUSUNTKQogICAgIGJvb2wgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdN b2RlIHsgZmFsc2UgfTsKLSAgICBib29sIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQg eyBmYWxzZSB9OworICAgIGJvb2wgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCB7IHRy dWUgfTsKICAgICBXVEY6OkZ1bmN0aW9uPHZvaWQoY29uc3QgU3RyaW5nJik+IG1fc3RhdGlzdGlj c1Rlc3RpbmdDYWxsYmFjazsKICNlbmRpZgogCg== 417145 2021-01-06 19:24:03 -0800 2021-01-07 17:37:10 -0800 Patch bug-220385-20210106192402.patch text/plain 2357 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5OThjMDFlOGFlZGEyZTEy MTg1YjZmOGYyM2Q4Njc2YTJjZWVlOTQuLjY5NDkwMmI0M2YzNmZhMzM3NGY1OTAzNzVkOTk0MWEx YWZiZTc0ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjEtMDEtMDYgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRXJyb3IgaW4gbGF5 b3V0IHRlc3RzOiAiUGFzc2VkIElUUCBlbmFibGVkIHN0YXRlICgwKSBkb2VzIG5vdCBtYXRjaCBU Q0Mgc2V0dGluZyAoMSkiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjAzODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNzMwNDgyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg dGhpcyBoYXMgbm8gYmVoYXZpb3IgY2hhbmdlLiBJdCB3aWxsIGZpeCBleGNlc3NpdmUKKyAgICAg ICAgbG9nZ2luZyB3aGVuIHJ1bm5pbmcgdGVzdHMuCisKKyAgICAgICAgc2hvdWxkQmVUcmVhdGVk QXNGdWxsQnJvd3NlcigpIGNoZWNrcyBmb3IgV2ViS2l0VGVzdFJ1bm5lciBvcgorICAgICAgICBU ZXN0V2ViS2l0QVBJLiBXZSBkbyBub3QgbmVlZCB0byBsb2cgYSBkaXNjcmVwYW5jeSBiZXR3ZWVu IHRoZXNlIHN0YXRlcworICAgICAgICBmb3IgdGhlc2UgdW5pcXVlIGNhc2VzIGJlY2F1c2UgdGhl eSBhcmUgc29tZXRpbWVzIHRyZWF0ZWQgbGlrZSB3ZWIgYnJvd3NlcnMKKyAgICAgICAgYnV0IG5l ZWQgdG8gdHVybiBJVFAgb24vb2ZmIGZvciBzcGVjaWZpYyB0ZXN0cywgc28gdGhlc2Ugc3RhdGVz IHdpbGwKKyAgICAgICAgbm90IGFsd2F5cyBtYXRjaC4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OmFjdGl2 YXRlU2Vzc2lvbkNsZWFudXApOgorCiAyMDIxLTAxLTA1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25f aHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yIHNvbWUgbG9naWMgYXJvdW5kIHRv dWNoIGV2ZW50IGRlZmVycmluZyBnZXN0dXJlIHJlY29nbml6ZXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0K aW5kZXggOTExOWQ3NTc0OGE5YzA4NmQwZjJhNmIwYjNkMmVhYzI1N2JhNDhmYi4uZDkyODhhZTU4 ZDc3YWQ0ZDA5Yzg5MTZjMjJmODIwYzI1NmZkOWVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAt MTE5Nyw3ICsxMTk3LDggQEAgc3RhdGljIHZvaWQgYWN0aXZhdGVTZXNzaW9uQ2xlYW51cChOZXR3 b3JrU2Vzc2lvbkNvY29hJiBzZXNzaW9uLCBjb25zdCBOZXR3b3JrU2UKICAgICBib29sIGl0cEVu YWJsZWQgPSBkb2VzUGFyZW50UHJvY2Vzc0hhdmVJVFBFbmFibGVkKHBhcmVudEF1ZGl0VG9rZW4s IHBhcmFtZXRlcnMuYXBwSGFzUmVxdWVzdGVkQ3Jvc3NXZWJzaXRlVHJhY2tpbmdQZXJtaXNzaW9u KTsKICAgICBib29sIHBhc3NlZEVuYWJsZWRTdGF0ZSA9IHNlc3Npb24uaXNSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRW5hYmxlZCgpOwogCi0gICAgaWYgKGl0cEVuYWJsZWQgIT0gcGFzc2VkRW5hYmxl ZFN0YXRlKQorICAgIC8vIFdlIGRvIG5vdCBuZWVkIHRvIGxvZyBhIGRpc2NyZXBlbmN5IGJldHdl ZW4gc3RhdGVzIGZvciBXZWJLaXRUZXN0UnVubmVyIG9yIFRlc3RXZWJLaXRBUEkuCisgICAgaWYg KGl0cEVuYWJsZWQgIT0gcGFzc2VkRW5hYmxlZFN0YXRlICYmICFzaG91bGRCZVRyZWF0ZWRBc0Z1 bGxCcm93c2VyKFdlYkNvcmU6OmFwcGxpY2F0aW9uQnVuZGxlSWRlbnRpZmllcigpKSkKICAgICAg ICAgV1RGTG9nQWx3YXlzKCJQYXNzZWQgSVRQIGVuYWJsZWQgc3RhdGUgKCVkKSBkb2VzIG5vdCBt YXRjaCBUQ0Mgc2V0dGluZyAoJWQpXG4iLCBwYXNzZWRFbmFibGVkU3RhdGUsIGl0cEVuYWJsZWQp OwogICAgIHNlc3Npb24uc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQocGFzc2VkRW5h YmxlZFN0YXRlKTsKICNlbmRpZgo= 417232 2021-01-07 17:37:12 -0800 2021-01-07 19:59:30 -0800 Patch for landing bug-220385-20210107173712.patch text/plain 4850 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZjNjA0Mjg0M2JmNTZlMTg4 YTIwYTJiNTI1MzVkY2NmZDk4MjM4M2EuLjIwODQ3YWQ4NDNkNWYyZTNjY2E1NWJmYTMzNThiYjc1 MjlhYTg1NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDEtMDcgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRXJyb3IgaW4gbGF5 b3V0IHRlc3RzOiAiUGFzc2VkIElUUCBlbmFibGVkIHN0YXRlICgwKSBkb2VzIG5vdCBtYXRjaCBU Q0Mgc2V0dGluZyAoMSkiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjAzODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNzMwNDgyPgorCisgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhp cyBoYXMgbm8gYmVoYXZpb3IgY2hhbmdlLiBJdCB3aWxsIGZpeCBleGNlc3NpdmUKKyAgICAgICAg bG9nZ2luZyB3aGVuIHJ1bm5pbmcgdGVzdHMuCisKKyAgICAgICAgV2UgZG8gbm90IG5lZWQgdG8g bG9nIGEgZGlzY3JlcGFuY3kgYmV0d2VlbiB0aGVzZSBzdGF0ZXMKKyAgICAgICAgZm9yIFdlYktp dFRlc3RSdW5uZXIgb3IgVGVzdFdlYktpdEFQSSBiZWNhdXNlIHRoZXkgYXJlIHNvbWV0aW1lcyB0 cmVhdGVkCisgICAgICAgIGxpa2Ugd2ViIGJyb3dzZXJzIGJ1dCBuZWVkIHRvIHR1cm4gSVRQIG9u L29mZiBmb3Igc3BlY2lmaWMgdGVzdHMsIHNvCisgICAgICAgIHRoZXNlIHN0YXRlcyB3aWxsIG5v dCBhbHdheXMgbWF0Y2guCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr U2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjphY3RpdmF0ZVNlc3Npb25DbGVhbnVw KToKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MuaDoKKyAg ICAgICAgKiBTaGFyZWQvQ29jb2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MubW06CisgICAgICAg IChXZWJLaXQ6OmlzUnVubmluZ1Rlc3QpOgorICAgICAgICAoV2ViS2l0Ojppc1BhcmVudFByb2Nl c3NBRnVsbFdlYkJyb3dzZXIpOgorICAgICAgICAoV2ViS2l0Ojppc0Z1bGxXZWJCcm93c2VyKToK KyAgICAgICAgKFdlYktpdDo6c2hvdWxkQmVUcmVhdGVkQXNGdWxsQnJvd3Nlcik6IERlbGV0ZWQu CisKIDIwMjEtMDEtMDUgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKHIyNjExNTcpOiBDcmFzaCBpbiBXS1NlbGVjdFBvcG92ZXIgd2hl biBydW5uaW5nIGFzIGlQaG9uZSBhcHAgb24gaVBhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IDkx MTlkNzU3NDhhOWMwODZkMGYyYTZiMGIzZDJlYWMyNTdiYTQ4ZmIuLmU0ZDhlOTM3YTlmY2E2MjE1 N2ZkODBlM2ZmZjU1ODhkNmQ1MWI1NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KQEAgLTExOTcsNyAr MTE5Nyw4IEBAIHN0YXRpYyB2b2lkIGFjdGl2YXRlU2Vzc2lvbkNsZWFudXAoTmV0d29ya1Nlc3Np b25Db2NvYSYgc2Vzc2lvbiwgY29uc3QgTmV0d29ya1NlCiAgICAgYm9vbCBpdHBFbmFibGVkID0g ZG9lc1BhcmVudFByb2Nlc3NIYXZlSVRQRW5hYmxlZChwYXJlbnRBdWRpdFRva2VuLCBwYXJhbWV0 ZXJzLmFwcEhhc1JlcXVlc3RlZENyb3NzV2Vic2l0ZVRyYWNraW5nUGVybWlzc2lvbik7CiAgICAg Ym9vbCBwYXNzZWRFbmFibGVkU3RhdGUgPSBzZXNzaW9uLmlzUmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQoKTsKIAotICAgIGlmIChpdHBFbmFibGVkICE9IHBhc3NlZEVuYWJsZWRTdGF0ZSkK KyAgICAvLyBXZSBkbyBub3QgbmVlZCB0byBsb2cgYSBkaXNjcmVwYW5jeSBiZXR3ZWVuIHN0YXRl cyBmb3IgV2ViS2l0VGVzdFJ1bm5lciBvciBUZXN0V2ViS2l0QVBJLgorICAgIGlmIChpdHBFbmFi bGVkICE9IHBhc3NlZEVuYWJsZWRTdGF0ZSAmJiAhaXNSdW5uaW5nVGVzdChXZWJDb3JlOjphcHBs aWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKSkpCiAgICAgICAgIFdURkxvZ0Fsd2F5cygiUGFzc2Vk IElUUCBlbmFibGVkIHN0YXRlICglZCkgZG9lcyBub3QgbWF0Y2ggVENDIHNldHRpbmcgKCVkKVxu IiwgcGFzc2VkRW5hYmxlZFN0YXRlLCBpdHBFbmFibGVkKTsKICAgICBzZXNzaW9uLnNldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKHBhc3NlZEVuYWJsZWRTdGF0ZSk7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL0RlZmF1bHRXZWJCcm93c2VyQ2hl Y2tzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9EZWZhdWx0V2ViQnJvd3NlckNoZWNr cy5oCmluZGV4IDEyZWM3NmFkMmRkOWYxZTdiMDM4ZTM4MmU0NDc1ZTYxMjQxMzkxNDIuLjQ4YmZk NjE5MDJkNjE4NGU2OGQwZmJmNDE4YjIzOTZhY2QwMTcxODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0NvY29hL0RlZmF1bHRXZWJCcm93c2VyQ2hlY2tzLmgKKysrIGIvU291cmNl L1dlYktpdC9TaGFyZWQvQ29jb2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MuaApAQCAtMzcsNyAr MzcsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGJvb2wgaGFzUmVxdWVzdGVkQ3Jvc3NXZWJzaXRl VHJhY2tpbmdQZXJtaXNzaW9uKCk7CiBib29sIGhhc1Byb2hpYml0ZWRVc2FnZVN0cmluZ3MoKTsK IE9wdGlvbmFsPFZlY3RvcjxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4+IGdldEFwcEJvdW5k RG9tYWluc1Rlc3RpbmcoY29uc3QgU3RyaW5nJik7Ci1ib29sIHNob3VsZEJlVHJlYXRlZEFzRnVs bEJyb3dzZXIoY29uc3QgU3RyaW5nJiBidW5kbGVJRCk7Citib29sIGlzUnVubmluZ1Rlc3QoY29u c3QgU3RyaW5nJiBidW5kbGVJRCk7CiB2b2lkIGRldGVybWluZUlUUFN0YXRlKCk7CiBib29sIGRv ZXNBcHBIYXZlSVRQRW5hYmxlZCgpOwogYm9vbCBkb2VzUGFyZW50UHJvY2Vzc0hhdmVJVFBFbmFi bGVkKE9wdGlvbmFsPGF1ZGl0X3Rva2VuX3Q+LCBib29sKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0NvY29hL0RlZmF1bHRXZWJCcm93c2VyQ2hlY2tzLm1tIGIvU291cmNlL1dl YktpdC9TaGFyZWQvQ29jb2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MubW0KaW5kZXggYTU3ZTZm ZjU5ODU4OWQ5OTgwMzU0MGY5ZmMxZTFlMDdhZDljZGIwZS4uZWYwYjU0OTM1MzViNDY0Zjc0M2E4 ZDA4ZDQzN2M4Zjg1YmExMWM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQv Q29jb2EvRGVmYXVsdFdlYkJyb3dzZXJDaGVja3MubW0KQEAgLTQ2LDcgKzQ2LDcgQEAgbmFtZXNw YWNlIFdlYktpdCB7CiAKIHN0YXRpYyBib29sIGlzRnVsbFdlYkJyb3dzZXIoY29uc3QgU3RyaW5n Jik7CiAKLWJvb2wgc2hvdWxkQmVUcmVhdGVkQXNGdWxsQnJvd3Nlcihjb25zdCBTdHJpbmcmIGJ1 bmRsZUlEKQorYm9vbCBpc1J1bm5pbmdUZXN0KGNvbnN0IFN0cmluZyYgYnVuZGxlSUQpCiB7CiAg ICAgcmV0dXJuIGJ1bmRsZUlEID09ICJjb20uYXBwbGUuV2ViS2l0LlRlc3RXZWJLaXRBUEkiX3Mg fHwgYnVuZGxlSUQgPT0gImNvbS5hcHBsZS5XZWJLaXQuV2ViS2l0VGVzdFJ1bm5lciJfcyB8fCBi dW5kbGVJRCA9PSAib3JnLndlYmtpdC5XZWJLaXRUZXN0UnVubmVyQXBwIl9zOwogfQpAQCAtMjIz LDcgKzIyMyw3IEBAIGJvb2wgaXNQYXJlbnRQcm9jZXNzQUZ1bGxXZWJCcm93c2VyKE9wdGlvbmFs PGF1ZGl0X3Rva2VuX3Q+IGF1ZGl0VG9rZW4pCiAgICAgICAgIGZ1bGxXZWJCcm93c2VyID0gV1RG OjpoYXNFbnRpdGxlbWVudChhdWRpdFRva2VuLnZhbHVlKCksICJjb20uYXBwbGUuZGV2ZWxvcGVy LndlYi1icm93c2VyIik7CiAgICAgfSk7CiAKLSAgICByZXR1cm4gZnVsbFdlYkJyb3dzZXIgfHwg c2hvdWxkQmVUcmVhdGVkQXNGdWxsQnJvd3NlcihXZWJDb3JlOjphcHBsaWNhdGlvbkJ1bmRsZUlk ZW50aWZpZXIoKSk7CisgICAgcmV0dXJuIGZ1bGxXZWJCcm93c2VyIHx8IGlzUnVubmluZ1Rlc3Qo V2ViQ29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCkpOwogfQogCiBzdGF0aWMgYm9v bCBpc0Z1bGxXZWJCcm93c2VyKGNvbnN0IFN0cmluZyYgYnVuZGxlSWRlbnRpZmllcikKQEAgLTIz Miw3ICsyMzIsNyBAQCBzdGF0aWMgYm9vbCBpc0Z1bGxXZWJCcm93c2VyKGNvbnN0IFN0cmluZyYg YnVuZGxlSWRlbnRpZmllcikKIAogICAgIHN0YXRpYyBib29sIGZ1bGxXZWJCcm93c2VyID0gV1RG Ojpwcm9jZXNzSGFzRW50aXRsZW1lbnQoImNvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXIi KTsKIAotICAgIHJldHVybiBmdWxsV2ViQnJvd3NlciB8fCBzaG91bGRCZVRyZWF0ZWRBc0Z1bGxC cm93c2VyKGJ1bmRsZUlkZW50aWZpZXIpOworICAgIHJldHVybiBmdWxsV2ViQnJvd3NlciB8fCBp c1J1bm5pbmdUZXN0KGJ1bmRsZUlkZW50aWZpZXIpOwogfQogCiBib29sIGlzRnVsbFdlYkJyb3dz ZXIoKQo=