177405 2017-09-22 23:05:18 -0700 Web Automation: add commands to get and set mock user permissions for pages in an automation session 2017-09-26 10:12:26 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg cgarcia commit-queue joepeck webkit-bug-importer oldest_to_newest 1351929 0 bburg 2017-09-22 23:05:18 -0700 This patch also implements the first permission, getUserMedia. 1351931 1 bburg 2017-09-22 23:19:15 -0700 <rdar://problem/34493846> 1351932 2 webkit-bug-importer 2017-09-22 23:19:44 -0700 <rdar://problem/34609571> 1351933 3 321617 bburg 2017-09-22 23:25:34 -0700 Created attachment 321617 Patch 1351934 4 321617 cgarcia 2017-09-22 23:32:04 -0700 Comment on attachment 321617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321617&action=review > Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp:1259 > + case Inspector::Protocol::Automation::MockPermission::GetUserMedia: > + m_mockPermissionForGetUserMedia = permissionValue; > + } I would add a break here, even if there aren't more options yet. 1352492 5 321617 joepeck 2017-09-25 16:45:08 -0700 Comment on attachment 321617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321617&action=review r=me. You might need a WK2 Owner to approve the UserMediaPermissionRequestManagerProxy change, but the rest looks good to me. > Source/WebKit/UIProcess/Automation/Automation.json:222 > + "id": "MockPermission", I'm not loving the Mock part of this name. Effectively you are setting the permission for the session, so I don't think Mock is necessary. If the intent is to portray that this is unique from the real system / user permissions then replacing Mock with Session would be event clearer. `getMockPermissions` => `getSessionPermissions`. Whether or not Mock stays in the commands below, it doesn't need to be included in these type names. >> Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp:1259 >> + } > > I would add a break here, even if there aren't more options yet. +1. I'm surprised this didn't get a compiler warning. Maybe we haven't enabled -Wimplicit-fallthrough in all files? I think C++ is supposed to have it thought. > Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp:1268 > + Nit: Extra newline. 1352674 6 321821 bburg 2017-09-26 09:01:00 -0700 Created attachment 321821 Patch 1352680 7 bburg 2017-09-26 09:12:22 -0700 <rdar://problem/34493846> 1352709 8 321821 commit-queue 2017-09-26 10:12:25 -0700 Comment on attachment 321821 Patch Clearing flags on attachment: 321821 Committed r222503: <http://trac.webkit.org/changeset/222503> 1352710 9 commit-queue 2017-09-26 10:12:26 -0700 All reviewed patches have been landed. Closing bug. 321617 2017-09-22 23:25:34 -0700 2017-09-26 09:00:59 -0700 Patch bug-177405-20170922232533.patch text/plain 11464 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJmYzViZGMzNDJmMWM1ZjE2 MzU5N2QwZGMyZWNmMGI5NDNiZGU4NjcuLmVhZWQ4Mzk2ODlmNDNjNGQwZjhmOTllODg5OTI2ZjE0 MTdiMWQ2MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTctMDktMjIgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRpb246IGFkZCBjb21t YW5kcyB0byBnZXQgYW5kIHNldCBtb2NrIHVzZXIgcGVybWlzc2lvbnMgZm9yIHBhZ2VzIGluIGFu IGF1dG9tYXRpb24gc2Vzc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc3NDA1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNDQ5Mzg0Nj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyB0ZXN0IHNv bWUgV2ViIEFQSXMgdmlhIFdlYkRyaXZlciwgaXQgbmVlZHMgdG8gYmUgcG9zc2libGUgdG8gc2lt dWxhdGUgYSB1c2VyIGFjY2VwdGluZyBvcgorICAgICAgICBkZW55aW5nIHJlcXVlc3RzIGZvciBl bGV2YXRlZCBwZXJtaXNzaW9ucywgc3VjaCBhcyBnZXRVc2VyTWVkaWEoKSBvciBnZW9sb2NhdGlv bi4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBnZW5lcmljIHdheSBmb3IgYSB0ZXN0IHRv IGNvbmZpZ3VyZSB0aGUgYXV0b21hdGlvbiBzZXNzaW9uJ3MKKyAgICAgICAgc2ltdWxhdGVkIHVz ZXIgYWN0aW9uIHRoYXQgd2lsbCBoYXBwZW4gZXZlcnkgdGltZSBhIHNwZWNpZmljIHBlcm1pc3Np b24gaXMgcmVxdWVzdGVkLgorICAgICAgICBBIHRlc3QgY2FuIHNldCBhICJtb2NrIHBlcm1pc3Np b24iLCB0cmlnZ2VyIHRoZSBwZXJtaXNzaW9uIHJlcXVlc3QgdmlhIFdlYiBBUEksCisgICAgICAg IGFuZCB0aGVuIHZlcmlmeSB0aGF0IHRoZSBwYWdlIGJlaGF2ZXMgY29ycmVjdGx5IHdoZW4gdGhl IHVzZXIgYWNjZXB0ZWQgb3IgZGVuaWVkIHRoZSByZXF1ZXN0LgorCisgICAgICAgIEEgcHJvcG9z YWwgd2lsbCBmb2xsb3cgc2hvcnRseSB0byBleHBvc2UgdGhpcyBmdW5jdGlvbmFsaXR5IHZpYSBh IG5ldyBSRVNUIEFQSSBlbmRwb2ludC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9u L0F1dG9tYXRpb24uanNvbjogQWRkIGdldC9zZXQgY29tbWFuZHMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpnZXRNb2NrUGVybWlzc2lvbnMpOgorICAgICAgICAo V2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2V0TW9ja1Blcm1pc3Npb25zKToKKyAgICAg ICAgRm9yIG5vdywgc3RvcmUgdGhlIHBlcm1pc3Npb24gdmFsdWUgaW4gYSBtZW1iZXIgb2YgdGhl IHNlc3Npb24uIFRoZSBnZXRVc2VyTWVkaWEKKyAgICAgICAgcGVybWlzc2lvbiBvbmx5IG5lZWRz IGEgYm9vbCwgYnV0IHRoZXJlIGlzIG5vIHJlYXNvbiB3ZSBjb3VsZG4ndCB1c2UgbW9yZSBjb21w bGljYXRlZAorICAgICAgICB2YWx1ZXMgZm9yIHBlcm1pc3Npb25zIChpLmUuLCBzdHJpbmdzLCBu dW1iZXJzLCBhcnJheXMsIG9iamVjdHMpIHNvbWVkYXkuCisKKyAgICAgICAgKFdlYktpdDo6V2Vi QXV0b21hdGlvblNlc3Npb246OnNob3VsZEFsbG93R2V0VXNlck1lZGlhRm9yUGFnZSBjb25zdCk6 CisgICAgICAgIEV4cG9zZSB0aGUgc3BlY2lmaWMgZGVjaXNpb24gdG8gYmUgdGFrZW4gYmFzZWQg b24gd2hldGhlciB0aGUgcmVxdWVzdCBpcyBhbGxvd2VkIG9yIGRlbmllZC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmg6CisgICAgICAgICog VUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnJl cXVlc3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUpOgorICAgICAgICBJZiB0aGUgcGFnZSBp cyB1bmRlciBhdXRvbWF0aW9uLCB0aGVuIHNpbXVsYXRlIHRoZSB1c2VyIGFjdGlvbiBhY2NvcmRp bmcgdG8gdGhlCisgICAgICAgIGN1cnJlbnQgdmFsdWVzIG9mIHBlcm1pc3Npb25zIHNldCBmb3Ig dGhlIHNlc3Npb24uCisKIDIwMTctMDktMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCBkcm9wIGFzc2VydGlvbiBhZGRlZCBpbiByMjIyMzA4 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0 aW9uLmpzb24gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24u anNvbgppbmRleCAyODY1NGRmYjJmY2IyYjQ5MWYyYzcyODRlMDdhYTk2NWZiMmUyMzA5Li44ZDk2 ZWE3MzM2MDFjNGNlMWJkNjFiNDAzYjlmYjMxMmNkOGQ2ZDdjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbgorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbgpAQCAtMjE3LDYgKzIx NywyMiBAQAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2VjdXJlIiwgInR5cGUiOiAiYm9v bGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmIGNvb2tpZSBpcyBzZWN1cmUuIiB9LAogICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic2Vzc2lvbiIsICJ0eXBlIjogImJvb2xlYW4iLCAiZGVz Y3JpcHRpb24iOiAiVHJ1ZSBpbiBjYXNlIG9mIHNlc3Npb24gY29va2llLiIgfQogICAgICAgICAg ICAgXQorICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICAiaWQiOiAiTW9ja1Blcm1p c3Npb24iLAorICAgICAgICAgICAgInR5cGUiOiAic3RyaW5nIiwKKyAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJFbnVtZXJhdGVzIGRpZmZlcmVudCBwZXJtaXNzaW9ucyB0aGF0IG11c3QgYmUg b2J0YWluZWQgaW4gb3JkZXIgdG8gdXNlIHByaXZpbGVnZWQgQVBJcy4iLAorICAgICAgICAgICAg ImVudW0iOiBbCisgICAgICAgICAgICAgICAgIkdldFVzZXJNZWRpYSIKKyAgICAgICAgICAgIF0K KyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgImlkIjogIk1vY2tQZXJtaXNzaW9u RGF0YSIsCisgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAgInByb3Bl cnRpZXMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwZXJtaXNzaW9uIiwgIiRyZWYi OiAiTW9ja1Blcm1pc3Npb24iIH0sCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZSIs ICJ0eXBlIjogImJvb2xlYW4iIH0KKyAgICAgICAgICAgIF0KICAgICAgICAgfQogICAgIF0sCiAg ICAgImNvbW1hbmRzIjogWwpAQCAtNTM0LDYgKzU1MCwyMCBAQAogICAgICAgICAgICAgInBhcmFt ZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJicm93c2luZ0NvbnRleHRIYW5k bGUiLCAiJHJlZiI6ICJCcm93c2luZ0NvbnRleHRIYW5kbGUiLCAiZGVzY3JpcHRpb24iOiAiVGhl IGhhbmRsZSBmb3IgdGhlIGJyb3dzaW5nIGNvbnRleHQuIiB9CiAgICAgICAgICAgICBdCisgICAg ICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1lIjogImdldE1vY2tQZXJtaXNzaW9u cyIsCisgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiUmV0dXJucyB0aGUgc3RhdGUgb2YgYWxs IG1vY2sgcGVybWlzc2lvbnMsIHdoaWNoIGNvbnRyb2wgd2hldGhlciBwcml2aWxlZ2VkIFdlYiBB UElzIGNhbiBiZSB1c2VkLiBQZXJtaXNzaW9ucyBhcmUgYXBwbGllZCB0byBhbGwgYnJvd3Npbmcg Y29udGV4dHMgYXNzb2NpYXRlZCB3aXRoIHRoZSBhdXRvbWF0aW9uIHNlc3Npb24uIiwKKyAgICAg ICAgICAgICJyZXR1cm5zIjogWworICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGVybWlzc2lv bnMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiTW9ja1Blcm1pc3Npb25E YXRhIiB9LCAiZGVzY3JpcHRpb24iOiAiQXJyYXkgb2YgYXZhaWxhYmxlIG1vY2sgcGVybWlzc2lv bnMgYW5kIHRoZWlyIHZhbHVlcy4iIH0KKyAgICAgICAgICAgIF0KKyAgICAgICAgfSwKKyAgICAg ICAgeworICAgICAgICAgICAgIm5hbWUiOiAic2V0TW9ja1Blcm1pc3Npb25zIiwKKyAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJBdHRlbXB0cyB0byBzZXQgdGhlIHN0YXRlIG9mIG1vY2sgcGVy bWlzc2lvbnMsIHdoaWNoIGNvbnRyb2wgd2hldGhlciBwcml2aWxlZ2VkIFdlYiBBUElzIGNhbiBi ZSB1c2VkLiBQZXJtaXNzaW9ucyB0aGF0IGFyZSBub3QgdW5kZXJzdG9vZCBhcmUgaWdub3JlZC4g UGVybWlzc2lvbnMgYXJlIGFwcGxpZWQgdG8gYWxsIGJyb3dzaW5nIGNvbnRleHRzIGFzc29jaWF0 ZWQgd2l0aCB0aGUgYXV0b21hdGlvbiBzZXNzaW9uLiIsCisgICAgICAgICAgICAicGFyYW1ldGVy cyI6IFsKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBlcm1pc3Npb25zIiwgInR5cGUiOiAi YXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIk1vY2tQZXJtaXNzaW9uRGF0YSIgfSwgImRlc2Ny aXB0aW9uIjogIkFycmF5IG9mIG1vY2sgcGVybWlzc2lvbnMgdG8gc2V0LCBpZiB0aGV5IGFyZSBh dmFpbGFibGUuIiB9CisgICAgICAgICAgICBdCiAgICAgICAgIH0KICAgICBdLAogICAgICJldmVu dHMiOiBbCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCmluZGV4IGQ1ZmFiM2I5YzI2OWY0ZDZlNjUzNWI3 NDk4M2ZmZjJkNmQ3ZmZkYzguLjFjMzExMTAxYjUyOGQ0ZWJkOGFkYjJhZjZhOTc2MWNiODA5Y2I5 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0 b21hdGlvblNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCkBAIC0xMjIyLDYgKzEyMjIsNTAgQEAgdm9pZCBX ZWJBdXRvbWF0aW9uU2Vzc2lvbjo6ZGVsZXRlQWxsQ29va2llcyhFcnJvclN0cmluZyYgZXJyb3JT dHJpbmcsIGNvbnN0IFN0cmkKICAgICBjb29raWVNYW5hZ2VyLT5kZWxldGVDb29raWVzRm9ySG9z dG5hbWUocGFnZS0+d2Vic2l0ZURhdGFTdG9yZSgpLnNlc3Npb25JRCgpLCBhY3RpdmVVUkwuaG9z dCgpKTsKIH0KIAordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Z2V0TW9ja1Blcm1pc3Npb25z KEVycm9yU3RyaW5nJiwgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3BlY3Rv cjo6UHJvdG9jb2w6OkF1dG9tYXRpb246Ok1vY2tQZXJtaXNzaW9uRGF0YT4+JiBvdXRfcGVybWlz c2lvbnMpCit7CisgICAgYXV0byBwZXJtaXNzaW9uc09iamVjdEFycmF5ID0gSW5zcGVjdG9yOjpQ cm90b2NvbDo6QXJyYXk8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6TW9ja1Blcm1p c3Npb25EYXRhPjo6Y3JlYXRlKCk7CisgICAgYXV0byBnZXRVc2VyTWVkaWFQZXJtaXNzaW9uT2Jq ZWN0ID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6TW9ja1Blcm1pc3Npb25EYXRh OjpjcmVhdGUoKQorICAgICAgICAuc2V0UGVybWlzc2lvbihJbnNwZWN0b3I6OlByb3RvY29sOjpB dXRvbWF0aW9uOjpNb2NrUGVybWlzc2lvbjo6R2V0VXNlck1lZGlhKQorICAgICAgICAuc2V0VmFs dWUobV9tb2NrUGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSkKKyAgICAgICAgLnJlbGVhc2UoKTsK KworICAgIHBlcm1pc3Npb25zT2JqZWN0QXJyYXktPmFkZEl0ZW0oV1RGTW92ZShnZXRVc2VyTWVk aWFQZXJtaXNzaW9uT2JqZWN0KSk7CisgICAgb3V0X3Blcm1pc3Npb25zID0gV1RGTW92ZShwZXJt aXNzaW9uc09iamVjdEFycmF5KTsKK30KKwordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2V0 TW9ja1Blcm1pc3Npb25zKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgSW5zcGVjdG9y OjpJbnNwZWN0b3JBcnJheSYgcGVybWlzc2lvbnMpCit7CisgICAgZm9yIChhdXRvIGl0ID0gcGVy bWlzc2lvbnMuYmVnaW4oKTsgaXQgIT0gcGVybWlzc2lvbnMuZW5kKCk7ICsraXQpIHsKKyAgICAg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcGVybWlzc2lvbjsKKyAgICAgICAgaWYgKCFpdC0+ Z2V0KCktPmFzT2JqZWN0KHBlcm1pc3Npb24pKQorICAgICAgICAgICAgRkFJTF9XSVRIX1BSRURF RklORURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJhbWV0ZXIg J3Blcm1pc3Npb25zJyBpcyBpbnZhbGlkLiIpOworCisgICAgICAgIFN0cmluZyBwZXJtaXNzaW9u TmFtZTsKKyAgICAgICAgaWYgKCFwZXJtaXNzaW9uLT5nZXRTdHJpbmcoV1RGOjpBU0NJSUxpdGVy YWwoInBlcm1pc3Npb24iKSwgcGVybWlzc2lvbk5hbWUpKQorICAgICAgICAgICAgRkFJTF9XSVRI X1BSRURFRklORURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJh bWV0ZXIgJ3Blcm1pc3Npb24nIGlzIG1pc3Npbmcgb3IgaW52YWxpZC4iKTsKKworICAgICAgICBh dXRvIHBhcnNlZFBlcm1pc3Npb25OYW1lID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlv bkhlbHBlcnM6OnBhcnNlRW51bVZhbHVlRnJvbVN0cmluZzxJbnNwZWN0b3I6OlByb3RvY29sOjpB dXRvbWF0aW9uOjpNb2NrUGVybWlzc2lvbj4ocGVybWlzc2lvbk5hbWUpOworICAgICAgICBpZiAo IXBhcnNlZFBlcm1pc3Npb25OYW1lKQorICAgICAgICAgICAgRkFJTF9XSVRIX1BSRURFRklORURf RVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJhbWV0ZXIgJ3Blcm1p c3Npb24nIGhhcyBhbiB1bmtub3duIHZhbHVlLiIpOworCisgICAgICAgIGJvb2wgcGVybWlzc2lv blZhbHVlOworICAgICAgICBpZiAoIXBlcm1pc3Npb24tPmdldEJvb2xlYW4oV1RGOjpBU0NJSUxp dGVyYWwoInZhbHVlIiksIHBlcm1pc3Npb25WYWx1ZSkpCisgICAgICAgICAgICBGQUlMX1dJVEhf UFJFREVGSU5FRF9FUlJPUl9BTkRfREVUQUlMUyhJbnZhbGlkUGFyYW1ldGVyLCAiVGhlIHBhcmFt ZXRlciAndmFsdWUnIGlzIG1pc3Npbmcgb3IgaW52YWxpZC4iKTsKKworICAgICAgICBzd2l0Y2gg KHBhcnNlZFBlcm1pc3Npb25OYW1lLnZhbHVlKCkpIHsKKyAgICAgICAgY2FzZSBJbnNwZWN0b3I6 OlByb3RvY29sOjpBdXRvbWF0aW9uOjpNb2NrUGVybWlzc2lvbjo6R2V0VXNlck1lZGlhOgorICAg ICAgICAgICAgbV9tb2NrUGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSA9IHBlcm1pc3Npb25WYWx1 ZTsKKyAgICAgICAgfQorICAgIH0KK30KKworYm9vbCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2hv dWxkQWxsb3dHZXRVc2VyTWVkaWFGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQcm94eSYpIGNvbnN0Cit7 CisgICAgcmV0dXJuIG1fbW9ja1Blcm1pc3Npb25Gb3JHZXRVc2VyTWVkaWE7Cit9CisKKwogI2lm IFVTRShBUFBLSVQpIHx8IFBMQVRGT1JNKEdUSykKIHN0YXRpYyBXZWJFdmVudDo6TW9kaWZpZXJz IHByb3RvY29sTW9kaWZpZXJUb1dlYkV2ZW50TW9kaWZpZXIoSW5zcGVjdG9yOjpQcm90b2NvbDo6 QXV0b21hdGlvbjo6S2V5TW9kaWZpZXIgbW9kaWZpZXIpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgKaW5k ZXggNWI3ZGMzNzk2OWNkNGVhZjZkY2U5MGEwOWZlZDg2YjQ0ZjcyNWMxMi4uMjI5NDNmM2ZkZjhi ODg4ZWE1ZDM4MWQ2MzQ5OTg5ODQ3NzhkMjIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaApAQCAtMTAx LDYgKzEwMSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGhhbmRsZVJ1bk9wZW5QYW5lbChjb25zdCBX ZWJQYWdlUHJveHkmLCBjb25zdCBXZWJGcmFtZVByb3h5JiwgY29uc3QgQVBJOjpPcGVuUGFuZWxQ YXJhbWV0ZXJzJiwgV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eSYpOwogICAgIHZvaWQg d2lsbFNob3dKYXZhU2NyaXB0RGlhbG9nKFdlYlBhZ2VQcm94eSYpOwogCisgICAgYm9vbCBzaG91 bGRBbGxvd0dldFVzZXJNZWRpYUZvclBhZ2UoY29uc3QgV2ViUGFnZVByb3h5JikgY29uc3Q7CisK ICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICAvLyBJbnNwZWN0b3I6OlJlbW90ZUF1 dG9tYXRpb25UYXJnZXQgQVBJCiAgICAgU3RyaW5nIG5hbWUoKSBjb25zdCBvdmVycmlkZSB7IHJl dHVybiBtX3Nlc3Npb25JZGVudGlmaWVyOyB9CkBAIC0xNDUsNiArMTQ3LDggQEAgcHVibGljOgog ICAgIHZvaWQgZGVsZXRlU2luZ2xlQ29va2llKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25z dCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwgY29uc3QgU3RyaW5nJiBjb29raWVOYW1l LCBSZWY8RGVsZXRlU2luZ2xlQ29va2llQ2FsbGJhY2s+JiYpIG92ZXJyaWRlOwogICAgIHZvaWQg YWRkU2luZ2xlQ29va2llKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGJy b3dzaW5nQ29udGV4dEhhbmRsZSwgY29uc3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QmIGNv b2tpZSwgUmVmPEFkZFNpbmdsZUNvb2tpZUNhbGxiYWNrPiYmKSBvdmVycmlkZTsKICAgICB2b2lk IGRlbGV0ZUFsbENvb2tpZXMoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYg YnJvd3NpbmdDb250ZXh0SGFuZGxlKSBvdmVycmlkZTsKKyAgICB2b2lkIGdldE1vY2tQZXJtaXNz aW9ucyhJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkFycmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246Ok1vY2tQZXJtaXNzaW9uRGF0 YT4+JiBvdXRfcGVybWlzc2lvbnMpIG92ZXJyaWRlOworICAgIHZvaWQgc2V0TW9ja1Blcm1pc3Np b25zKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3RvckFy cmF5JiBpbl9wZXJtaXNzaW9ucykgb3ZlcnJpZGU7CiAKICAgICAvLyBQbGF0Zm9ybTogbWFjT1MK ICNpZiBQTEFURk9STShNQUMpCkBAIC0yNTIsNiArMjU2LDggQEAgcHJpdmF0ZToKIAogICAgIFJ1 bkxvb3A6OlRpbWVyPFdlYkF1dG9tYXRpb25TZXNzaW9uPiBtX2xvYWRUaW1lcjsKICAgICBWZWN0 b3I8U3RyaW5nPiBtX2ZpbGVzVG9TZWxlY3RGb3JGaWxlVXBsb2FkOworICAgIAorICAgIGJvb2wg bV9tb2NrUGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSB7IHRydWUgfTsKIAogI2lmIEVOQUJMRShS RU1PVEVfSU5TUEVDVE9SKQogICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsKiBtX3JlbW90 ZUNoYW5uZWwgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAK aW5kZXggN2EyOTI3YThhMDFjMzNiZTc2MmViYmFmZGI2MDM1MzQ5MGVlNDg5My4uMTA2OTZkMjVh ZjAzMDBlZmFmYmM5ZDJmZDIxNTE3Y2QyZTQ1YTAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFu YWdlclByb3h5LmNwcApAQCAtMjMsOCArMjMsMTAgQEAKICNpbmNsdWRlICJBUElTZWN1cml0eU9y aWdpbi5oIgogI2luY2x1ZGUgIkFQSVVJQ2xpZW50LmgiCiAjaW5jbHVkZSAiVXNlck1lZGlhUHJv Y2Vzc01hbmFnZXIuaCIKKyNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lvbi5oIgogI2luY2x1 ZGUgIldlYlBhZ2VNZXNzYWdlcy5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1 ZGUgIldlYlByb2Nlc3NQb29sLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW5j bHVkZSA8V2ViQ29yZS9NZWRpYUNvbnN0cmFpbnRzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Nb2Nr UmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5oPgpAQCAtMzAwLDYgKzMwMiwxNyBAQCB2b2lkIFVz ZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5OjpyZXF1ZXN0VXNlck1lZGlhUGVy bWlzc2lvbkZvckZyYW1lKAogICAgICAgICAgICAgYWxsb3dSZXF1ZXN0KHJlcXVlc3QpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CisgICAgICAgIAorICAgICAgICBpZiAobV9wYWdl LmlzQ29udHJvbGxlZEJ5QXV0b21hdGlvbigpKSB7CisgICAgICAgICAgICBpZiAoV2ViQXV0b21h dGlvblNlc3Npb24qIGF1dG9tYXRpb25TZXNzaW9uID0gbV9wYWdlLnByb2Nlc3MoKS5wcm9jZXNz UG9vbCgpLmF1dG9tYXRpb25TZXNzaW9uKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0b21h dGlvblNlc3Npb24tPnNob3VsZEFsbG93R2V0VXNlck1lZGlhRm9yUGFnZShtX3BhZ2UpKQorICAg ICAgICAgICAgICAgICAgICBhbGxvd1JlcXVlc3QocmVxdWVzdCk7CisgICAgICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgICAgICB1c2VyTWVkaWFBY2Nlc3NXYXNEZW5pZWQodXNlck1l ZGlhSUQsIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0UHJveHk6OlVzZXJNZWRpYUFjY2Vzc0Rl bmlhbFJlYXNvbjo6VXNlck1lZGlhRGlzYWJsZWQpOworCisgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgfQorICAgICAgICB9CiAKICAgICAgICAgaWYgKCFtX3BhZ2UudWlDbGll bnQoKS5kZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChtX3BhZ2UsICpt X3BhZ2UucHJvY2VzcygpLndlYkZyYW1lKGZyYW1lSUQpLCBXVEZNb3ZlKHVzZXJNZWRpYU9yaWdp biksIFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pLCByZXF1ZXN0LmdldCgpKSkKICAgICAgICAgICAg IHVzZXJNZWRpYUFjY2Vzc1dhc0RlbmllZCh1c2VyTWVkaWFJRCwgVXNlck1lZGlhUGVybWlzc2lv blJlcXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpVc2VyTWVkaWFEaXNh YmxlZCk7Cg== 321821 2017-09-26 09:01:00 -0700 2017-09-26 10:12:25 -0700 Patch bug-177405-20170926090100.patch text/plain 11544 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ0YTM2YjQ2MzRmMzFmNWYw ZDRiNWZlZGQxNDA4MmRiNDk4YWM3YWYuLjg1MDQ0MWM0ZmFkM2E2ZGMzOGVhNTU3Njk2YzNlYWRk ZjhjNTJiYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTctMDktMjIgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRpb246IGFkZCBjb21t YW5kcyB0byBnZXQgYW5kIHNldCB1c2VyIHBlcm1pc3Npb25zIGZvciBwYWdlcyBpbiBhbiBhdXRv bWF0aW9uIHNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NzQwNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ0OTM4NDY+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgIFRvIHRlc3Qgc29tZSBX ZWIgQVBJcyB2aWEgV2ViRHJpdmVyLCBpdCBuZWVkcyB0byBiZSBwb3NzaWJsZSB0byBzaW11bGF0 ZSBhIHVzZXIgYWNjZXB0aW5nIG9yCisgICAgICAgIGRlbnlpbmcgcmVxdWVzdHMgZm9yIGVsZXZh dGVkIHBlcm1pc3Npb25zLCBzdWNoIGFzIGdldFVzZXJNZWRpYSgpIG9yIGdlb2xvY2F0aW9uLgor CisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIGdlbmVyaWMgd2F5IGZvciBhIHRlc3QgdG8gY29u ZmlndXJlIHRoZSBhdXRvbWF0aW9uIHNlc3Npb24ncworICAgICAgICBzaW11bGF0ZWQgdXNlciBh Y3Rpb24gdGhhdCB3aWxsIGhhcHBlbiBldmVyeSB0aW1lIGEgc3BlY2lmaWMgcGVybWlzc2lvbiBp cyByZXF1ZXN0ZWQuCisgICAgICAgIEEgdGVzdCBjYW4gc2V0IGEgInNlc3Npb24gcGVybWlzc2lv biIsIHRyaWdnZXIgdGhlIHBlcm1pc3Npb24gcmVxdWVzdCB2aWEgV2ViIEFQSSwKKyAgICAgICAg YW5kIHRoZW4gdmVyaWZ5IHRoYXQgdGhlIHBhZ2UgYmVoYXZlcyBjb3JyZWN0bHkgd2hlbiB0aGUg dXNlciBhY2NlcHRlZCBvciBkZW5pZWQgdGhlIHJlcXVlc3QuCisKKyAgICAgICAgQSBwcm9wb3Nh bCB3aWxsIGZvbGxvdyBzaG9ydGx5IHRvIGV4cG9zZSB0aGlzIGZ1bmN0aW9uYWxpdHkgdmlhIGEg bmV3IFJFU1QgQVBJIGVuZHBvaW50LgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24v QXV0b21hdGlvbi5qc29uOiBBZGQgZ2V0L3NldCBjb21tYW5kcy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViQXV0b21hdGlvblNlc3Npb246OmdldFNlc3Npb25QZXJtaXNzaW9ucyk6CisgICAgICAg IChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpzZXRTZXNzaW9uUGVybWlzc2lvbnMpOgor ICAgICAgICBGb3Igbm93LCBzdG9yZSB0aGUgcGVybWlzc2lvbiB2YWx1ZSBpbiBhIG1lbWJlciBv ZiB0aGUgc2Vzc2lvbi4gVGhlIGdldFVzZXJNZWRpYQorICAgICAgICBwZXJtaXNzaW9uIG9ubHkg bmVlZHMgYSBib29sLCBidXQgdGhlcmUgaXMgbm8gcmVhc29uIHdlIGNvdWxkbid0IHVzZSBtb3Jl IGNvbXBsaWNhdGVkCisgICAgICAgIHZhbHVlcyBmb3IgcGVybWlzc2lvbnMgKGkuZS4sIHN0cmlu Z3MsIG51bWJlcnMsIGFycmF5cywgb2JqZWN0cykgc29tZWRheS4KKworICAgICAgICAoV2ViS2l0 OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2hvdWxkQWxsb3dHZXRVc2VyTWVkaWFGb3JQYWdlIGNv bnN0KToKKyAgICAgICAgRXhwb3NlIHRoZSBzcGVjaWZpYyBkZWNpc2lvbiB0byBiZSB0YWtlbiBi YXNlZCBvbiB3aGV0aGVyIHRoZSByZXF1ZXN0IGlzIGFsbG93ZWQgb3IgZGVuaWVkLgorCisgICAg ICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94 eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZSk6CisgICAgICAgIElmIHRoZSBw YWdlIGlzIHVuZGVyIGF1dG9tYXRpb24sIHRoZW4gc2ltdWxhdGUgdGhlIHVzZXIgYWN0aW9uIGFj Y29yZGluZyB0byB0aGUKKyAgICAgICAgY3VycmVudCB2YWx1ZXMgb2YgcGVybWlzc2lvbnMgc2V0 IGZvciB0aGUgc2Vzc2lvbi4KKwogMjAxNy0wOS0yNCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0 YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVmlld3BvcnQgZml0IGlzIG5vIGxvbmdlciBl eHBlcmltZW50YWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vQXV0b21hdGlvbi5qc29uIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9B dXRvbWF0aW9uLmpzb24KaW5kZXggMjg2NTRkZmIyZmNiMmI0OTFmMmM3Mjg0ZTA3YWE5NjVmYjJl MjMwOS4uNWM1MmYyMmQwZjQyZmUwOGM1YWMwYWNiMDM3YmNhMmVmMDcyMDVmZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb24KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb24KQEAg LTIxNyw2ICsyMTcsMjIgQEAKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlY3VyZSIsICJ0 eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBpZiBjb29raWUgaXMgc2VjdXJl LiIgfSwKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlc3Npb24iLCAidHlwZSI6ICJib29s ZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUgaW4gY2FzZSBvZiBzZXNzaW9uIGNvb2tpZS4iIH0K ICAgICAgICAgICAgIF0KKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgImlkIjog IlNlc3Npb25QZXJtaXNzaW9uIiwKKyAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCisgICAg ICAgICAgICAiZGVzY3JpcHRpb24iOiAiRW51bWVyYXRlcyBkaWZmZXJlbnQgcGVybWlzc2lvbnMg dGhhdCBtdXN0IGJlIG9idGFpbmVkIGluIG9yZGVyIHRvIHVzZSBwcml2aWxlZ2VkIEFQSXMuIiwK KyAgICAgICAgICAgICJlbnVtIjogWworICAgICAgICAgICAgICAgICJHZXRVc2VyTWVkaWEiCisg ICAgICAgICAgICBdCisgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgICJpZCI6ICJT ZXNzaW9uUGVybWlzc2lvbkRhdGEiLAorICAgICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKKyAg ICAgICAgICAgICJwcm9wZXJ0aWVzIjogWworICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicGVy bWlzc2lvbiIsICIkcmVmIjogIlNlc3Npb25QZXJtaXNzaW9uIiB9LAorICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidmFsdWUiLCAidHlwZSI6ICJib29sZWFuIiB9CisgICAgICAgICAgICBdCiAg ICAgICAgIH0KICAgICBdLAogICAgICJjb21tYW5kcyI6IFsKQEAgLTUzNCw2ICs1NTAsMjAgQEAK ICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi YnJvd3NpbmdDb250ZXh0SGFuZGxlIiwgIiRyZWYiOiAiQnJvd3NpbmdDb250ZXh0SGFuZGxlIiwg ImRlc2NyaXB0aW9uIjogIlRoZSBoYW5kbGUgZm9yIHRoZSBicm93c2luZyBjb250ZXh0LiIgfQog ICAgICAgICAgICAgXQorICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICAibmFtZSI6 ICJnZXRTZXNzaW9uUGVybWlzc2lvbnMiLAorICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlJl dHVybnMgdGhlIHN0YXRlIG9mIGFsbCBzZXNzaW9uIHBlcm1pc3Npb25zLCB3aGljaCBjb250cm9s IHdoZXRoZXIgcHJpdmlsZWdlZCBXZWIgQVBJcyBjYW4gYmUgdXNlZC4gUGVybWlzc2lvbnMgYXJl IGFwcGxpZWQgdG8gYWxsIGJyb3dzaW5nIGNvbnRleHRzIGFzc29jaWF0ZWQgd2l0aCB0aGUgYXV0 b21hdGlvbiBzZXNzaW9uLiIsCisgICAgICAgICAgICAicmV0dXJucyI6IFsKKyAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInBlcm1pc3Npb25zIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7 ICIkcmVmIjogIlNlc3Npb25QZXJtaXNzaW9uRGF0YSIgfSwgImRlc2NyaXB0aW9uIjogIkFycmF5 IG9mIGF2YWlsYWJsZSBzZXNzaW9uIHBlcm1pc3Npb25zIGFuZCB0aGVpciB2YWx1ZXMuIiB9Cisg ICAgICAgICAgICBdCisgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgICJuYW1lIjog InNldFNlc3Npb25QZXJtaXNzaW9ucyIsCisgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiQXR0 ZW1wdHMgdG8gc2V0IHRoZSBzdGF0ZSBvZiBzZXNzaW9uIHBlcm1pc3Npb25zLCB3aGljaCBjb250 cm9sIHdoZXRoZXIgcHJpdmlsZWdlZCBXZWIgQVBJcyBjYW4gYmUgdXNlZC4gUGVybWlzc2lvbnMg dGhhdCBhcmUgbm90IHVuZGVyc3Rvb2QgYXJlIGlnbm9yZWQuIFBlcm1pc3Npb25zIGFyZSBhcHBs aWVkIHRvIGFsbCBicm93c2luZyBjb250ZXh0cyBhc3NvY2lhdGVkIHdpdGggdGhlIGF1dG9tYXRp b24gc2Vzc2lvbi4iLAorICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCisgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJwZXJtaXNzaW9ucyIsICJ0eXBlIjogImFycmF5IiwgIml0ZW1zIjogeyAi JHJlZiI6ICJTZXNzaW9uUGVybWlzc2lvbkRhdGEiIH0sICJkZXNjcmlwdGlvbiI6ICJBcnJheSBv ZiBzZXNzaW9uIHBlcm1pc3Npb25zIHRvIHNldCwgaWYgdGhleSBhcmUgYXZhaWxhYmxlLiIgfQor ICAgICAgICAgICAgXQogICAgICAgICB9CiAgICAgXSwKICAgICAiZXZlbnRzIjogWwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRp b25TZXNzaW9uLmNwcAppbmRleCBkNWZhYjNiOWMyNjlmNGQ2ZTY1MzViNzQ5ODNmZmYyZDZkN2Zm ZGM4Li44NDk0ZDg4NGYwOTc2MzY3NGYzYmU2MzRhYjVmMDYzYjRmODY3YjQ5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRp b25TZXNzaW9uLmNwcApAQCAtMTIyMiw2ICsxMjIyLDUwIEBAIHZvaWQgV2ViQXV0b21hdGlvblNl c3Npb246OmRlbGV0ZUFsbENvb2tpZXMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBT dHJpCiAgICAgY29va2llTWFuYWdlci0+ZGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKHBhZ2UtPndl YnNpdGVEYXRhU3RvcmUoKS5zZXNzaW9uSUQoKSwgYWN0aXZlVVJMLmhvc3QoKSk7CiB9CiAKK3Zv aWQgV2ViQXV0b21hdGlvblNlc3Npb246OmdldFNlc3Npb25QZXJtaXNzaW9ucyhFcnJvclN0cmlu ZyYsIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29s OjpBdXRvbWF0aW9uOjpTZXNzaW9uUGVybWlzc2lvbkRhdGE+PiYgb3V0X3Blcm1pc3Npb25zKQor eworICAgIGF1dG8gcGVybWlzc2lvbnNPYmplY3RBcnJheSA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkFycmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlNlc3Npb25QZXJtaXNzaW9u RGF0YT46OmNyZWF0ZSgpOworICAgIGF1dG8gZ2V0VXNlck1lZGlhUGVybWlzc2lvbk9iamVjdCA9 IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlNlc3Npb25QZXJtaXNzaW9uRGF0YTo6 Y3JlYXRlKCkKKyAgICAgICAgLnNldFBlcm1pc3Npb24oSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0 b21hdGlvbjo6U2Vzc2lvblBlcm1pc3Npb246OkdldFVzZXJNZWRpYSkKKyAgICAgICAgLnNldFZh bHVlKG1fcGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSkKKyAgICAgICAgLnJlbGVhc2UoKTsKKwor ICAgIHBlcm1pc3Npb25zT2JqZWN0QXJyYXktPmFkZEl0ZW0oV1RGTW92ZShnZXRVc2VyTWVkaWFQ ZXJtaXNzaW9uT2JqZWN0KSk7CisgICAgb3V0X3Blcm1pc3Npb25zID0gV1RGTW92ZShwZXJtaXNz aW9uc09iamVjdEFycmF5KTsKK30KKwordm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2V0U2Vz c2lvblBlcm1pc3Npb25zKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgSW5zcGVjdG9y OjpJbnNwZWN0b3JBcnJheSYgcGVybWlzc2lvbnMpCit7CisgICAgZm9yIChhdXRvIGl0ID0gcGVy bWlzc2lvbnMuYmVnaW4oKTsgaXQgIT0gcGVybWlzc2lvbnMuZW5kKCk7ICsraXQpIHsKKyAgICAg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcGVybWlzc2lvbjsKKyAgICAgICAgaWYgKCFpdC0+ Z2V0KCktPmFzT2JqZWN0KHBlcm1pc3Npb24pKQorICAgICAgICAgICAgRkFJTF9XSVRIX1BSRURF RklORURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJhbWV0ZXIg J3Blcm1pc3Npb25zJyBpcyBpbnZhbGlkLiIpOworCisgICAgICAgIFN0cmluZyBwZXJtaXNzaW9u TmFtZTsKKyAgICAgICAgaWYgKCFwZXJtaXNzaW9uLT5nZXRTdHJpbmcoV1RGOjpBU0NJSUxpdGVy YWwoInBlcm1pc3Npb24iKSwgcGVybWlzc2lvbk5hbWUpKQorICAgICAgICAgICAgRkFJTF9XSVRI X1BSRURFRklORURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJh bWV0ZXIgJ3Blcm1pc3Npb24nIGlzIG1pc3Npbmcgb3IgaW52YWxpZC4iKTsKKworICAgICAgICBh dXRvIHBhcnNlZFBlcm1pc3Npb25OYW1lID0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlv bkhlbHBlcnM6OnBhcnNlRW51bVZhbHVlRnJvbVN0cmluZzxJbnNwZWN0b3I6OlByb3RvY29sOjpB dXRvbWF0aW9uOjpTZXNzaW9uUGVybWlzc2lvbj4ocGVybWlzc2lvbk5hbWUpOworICAgICAgICBp ZiAoIXBhcnNlZFBlcm1pc3Npb25OYW1lKQorICAgICAgICAgICAgRkFJTF9XSVRIX1BSRURFRklO RURfRVJST1JfQU5EX0RFVEFJTFMoSW52YWxpZFBhcmFtZXRlciwgIlRoZSBwYXJhbWV0ZXIgJ3Bl cm1pc3Npb24nIGhhcyBhbiB1bmtub3duIHZhbHVlLiIpOworCisgICAgICAgIGJvb2wgcGVybWlz c2lvblZhbHVlOworICAgICAgICBpZiAoIXBlcm1pc3Npb24tPmdldEJvb2xlYW4oV1RGOjpBU0NJ SUxpdGVyYWwoInZhbHVlIiksIHBlcm1pc3Npb25WYWx1ZSkpCisgICAgICAgICAgICBGQUlMX1dJ VEhfUFJFREVGSU5FRF9FUlJPUl9BTkRfREVUQUlMUyhJbnZhbGlkUGFyYW1ldGVyLCAiVGhlIHBh cmFtZXRlciAndmFsdWUnIGlzIG1pc3Npbmcgb3IgaW52YWxpZC4iKTsKKworICAgICAgICBzd2l0 Y2ggKHBhcnNlZFBlcm1pc3Npb25OYW1lLnZhbHVlKCkpIHsKKyAgICAgICAgY2FzZSBJbnNwZWN0 b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpTZXNzaW9uUGVybWlzc2lvbjo6R2V0VXNlck1lZGlh OgorICAgICAgICAgICAgbV9wZXJtaXNzaW9uRm9yR2V0VXNlck1lZGlhID0gcGVybWlzc2lvblZh bHVlOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9Cit9CisKK2Jvb2wgV2Vi QXV0b21hdGlvblNlc3Npb246OnNob3VsZEFsbG93R2V0VXNlck1lZGlhRm9yUGFnZShjb25zdCBX ZWJQYWdlUHJveHkmKSBjb25zdAoreworICAgIHJldHVybiBtX3Blcm1pc3Npb25Gb3JHZXRVc2Vy TWVkaWE7Cit9CisKICNpZiBVU0UoQVBQS0lUKSB8fCBQTEFURk9STShHVEspCiBzdGF0aWMgV2Vi RXZlbnQ6Ok1vZGlmaWVycyBwcm90b2NvbE1vZGlmaWVyVG9XZWJFdmVudE1vZGlmaWVyKEluc3Bl Y3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OktleU1vZGlmaWVyIG1vZGlmaWVyKQogewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9u U2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvbi5oCmluZGV4IDViN2RjMzc5NjljZDRlYWY2ZGNlOTBhMDlmZWQ4NmI0NGY3MjVj MTIuLjhiOTA5NzFhOTgyZjE5MTJkOWYxNWY5NTdhYzg3OWM2M2IyODBiMjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24u aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25T ZXNzaW9uLmgKQEAgLTEwMSw2ICsxMDEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBoYW5kbGVSdW5P cGVuUGFuZWwoY29uc3QgV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViRnJhbWVQcm94eSYsIGNvbnN0 IEFQSTo6T3BlblBhbmVsUGFyYW1ldGVycyYsIFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJv eHkmKTsKICAgICB2b2lkIHdpbGxTaG93SmF2YVNjcmlwdERpYWxvZyhXZWJQYWdlUHJveHkmKTsK IAorICAgIGJvb2wgc2hvdWxkQWxsb3dHZXRVc2VyTWVkaWFGb3JQYWdlKGNvbnN0IFdlYlBhZ2VQ cm94eSYpIGNvbnN0OworCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAgLy8gSW5z cGVjdG9yOjpSZW1vdGVBdXRvbWF0aW9uVGFyZ2V0IEFQSQogICAgIFN0cmluZyBuYW1lKCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9zZXNzaW9uSWRlbnRpZmllcjsgfQpAQCAtMTQ1LDYgKzE0 Nyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGRlbGV0ZVNpbmdsZUNvb2tpZShJbnNwZWN0b3I6OkVy cm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRleHRIYW5kbGUsIGNvbnN0IFN0 cmluZyYgY29va2llTmFtZSwgUmVmPERlbGV0ZVNpbmdsZUNvb2tpZUNhbGxiYWNrPiYmKSBvdmVy cmlkZTsKICAgICB2b2lkIGFkZFNpbmdsZUNvb2tpZShJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwg Y29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRleHRIYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5z cGVjdG9yT2JqZWN0JiBjb29raWUsIFJlZjxBZGRTaW5nbGVDb29raWVDYWxsYmFjaz4mJikgb3Zl cnJpZGU7CiAgICAgdm9pZCBkZWxldGVBbGxDb29raWVzKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcm LCBjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSkgb3ZlcnJpZGU7CisgICAgdm9p ZCBnZXRTZXNzaW9uUGVybWlzc2lvbnMoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIFJlZlB0cjxJ bnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9u OjpTZXNzaW9uUGVybWlzc2lvbkRhdGE+PiYgb3V0X3Blcm1pc3Npb25zKSBvdmVycmlkZTsKKyAg ICB2b2lkIHNldFNlc3Npb25QZXJtaXNzaW9ucyhJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29u c3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYgaW5fcGVybWlzc2lvbnMpIG92ZXJyaWRlOwog CiAgICAgLy8gUGxhdGZvcm06IG1hY09TCiAjaWYgUExBVEZPUk0oTUFDKQpAQCAtMjUzLDYgKzI1 Nyw4IEBAIHByaXZhdGU6CiAgICAgUnVuTG9vcDo6VGltZXI8V2ViQXV0b21hdGlvblNlc3Npb24+ IG1fbG9hZFRpbWVyOwogICAgIFZlY3RvcjxTdHJpbmc+IG1fZmlsZXNUb1NlbGVjdEZvckZpbGVV cGxvYWQ7CiAKKyAgICBib29sIG1fcGVybWlzc2lvbkZvckdldFVzZXJNZWRpYSB7IHRydWUgfTsK KwogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRD aGFubmVsKiBtX3JlbW90ZUNoYW5uZWwgeyBudWxscHRyIH07CiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdl clByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25S ZXF1ZXN0TWFuYWdlclByb3h5LmNwcAppbmRleCA3YTI5MjdhOGEwMWMzM2JlNzYyZWJiYWZkYjYw MzUzNDkwZWU0ODkzLi4xMDY5NmQyNWFmMDMwMGVmYWZiYzlkMmZkMjE1MTdjZDJlNDVhMDEwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVx dWVzdE1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVXNlck1l ZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwCkBAIC0yMyw4ICsyMywxMCBAQAog I2luY2x1ZGUgIkFQSVNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiQVBJVUlDbGllbnQuaCIK ICNpbmNsdWRlICJVc2VyTWVkaWFQcm9jZXNzTWFuYWdlci5oIgorI2luY2x1ZGUgIldlYkF1dG9t YXRpb25TZXNzaW9uLmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAi V2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlICJX ZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL01lZGlhQ29uc3RyYWludHMuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL01vY2tSZWFsdGltZU1lZGlhU291cmNlQ2VudGVyLmg+CkBAIC0z MDAsNiArMzAyLDE3IEBAIHZvaWQgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJv eHk6OnJlcXVlc3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUoCiAgICAgICAgICAgICBhbGxv d1JlcXVlc3QocmVxdWVzdCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIGlmIChtX3BhZ2UuaXNDb250cm9sbGVkQnlBdXRvbWF0aW9uKCkpIHsKKyAg ICAgICAgICAgIGlmIChXZWJBdXRvbWF0aW9uU2Vzc2lvbiogYXV0b21hdGlvblNlc3Npb24gPSBt X3BhZ2UucHJvY2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkgeworICAg ICAgICAgICAgICAgIGlmIChhdXRvbWF0aW9uU2Vzc2lvbi0+c2hvdWxkQWxsb3dHZXRVc2VyTWVk aWFGb3JQYWdlKG1fcGFnZSkpCisgICAgICAgICAgICAgICAgICAgIGFsbG93UmVxdWVzdChyZXF1 ZXN0KTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHVzZXJNZWRp YUFjY2Vzc1dhc0RlbmllZCh1c2VyTWVkaWFJRCwgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQ cm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpVc2VyTWVkaWFEaXNhYmxlZCk7CisK KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KIAogICAg ICAgICBpZiAoIW1fcGFnZS51aUNsaWVudCgpLmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1p c3Npb25SZXF1ZXN0KG1fcGFnZSwgKm1fcGFnZS5wcm9jZXNzKCkud2ViRnJhbWUoZnJhbWVJRCks IFdURk1vdmUodXNlck1lZGlhT3JpZ2luKSwgV1RGTW92ZSh0b3BMZXZlbE9yaWdpbiksIHJlcXVl c3QuZ2V0KCkpKQogICAgICAgICAgICAgdXNlck1lZGlhQWNjZXNzV2FzRGVuaWVkKHVzZXJNZWRp YUlELCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5p YWxSZWFzb246OlVzZXJNZWRpYURpc2FibGVkKTsK