232207 2021-10-23 13:55:34 -0700 Unify sandbox rules for diagnostic services 2021-11-08 10:36:21 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham darin gavin.p mazander webkit-bug-importer oldest_to_newest 1808116 0 pvollan 2021-10-23 13:55:34 -0700 In the WebContent process, we only allow access to diagnostic services for internal builds. We should do the same in all WebKit sandboxes. 1808118 1 webkit-bug-importer 2021-10-23 13:56:10 -0700 <rdar://problem/84582424> 1808119 2 442278 pvollan 2021-10-23 13:59:40 -0700 Created attachment 442278 Patch 1812675 3 442278 pvollan 2021-11-08 10:13:47 -0800 Comment on attachment 442278 Patch Thanks for reviewing! 1812690 4 ews-feeder 2021-11-08 10:36:19 -0800 Committed r285412 (243969@main): <https://commits.webkit.org/243969@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442278. 442278 2021-10-23 13:59:40 -0700 2021-11-08 10:36:20 -0800 Patch bug-232207-20211023135937.patch text/plain 14958 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODQ3NDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIxLTEwLTIzICBQZXIgQXJuZSBW b2xsYW4gPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZ5IHNhbmRib3ggcnVsZXMg Zm9yIGRpYWdub3N0aWMgc2VydmljZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMjIwNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ1ODI0MjQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gdGhl IFdlYkNvbnRlbnQgcHJvY2Vzcywgd2Ugb25seSBhbGxvdyBhY2Nlc3MgdG8gZGlhZ25vc3RpYyBz ZXJ2aWNlcyBmb3IgaW50ZXJuYWwgYnVpbGRzLiBXZSBzaG91bGQgZG8gdGhlIHNhbWUgaW4gYWxs IFdlYktpdCBzYW5kYm94ZXMuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL21hYy9jb20uYXBwbGUu V2ViS2l0LkdQVVByb2Nlc3Muc2IuaW46CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL2Nv bS5hcHBsZS5XZWJLaXQuTmV0d29ya1Byb2Nlc3Muc2IuaW46CisgICAgICAgICogUmVzb3VyY2Vz L1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5HUFUuc2I6CisgICAgICAgICog UmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5OZXR3b3JraW5n LnNiOgorICAgICAgICAqIFJlc291cmNlcy9TYW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5X ZWJLaXQuV2ViQXV0aG4uc2I6CisgICAgICAgICogUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9p b3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNiLmluOgorICAgICAgICAqIFNoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OmlzSW50 ZXJuYWxJbnN0YWxsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6ZGlhZ25vc3RpY1NlcnZp Y2VzKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJBdXRoblByb2Nlc3MvbWFjL2NvbS5hcHBsZS5X ZWJLaXQuV2ViQXV0aG5Qcm9jZXNzLnNiLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2Ev V2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwbGF0Zm9y bUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvbS5hcHBsZS5X ZWJQcm9jZXNzLnNiLmluOgorCiAyMDIxLTEwLTIzICBCcmFuZG9uIFN0ZXdhcnQgIDxicmFuZG9u c3Rld2FydEBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViQ29udGVudCBjcmFzaCB3aGVuIHNlbmRp bmcgaW52YWxpZCBJUEMgbWVzc2FnZSB1c2luZyBJUEMgdGVzdGluZyBBUEkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5HUFVQcm9jZXNzLnNiLmlu Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldl YktpdC5HUFVQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyODQ2NDgpCisrKyBTb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuR1BVUHJvY2Vzcy5zYi5pbgkod29ya2lu ZyBjb3B5KQpAQCAtNzMwLDEyICs3MzAsNyBAQAogICAgIChhbGxvdyBtYWNoLWxvb2t1cAogICAg ICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5hbmFseXRpY3NkIikKICAgICAgICAgKGdsb2Jh bC1uYW1lICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiKQotICAgICkKLSkKLQotKGFsbG93IG1hY2gt bG9va3VwCi0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUucG93ZXJsb2cucGx4cGNsb2dnZXIu eHBjIikKLSkKKyAgICAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUucG93ZXJsb2cucGx4cGNs b2dnZXIueHBjIikpKQogCiA7OyBWYXJpb3VzIHNlcnZpY2VzIHJlcXVpcmVkIGJ5IEFwcEtpdCBh bmQgb3RoZXIgZnJhbWV3b3JrcwogKGFsbG93IG1hY2gtbG9va3VwCkluZGV4OiBTb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtQcm9jZXNzLnNi LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL2NvbS5h cHBsZS5XZWJLaXQuTmV0d29ya1Byb2Nlc3Muc2IuaW4JKHJldmlzaW9uIDI4NDY0OCkKKysrIFNv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL2NvbS5hcHBsZS5XZWJLaXQuTmV0d29ya1By b2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTM1MCwxMiArMzUwLDkgQEAKICAgICAoZ2xv YmFsLW5hbWUgImNvbS5hcHBsZS5GaWxlQ29vcmRpbmF0aW9uIikKICAgICAoZ2xvYmFsLW5hbWUg ImNvbS5hcHBsZS5Qb3dlck1hbmFnZW1lbnQuY29udHJvbCIpCiAgICAgKGdsb2JhbC1uYW1lICJj b20uYXBwbGUuU3lzdGVtQ29uZmlndXJhdGlvbi5jb25maWdkIikKLSAgICAoZ2xvYmFsLW5hbWUg ImNvbS5hcHBsZS5hZ2dyZWdhdGVkIikKLSAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5hbmFs eXRpY3NkIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5jb29raWVkIikKICAgICAoZ2xv YmFsLW5hbWUgImNvbS5hcHBsZS5jZm5ldHdvcmsuQXV0aEJyb2tlckFnZW50IikKICAgICAoZ2xv YmFsLW5hbWUgImNvbS5hcHBsZS5jZm5ldHdvcmsuY2ZuZXR3b3JrYWdlbnQiKQotICAgIChnbG9i YWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5h cHBsZS5pc3QuZHMuYXBwbGVjb25uZWN0Mi5zZXJ2aWNlLmtkY3R1bm5lbGNvbnRyb2xsZXIiKQog ICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmxvZ2QiKQogICAgIChnbG9iYWwtbmFtZSAiY29t LmFwcGxlLmxvZ2QuZXZlbnRzIikKQEAgLTM2Niw2ICszNjMsMTIgQEAKICAgICAoZ2xvYmFsLW5h bWUgImNvbS5hcHBsZS5BcHBTU08uc2VydmljZS14cGMiKQogKQogCisod2l0aC1maWx0ZXIgKHN5 c3RlbS1hdHRyaWJ1dGUgYXBwbGUtaW50ZXJuYWwpCisgICAgKGFsbG93IG1hY2gtbG9va3VwCisg ICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFnZ3JlZ2F0ZWQiKQorICAgICAgICAoZ2xv YmFsLW5hbWUgImNvbS5hcHBsZS5hbmFseXRpY3NkIikKKyAgICAgICAgKGdsb2JhbC1uYW1lICJj b20uYXBwbGUuZGlhZ25vc3RpY2QiKSkpCisKIChhbGxvdyBtYWNoLWxvb2t1cCAod2l0aCB0ZWxl bWV0cnkpIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLndlYmtpdC5hZGF0dHJpYnV0aW9uZC5zZXJ2 aWNlIikpCiAoYWxsb3cgbWFjaC1sb29rdXAgKHdpdGggdGVsZW1ldHJ5KSAoZ2xvYmFsLW5hbWUg Im9yZy53ZWJraXQucGNtdGVzdGRhZW1vbi5zZXJ2aWNlIikpCiAKSW5kZXg6IFNvdXJjZS9XZWJL aXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5HUFUuc2IK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lv cy9jb20uYXBwbGUuV2ViS2l0LkdQVS5zYgkocmV2aXNpb24gMjg0NjQ4KQorKysgU291cmNlL1dl YktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LkdQVS5z Ygkod29ya2luZyBjb3B5KQpAQCAtNTgwLDkgKzU4MCw2IEBACiAoYWxsb3cgaXBjLXBvc2l4LXNo bS1yZWFkKiAod2l0aCB0ZWxlbWV0cnkpCiAgICAgICAgKGlwYy1wb3NpeC1uYW1lICJhcHBsZS5z aG0ubm90aWZpY2F0aW9uX2NlbnRlciIpKQogCi0oYWxsb3cgbWFjaC1sb29rdXAgKHdpdGggdGVs ZW1ldHJ5KQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikpCi0KICht YW5hZ2VkLWNvbmZpZ3VyYXRpb24tcmVhZC1wdWJsaWMpCiAKIChkZW55IHN5c3RlbS1pbmZvICh3 aXRoIG5vLXJlcG9ydCkKQEAgLTg3MSw5ICs4NjgsMTAgQEAKIAogKG1lZGlhLWFjY2Vzc2liaWxp dHktc3VwcG9ydCkKIAotOzsgVmFyaW91cyBzZXJ2aWNlcyByZXF1aXJlZCBieSBDRk5ldHdvcmsg YW5kIG90aGVyIGZyYW1ld29ya3MKLShhbGxvdyBtYWNoLWxvb2t1cCAod2l0aCB0ZWxlbWV0cnkp Ci0gICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuYW5hbHl0aWNzZCIpKQorKHdpdGgtZmlsdGVy IChzeXN0ZW0tYXR0cmlidXRlIGFwcGxlLWludGVybmFsKQorICAgIChhbGxvdyBtYWNoLWxvb2t1 cAorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaWFnbm9zdGljZCIpCisgICAgICAg IChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFuYWx5dGljc2QiKSkpCiAKIDs7IFNpbGVuY2UgcmVw b3J0cyBhYm91dCB0aGluZ3Mgd2UgZG8gbm90IHdhbnQgYWNjZXNzIHRvOgogKGRlbnkgbWFjaC1s b29rdXAgKHdpdGggbm8tcmVwb3J0KQpJbmRleDogU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2Fu ZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBw bGUuV2ViS2l0Lk5ldHdvcmtpbmcuc2IJKHJldmlzaW9uIDI4NDY0OCkKKysrIFNvdXJjZS9XZWJL aXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5OZXR3b3Jr aW5nLnNiCSh3b3JraW5nIGNvcHkpCkBAIC00OTMsMTIgKzQ5Myw2IEBACiAoYWxsb3cgbWFjaC1s b29rdXAgKHdpdGggdGVsZW1ldHJ5KQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpc3Ry aWJ1dGVkX25vdGlmaWNhdGlvbnNAMXYzIikpCiAKLTs7IFRoZXNlIGFyZSBhbHdheXMgbmVlZGVk IGluIHRoZSBOZXR3b3JrIHByb2Nlc3M6Ci0oYWxsb3cgbWFjaC1sb29rdXAgKHdpdGggdGVsZW1l dHJ5KQotICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikKLSAgICAoZ2xv YmFsLW5hbWUgImNvbS5hcHBsZS5hZ2dyZWdhdGVkIikKLSkKLQogKG1hbmFnZWQtY29uZmlndXJh dGlvbi1yZWFkLXB1YmxpYykKIAogKGFsbG93IG1hY2gtbG9va3VwICh3aXRoIHRlbGVtZXRyeSkK QEAgLTY0Miw4ICs2MzYsMTMgQEAKIAogOzsgVmFyaW91cyBzZXJ2aWNlcyByZXF1aXJlZCBieSBz eXN0ZW0gZnJhbWV3b3JrcwogKGFsbG93IG1hY2gtbG9va3VwICh3aXRoIHRlbGVtZXRyeSkKLSAg ICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sc2QubWFwZGIiKQotICAgIChnbG9iYWwtbmFtZSAi Y29tLmFwcGxlLmFuYWx5dGljc2QiKSkKKyAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5sc2Qu bWFwZGIiKSkKKworKHdpdGgtZmlsdGVyIChzeXN0ZW0tYXR0cmlidXRlIGFwcGxlLWludGVybmFs KQorICAgIChhbGxvdyBtYWNoLWxvb2t1cAorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBs ZS5kaWFnbm9zdGljZCIpCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmFnZ3JlZ2F0 ZWQiKQorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5hbmFseXRpY3NkIikpKQogCiA7 OyBGb3IgcmVwb3J0aW5nIHByb2dyZXNzIGZvciBhY3RpdmUgZG93bmxvYWRzIDxyZGFyOi8vcHJv YmxlbS80NDQwNTY2MT4KIChhbGxvdyBtYWNoLWxvb2t1cCAod2l0aCB0ZWxlbWV0cnkpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYW5kYm94UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5X ZWJLaXQuV2ViQXV0aG4uc2IKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9SZXNvdXJjZXMv U2FuZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LldlYkF1dGhuLnNiCShyZXZpc2lv biAyODQ2NDgpCisrKyBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYW5kYm94UHJvZmlsZXMvaW9z L2NvbS5hcHBsZS5XZWJLaXQuV2ViQXV0aG4uc2IJKHdvcmtpbmcgY29weSkKQEAgLTIzNSwxNyAr MjM1LDkgQEAKICh3aXRoLWZpbHRlciAoc3lzdGVtLWF0dHJpYnV0ZSBhcHBsZS1pbnRlcm5hbCkK ICAgICAoYWxsb3cgbWFjaC1sb29rdXAKICAgICAgICAgKGdsb2JhbC1uYW1lCisgICAgICAgICAg ICAiY29tLmFwcGxlLmFnZ3JlZ2F0ZWQiCiAgICAgICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0 aWNkIgotICAgICAgICAgICAgImNvbS5hcHBsZS5zeXN0ZW0ubG9nZ2VyIgotICAgICAgICApCi0g ICAgKQotKQotCi0oZGVueSBtYWNoLWxvb2t1cCAod2l0aCBuby1yZXBvcnQpCi0gICAgKGdsb2Jh bC1uYW1lCi0gICAgICAgICJjb20uYXBwbGUuYWdncmVnYXRlZCIKLSAgICApCi0pCisgICAgICAg ICAgICAiY29tLmFwcGxlLnN5c3RlbS5sb2dnZXIiKSkpCiAKIChhbGxvdyBpcGMtcG9zaXgtc2ht LXJlYWQqCiAgICAgKGlwYy1wb3NpeC1uYW1lLXByZWZpeCAiYXBwbGUuY2ZwcmVmcy4iKSkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxl LldlYktpdC5XZWJDb250ZW50LnNiLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvUmVz b3VyY2VzL1NhbmRib3hQcm9maWxlcy9pb3MvY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnNi LmluCShyZXZpc2lvbiAyODQ2NDgpCisrKyBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYW5kYm94 UHJvZmlsZXMvaW9zL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudC5zYi5pbgkod29ya2luZyBj b3B5KQpAQCAtMTA4Nyw2ICsxMDg3LDExIEBACiAgICAgKQogKQogCisod2l0aC1maWx0ZXIgKHN5 c3RlbS1hdHRyaWJ1dGUgYXBwbGUtaW50ZXJuYWwpCisgICAgKGFsbG93IG1hY2gtbG9va3VwCisg ICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikKKyAgICAgICAgKGds b2JhbC1uYW1lICJjb20uYXBwbGUub3NhbmFseXRpY3Mub3NhbmFseXRpY3NoZWxwZXIiKSkpCisK IChhbGxvdyBtYWNoLWxvb2t1cAogICAgIChyZXF1aXJlLWFsbAogICAgICAgICAoZXh0ZW5zaW9u ICJjb20uYXBwbGUud2Via2l0LmV4dGVuc2lvbi5tYWNoIikKQEAgLTEwOTQsMTMgKzEwOTksMTEg QEAKICAgICAgICAgICAgICJjb20uYXBwbGUuY2ZwcmVmc2QuYWdlbnQiCiAgICAgICAgICAgICAi Y29tLmFwcGxlLmNmcHJlZnNkLmRhZW1vbiIKICAgICAgICAgICAgICJjb20uYXBwbGUuY29udGFp bmVybWFuYWdlcmQiCi0gICAgICAgICAgICAiY29tLmFwcGxlLmRpYWdub3N0aWNkIgogICAgICAg ICAgICAgImNvbS5hcHBsZS5pcGhvbmUuYXhzZXJ2ZXItc3lzdGVtd2lkZSIKICAgICAgICAgICAg ICJjb20uYXBwbGUubW9iaWxlYXNzZXRkLnYyIgogICAgICAgICAgICAgImNvbS5hcHBsZS5tb2Jp bGVnZXN0YWx0LnhwYyIKICAgICAgICAgICAgICJjb20uYXBwbGUubmVoZWxwZXIiCiAgICAgICAg ICAgICAiY29tLmFwcGxlLm5lc2Vzc2lvbm1hbmFnZXIuY29udGVudC1maWx0ZXIiCi0gICAgICAg ICAgICAiY29tLmFwcGxlLm9zYW5hbHl0aWNzLm9zYW5hbHl0aWNzaGVscGVyIgogICAgICAgICAg ICAgImNvbS5hcHBsZS50Y2NkIgogICAgICAgICAgICAgImNvbS5hcHBsZS51aWtpdC52aWV3c2Vy dmljZS5jb20uYXBwbGUuV2ViQ29udGVudEZpbHRlci5yZW1vdGVVSSIKICAgICAgICAgICAgICJj b20uYXBwbGUud2ViaW5zcGVjdG9yIgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9T aGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDI4NDY0OCkK KysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNzEsNyArMTcxLDYgQEAgdm9pZCBXZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzOjplbmNvZAogICAgIGVuY29kZXIgPDwgdmlkZW9EZWNvZGVyRXh0ZW5zaW9u SGFuZGxlczsKICNlbmRpZgogCi0gICAgZW5jb2RlciA8PCBkaWFnbm9zdGljc0V4dGVuc2lvbkhh bmRsZXM7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNN YWNoRXh0ZW5zaW9uSGFuZGxlczsKICAgICBlbmNvZGVyIDw8IGR5bmFtaWNJT0tpdEV4dGVuc2lv bkhhbmRsZXM7CkBAIC00OTEsMTIgKzQ5MCw2IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVyczo6ZGVjb2QKICAgICBwYXJhbWV0ZXJzLnZpZGVvRGVjb2RlckV4dGVuc2lvbkhhbmRs ZXMgPSBXVEZNb3ZlKCp2aWRlb0RlY29kZXJFeHRlbnNpb25IYW5kbGVzKTsKICNlbmRpZgogCi0g ICAgc3RkOjpvcHRpb25hbDxWZWN0b3I8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPj4gZGlhZ25v c3RpY3NFeHRlbnNpb25IYW5kbGVzOwotICAgIGRlY29kZXIgPj4gZGlhZ25vc3RpY3NFeHRlbnNp b25IYW5kbGVzOwotICAgIGlmICghZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgcGFyYW1ldGVycy5kaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRs ZXMgPSBXVEZNb3ZlKCpkaWFnbm9zdGljc0V4dGVuc2lvbkhhbmRsZXMpOwotCiAjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKICAgICBzdGQ6Om9wdGlvbmFsPFZlY3RvcjxTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGU+PiBkeW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CiAgICAgZGVjb2RlciA+PiBk eW5hbWljTWFjaEV4dGVuc2lvbkhhbmRsZXM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9X ZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiAyODQ2NDgp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTIxNyw3ICsyMTcsNiBAQCBzdHJ1Y3QgV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyB7CiAgICAgVmVjdG9yPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gdmlk ZW9EZWNvZGVyRXh0ZW5zaW9uSGFuZGxlczsKICNlbmRpZgogCi0gICAgVmVjdG9yPFNhbmRib3hF eHRlbnNpb246OkhhbmRsZT4gZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzOwogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCiAgICAgVmVjdG9yPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZT4gZHlu YW1pY01hY2hFeHRlbnNpb25IYW5kbGVzOwogICAgIFZlY3RvcjxTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGU+IGR5bmFtaWNJT0tpdEV4dGVuc2lvbkhhbmRsZXM7CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0JKHJldmlz aW9uIDI4NDY0OCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQ b29sQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5MCwxNiArMjkwLDYgQEAgdm9pZCBXZWJQ cm9jZXNzUG9vbDo6cGxhdGZvcm1SZXNvbHZlUGF0aAogI2VuZGlmCiB9CiAKLXN0YXRpYyBib29s IGlzSW50ZXJuYWxJbnN0YWxsKCkKLXsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIHN0 YXRpYyBib29sIGlzSW50ZXJuYWwgPSBNR0dldEJvb2xBbnN3ZXIoa01HUUFwcGxlSW50ZXJuYWxJ bnN0YWxsQ2FwYWJpbGl0eSk7Ci0jZWxzZQotICAgIHN0YXRpYyBib29sIGlzSW50ZXJuYWwgPSBG aWxlU3lzdGVtOjpmaWxlVHlwZSgiL0FwcGxlSW50ZXJuYWwiKSA9PSBGaWxlU3lzdGVtOjpGaWxl VHlwZTo6RGlyZWN0b3J5OwotI2VuZGlmCi0gICAgcmV0dXJuIGlzSW50ZXJuYWw7Ci19Ci0KICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQogc3RhdGljIGNvbnN0IFZlY3RvcjxBU0NJSUxpdGVyYWw+ JiBub25Ccm93c2VyU2VydmljZXMoKQogewpAQCAtMzE0LDIxICszMDQsNiBAQCBzdGF0aWMgY29u c3QgVmVjdG9yPEFTQ0lJTGl0ZXJhbD4mIG5vbkJyCiB9CiAjZW5kaWYKIAotc3RhdGljIGNvbnN0 IFZlY3RvcjxBU0NJSUxpdGVyYWw+JiBkaWFnbm9zdGljU2VydmljZXMoKQotewotICAgIEFTU0VS VChpc01haW5SdW5Mb29wKCkpOwotICAgIHN0YXRpYyBjb25zdCBhdXRvIHNlcnZpY2VzID0gbWFr ZU5ldmVyRGVzdHJveWVkKFZlY3RvcjxBU0NJSUxpdGVyYWw+IHsKLSAgICAgICAgImNvbS5hcHBs ZS5kaWFnbm9zdGljZCJfcywKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgICAgICAiY29t LmFwcGxlLm9zYW5hbHl0aWNzLm9zYW5hbHl0aWNzaGVscGVyIl9zCi0jZWxzZQotICAgICAgICAi Y29tLmFwcGxlLmFuYWx5dGljc2QiX3MsCi0jZW5kaWYKLSAgICB9KTsKLSAgICByZXR1cm4gc2Vy dmljZXM7Ci19Ci0KLQogc3RhdGljIGJvb2wgcmVxdWlyZXNDb250YWluZXJNYW5hZ2VyQWNjZXNz KCkKIHsKICNpZiBQTEFURk9STShNQUMpCkBAIC00NzEsOSArNDQ2LDYgQEAgdm9pZCBXZWJQcm9j ZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplVwogICAgICAgICBwYXJhbWV0ZXJzLmR5bmFtaWNJ T0tpdEV4dGVuc2lvbkhhbmRsZXMgPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVzRm9y SU9LaXRDbGFzc0V4dGVuc2lvbnMoV2ViQ29yZTo6YWd4Q29tcGlsZXJDbGFzc2VzKCksIHN0ZDo6 bnVsbG9wdCk7CiAjZW5kaWYKIAotICAgIGlmIChpc0ludGVybmFsSW5zdGFsbCgpKQotICAgICAg ICBwYXJhbWV0ZXJzLmRpYWdub3N0aWNzRXh0ZW5zaW9uSGFuZGxlcyA9IFNhbmRib3hFeHRlbnNp b246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKGRpYWdub3N0aWNTZXJ2aWNlcygpLCBzdGQ6 Om51bGxvcHQsIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCk7Ci0KICAgICBwYXJh bWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkgPSBzeXN0ZW1IYXNCYXR0ZXJ5KCk7CiAgICAgcGFyYW1l dGVycy5zeXN0ZW1IYXNBQyA9IGNhY2hlZFN5c3RlbUhhc0FDKCkudmFsdWVfb3IodHJ1ZSk7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViQXV0aG5Qcm9jZXNzL21hYy9jb20uYXBwbGUuV2ViS2l0 LldlYkF1dGhuUHJvY2Vzcy5zYi5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYkF1 dGhuUHJvY2Vzcy9tYWMvY29tLmFwcGxlLldlYktpdC5XZWJBdXRoblByb2Nlc3Muc2IuaW4JKHJl dmlzaW9uIDI4NDY0OCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViQXV0aG5Qcm9jZXNzL21hYy9jb20u YXBwbGUuV2ViS2l0LldlYkF1dGhuUHJvY2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpAQCAtMzMz LDE3ICszMzMsMjAgQEAKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5jZnByZWZzZC5hZ2Vu dCIpCiAjZW5kaWYKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5jb29raWVkIikKLSAgICAo Z2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaWFnbm9zdGljZCIpCiAgICAgKGdsb2JhbC1uYW1lICJj b20uYXBwbGUuaWNvbnNlcnZpY2VzIikKICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5pY29u c2VydmljZXMuc3RvcmUiKQogICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLnN5c3RlbS5sb2dn ZXIiKQogKQogCisod2l0aC1maWx0ZXIgKHN5c3RlbS1hdHRyaWJ1dGUgYXBwbGUtaW50ZXJuYWwp CisgICAgKGFsbG93IG1hY2gtbG9va3VwCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LmFuYWx5dGljc2QiKQorICAgICAgICAoZ2xvYmFsLW5hbWUgImNvbS5hcHBsZS5kaWFnbm9zdGlj ZCIpKSkKKwogOzsgVmFyaW91cyBzZXJ2aWNlcyByZXF1aXJlZCBieSBBcHBLaXQgYW5kIG90aGVy IGZyYW1ld29ya3MKIChhbGxvdyBtYWNoLWxvb2t1cAogICAgICAgIChnbG9iYWwtbmFtZSAiY29t LmFwcGxlLlBvd2VyTWFuYWdlbWVudC5jb250cm9sIikKICAgICAgICAoZ2xvYmFsLW5hbWUgImNv bS5hcHBsZS5TeXN0ZW1Db25maWd1cmF0aW9uLmNvbmZpZ2QiKQotICAgICAgIChnbG9iYWwtbmFt ZSAiY29tLmFwcGxlLmFuYWx5dGljc2QiKQogICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxl LmFzc2VydGlvbmQucHJvY2Vzc2Fzc2VydGlvbmNvbm5lY3Rpb24iKQogICAgICAgIChnbG9iYWwt bmFtZSAiY29tLmFwcGxlLmF1ZGlvLlN5c3RlbVNvdW5kU2VydmVyLU9TWCIpCiAgICAgICAgKGds b2JhbC1uYW1lICJjb20uYXBwbGUuYXVkaW8uYXVkaW9oYWxkIikKSW5kZXg6IFNvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJvY2Vzcy5zYi5pbgo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHJldmlz aW9uIDI4NDY4MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2ViUHJv Y2Vzcy5zYi5pbgkod29ya2luZyBjb3B5KQpAQCAtMTc0MSwxMSArMTc0MSwxNSBAQAogKQogI2Vu ZGlmCiAKKyh3aXRoLWZpbHRlciAoc3lzdGVtLWF0dHJpYnV0ZSBhcHBsZS1pbnRlcm5hbCkKKyAg ICAoYWxsb3cgbWFjaC1sb29rdXAKKyAgICAgICAgKGdsb2JhbC1uYW1lICJjb20uYXBwbGUuYW5h bHl0aWNzZCIpCisgICAgICAgIChnbG9iYWwtbmFtZSAiY29tLmFwcGxlLmRpYWdub3N0aWNkIikp KQorCiAoYWxsb3cgbWFjaC1sb29rdXAKICAgICAocmVxdWlyZS1hbGwKICAgICAgICAgKGV4dGVu c2lvbiAiY29tLmFwcGxlLndlYmtpdC5leHRlbnNpb24ubWFjaCIpCiAgICAgICAgIChnbG9iYWwt bmFtZQotICAgICAgICAgICAgImNvbS5hcHBsZS5hbmFseXRpY3NkIgogICAgICAgICAgICAgImNv bS5hcHBsZS5uZWhlbHBlciIKICAgICAgICAgICAgICJjb20uYXBwbGUubmVzZXNzaW9ubWFuYWdl ci5jb250ZW50LWZpbHRlciIKICAgICAgICAgICAgICJjb20uYXBwbGUud2ViaW5zcGVjdG9yIgpA QCAtMTc1Myw3ICsxNzU3LDYgQEAKICAgICAgICAgICAgICJjb20uYXBwbGUuY2ZwcmVmc2QuZGFl bW9uIgogICAgICAgICAgICAgImNvbS5hcHBsZS5jb250YWluZXJtYW5hZ2VyZCIKICAgICAgICAg ICAgICJjb20uYXBwbGUuY29yZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCIKLSAgICAgICAgICAg ICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiCiAgICAgICAgICAgICAiY29tLmFwcGxlLmljb25zZXJ2 aWNlcyIKICAgICAgICAgICAgICJjb20uYXBwbGUuaWNvbnNlcnZpY2VzLnN0b3JlIgogICAgICAg ICAgICAgImNvbS5hcHBsZS50Y2NkIgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2Nv Y29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyODQ2NDgpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0yMjcsOCArMjI3LDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp emVXZWJQcgogewogICAgIHNldFFPUyhwYXJhbWV0ZXJzLmxhdGVuY3lRT1MsIHBhcmFtZXRlcnMu dGhyb3VnaHB1dFFPUyk7CiAgICAgCi0gICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1h bmVudGx5KHBhcmFtZXRlcnMuZGlhZ25vc3RpY3NFeHRlbnNpb25IYW5kbGVzKTsKLQogI2lmIEhB VkUoQ0FUQUxZU1RfVVNFUl9JTlRFUkZBQ0VfSURJT01fQU5EX1NDQUxFX0ZBQ1RPUikKICAgICBp ZiAoY2FuTG9hZF9VSUtpdF9fVUlBcHBsaWNhdGlvbkNhdGFseXN0UmVxdWVzdFZpZXdTZXJ2aWNl SWRpb21BbmRTY2FsZUZhY3RvcigpKSB7CiAgICAgICAgIGF1dG8gW292ZXJyaWRlVXNlckludGVy ZmFjZUlkaW9tLCBvdmVycmlkZVNjYWxlRmFjdG9yXSA9IHBhcmFtZXRlcnMub3ZlcnJpZGVVc2Vy SW50ZXJmYWNlSWRpb21BbmRTY2FsZTsK