143497 2015-04-07 14:19:58 -0700 Content extensions should block popups 2015-04-08 13:28:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143507 1 achristensen achristensen beidson commit-queue japhet sam oldest_to_newest 1083425 0 achristensen 2015-04-07 14:19:58 -0700 We should. 1083428 1 250301 achristensen 2015-04-07 14:27:25 -0700 Created attachment 250301 Patch 1083447 2 250301 beidson 2015-04-07 14:47:00 -0700 Comment on attachment 250301 Patch As discussed in person, this prevents the creation of windows in a lot more cases than just "popups". The check(s) should be moved to everywhere we already consult the existing popup blocker. i.e. calls to allowPopUp() 1083461 3 250310 achristensen 2015-04-07 15:45:42 -0700 Created attachment 250310 Patch 1083488 4 250310 ggaren 2015-04-07 16:56:58 -0700 Comment on attachment 250310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250310&action=review > Source/WebCore/page/DOMWindow.cpp:2147 > +#if ENABLE(CONTENT_EXTENSIONS) > + if (firstFrame > + && firstFrame->mainFrame().page() > + && firstFrame->mainFrame().page()->userContentController() > + && firstFrame->mainFrame().document()) { > + ResourceLoadInfo resourceLoadInfo = {URL(ParsedURLString, urlString), firstFrame->mainFrame().document()->url(), ResourceType::Popup}; > + Vector<ContentExtensions::Action> actions = firstFrame->mainFrame().page()->userContentController()->actionsForResourceLoad(resourceLoadInfo); > + for (const ContentExtensions::Action& action : actions) { > + if (action.type() == ContentExtensions::ActionType::BlockLoad) > + return nullptr; > + } > + } > +#endif Do we also need to consult the content extension before popping out to another app (say, from an itms:// link or some other custom scheme link)? I think popping out to another app is very similar to popping out to another window. 1083492 5 achristensen 2015-04-07 17:03:36 -0700 (In reply to comment #4) > Do we also need to consult the content extension before popping out to > another app (say, from an itms:// link or some other custom scheme link)? Probably. Where should this code be, and where are tests that test something similar? 1083498 6 250310 commit-queue 2015-04-07 17:39:06 -0700 Comment on attachment 250310 Patch Clearing flags on attachment: 250310 Committed r182511: <http://trac.webkit.org/changeset/182511> 1083499 7 commit-queue 2015-04-07 17:39:09 -0700 All reviewed patches have been landed. Closing bug. 1083511 8 commit-queue 2015-04-07 18:47:50 -0700 Re-opened since this is blocked by bug 143507 1083672 9 achristensen 2015-04-08 11:33:15 -0700 This caused https://build.webkit.org/results/Apple%20Yosemite%20Debug%20WK2%20(Tests)/r182511%20(3359)/results.html 1083720 10 achristensen 2015-04-08 13:28:18 -0700 Used Document::completeURL with proper null checks instead of URL(ParsedURLStringTag, const String&) like is done elsewhere in DOMWindow::open Recommitted to http://trac.webkit.org/changeset/182564 250301 2015-04-07 14:27:25 -0700 2015-04-07 15:45:40 -0700 Patch bug-143497-20150407142636.patch text/plain 9604 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjQ5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA0LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQmxvY2sgcG9w dXBzIGZyb20gY29udGVudCBleHRlbnNpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9w b3B1cHMuaHRtbAorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cmVhZFJlc291cmNlVHlwZSk6CisgICAgICAgICogbG9hZGVyL1Jlc291 cmNlTG9hZEluZm8uaDoKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OmNyZWF0ZVdpbmRvdyk6CisgICAgICAgIENoZWNrIGNvbnRlbnQg ZXh0ZW5zaW9ucyBiZWZvcmUgb3BlbmluZyBhIHdpbmRvdy4KKwogMjAxNS0wNC0wNyAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE9wdGltaXpl IGNvbnRlbnQgZXh0ZW5zaW9ucyBpbnRlcnByZXRpbmcgc3BlZWQuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3BwCShyZXZpc2lvbiAxODI0MzEpCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTg1LDYgKzg1LDggQEAgdWludDE2X3QgcmVhZFJlc291cmNlVHlwZShjb25zdCBTdHJpbmcm IAogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dWludDE2X3Q+KFJlc291cmNlVHlwZTo6U1ZH RG9jdW1lbnQpOwogICAgIGlmIChuYW1lID09ICJtZWRpYSIpCiAgICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDx1aW50MTZfdD4oUmVzb3VyY2VUeXBlOjpNZWRpYSk7CisgICAgaWYgKG5hbWUgPT0g InBvcHVwIikKKyAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PHVpbnQxNl90PihSZXNvdXJjZVR5 cGU6OlBvcHVwKTsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dWludDE2X3Q+KFJlc291cmNlVHlw ZTo6SW52YWxpZCk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWRJbmZvLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZEluZm8uaAkocmV2aXNpb24gMTgyNDMxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZEluZm8uaAkod29ya2luZyBjb3B5KQpAQCAtNDIsMTIgKzQyLDEzIEBAIGVudW0gY2xh c3MgUmVzb3VyY2VUeXBlIDogdWludDE2X3QgewogICAgIFNWR0RvY3VtZW50ID0gMHgwMDQwLAog ICAgIE1lZGlhID0gMHgwMDgwLAogICAgIFBsdWdJblN0cmVhbSA9IDB4MDEwMCwKKyAgICBQb3B1 cCA9IDB4MDIwMCwKIH07CiAKIGVudW0gY2xhc3MgTG9hZFR5cGUgOiB1aW50MTZfdCB7CiAgICAg SW52YWxpZCA9IDB4MDAwMCwKLSAgICBGaXJzdFBhcnR5ID0gMHgwMjAwLAotICAgIFRoaXJkUGFy dHkgPSAweDA0MDAsCisgICAgRmlyc3RQYXJ0eSA9IDB4MDQwMCwKKyAgICBUaGlyZFBhcnR5ID0g MHgwODAwLAogfTsKIAogdHlwZWRlZiB1aW50MTZfdCBSZXNvdXJjZUZsYWdzOwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BhZ2UvRE9NV2luZG93LmNwcAkocmV2aXNpb24gMTgyNDMxKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw2ICs4MSw3IEBACiAj aW5jbHVkZSAiUGFnZVRyYW5zaXRpb25FdmVudC5oIgogI2luY2x1ZGUgIlBlcmZvcm1hbmNlLmgi CiAjaW5jbHVkZSAiUGxhdGZvcm1TY3JlZW4uaCIKKyNpbmNsdWRlICJSZXNvdXJjZUxvYWRJbmZv LmgiCiAjaW5jbHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlNjaGVk dWxlZEFjdGlvbi5oIgogI2luY2x1ZGUgIlNjcmVlbi5oIgpAQCAtMjA3Nyw3ICsyMDc4LDcgQEAg UGFzc1JlZlB0cjxGcmFtZT4gRE9NV2luZG93OjpjcmVhdGVXaW5kbwogICAgIGlmICghY29tcGxl dGVkVVJMLmlzRW1wdHkoKSAmJiAhY29tcGxldGVkVVJMLmlzVmFsaWQoKSkgewogICAgICAgICAv LyBEb24ndCBleHBvc2UgY2xpZW50IGNvZGUgdG8gaW52YWxpZCBVUkxzLgogICAgICAgICBhY3Rp dmVXaW5kb3cucHJpbnRFcnJvck1lc3NhZ2UoIlVuYWJsZSB0byBvcGVuIGEgd2luZG93IHdpdGgg aW52YWxpZCBVUkwgJyIgKyBjb21wbGV0ZWRVUkwuc3RyaW5nKCkgKyAiJy5cbiIpOwotICAgICAg ICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAgICAgLy8gRm9y IHdoYXRldmVyIHJlYXNvbiwgRmlyZWZveCB1c2VzIHRoZSBmaXJzdCBmcmFtZSB0byBkZXRlcm1p bmUgdGhlIG91dGdvaW5nUmVmZXJyZXIuIFdlIHJlcGxpY2F0ZSB0aGF0IGJlaGF2aW9yIGhlcmUu CkBAIC0yMDg2LDEzICsyMDg3LDIwIEBAIFBhc3NSZWZQdHI8RnJhbWU+IERPTVdpbmRvdzo6Y3Jl YXRlV2luZG8KICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChjb21wbGV0ZWRVUkwsIHJlZmVy cmVyKTsKICAgICBGcmFtZUxvYWRlcjo6YWRkSFRUUE9yaWdpbklmTmVlZGVkKHJlcXVlc3QsIGZp cnN0RnJhbWUtPmxvYWRlcigpLm91dGdvaW5nT3JpZ2luKCkpOwogICAgIEZyYW1lTG9hZFJlcXVl c3QgZnJhbWVSZXF1ZXN0KGFjdGl2ZVdpbmRvdy5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigp LCByZXF1ZXN0LCBmcmFtZU5hbWUpOworICAgIAorI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lP TlMpCisgICAgaWYgKGFjdGl2ZUZyYW1lICYmIGFjdGl2ZUZyYW1lLT5tYWluRnJhbWUoKS5wYWdl KCkgJiYgYWN0aXZlRnJhbWUtPm1haW5GcmFtZSgpLnBhZ2UoKS0+dXNlckNvbnRlbnRDb250cm9s bGVyKCkgJiYgYWN0aXZlRnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpCisgICAgICAg IGFjdGl2ZUZyYW1lLT5tYWluRnJhbWUoKS5wYWdlKCktPnVzZXJDb250ZW50Q29udHJvbGxlcigp LT5wcm9jZXNzQ29udGVudEV4dGVuc2lvblJ1bGVzRm9yTG9hZChyZXF1ZXN0LCBSZXNvdXJjZVR5 cGU6OlBvcHVwLCAqYWN0aXZlRnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpOworICAg IGlmIChyZXF1ZXN0LmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyNlbmRpZgog CiAgICAgLy8gV2UgcGFzcyB0aGUgb3BlbmVyIGZyYW1lIGZvciB0aGUgbG9va3VwRnJhbWUgaW4g Y2FzZSB0aGUgYWN0aXZlIGZyYW1lIGlzIGRpZmZlcmVudCBmcm9tCiAgICAgLy8gdGhlIG9wZW5l ciBmcmFtZSwgYW5kIHRoZSBuYW1lIHJlZmVyZW5jZXMgYSBmcmFtZSByZWxhdGl2ZSB0byB0aGUg b3BlbmVyIGZyYW1lLgogICAgIGJvb2wgY3JlYXRlZDsKICAgICBSZWZQdHI8RnJhbWU+IG5ld0Zy YW1lID0gV2ViQ29yZTo6Y3JlYXRlV2luZG93KGFjdGl2ZUZyYW1lLCBvcGVuZXJGcmFtZSwgZnJh bWVSZXF1ZXN0LCB3aW5kb3dGZWF0dXJlcywgY3JlYXRlZCk7CiAgICAgaWYgKCFuZXdGcmFtZSkK LSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgbmV3RnJh bWUtPmxvYWRlcigpLnNldE9wZW5lcihvcGVuZXJGcmFtZSk7CiAgICAgbmV3RnJhbWUtPnBhZ2Uo KS0+c2V0T3BlbmVkQnlET00oKTsKQEAgLTIxMTIsNyArMjEyMCw3IEBAIFBhc3NSZWZQdHI8RnJh bWU+IERPTVdpbmRvdzo6Y3JlYXRlV2luZG8KIAogICAgIC8vIE5hdmlnYXRpbmcgdGhlIG5ldyBm cmFtZSBjb3VsZCByZXN1bHQgaW4gaXQgYmVpbmcgZGV0YWNoZWQgZnJvbSBpdHMgcGFnZSBieSBh IG5hdmlnYXRpb24gcG9saWN5IGRlbGVnYXRlLgogICAgIGlmICghbmV3RnJhbWUtPnBhZ2UoKSkK LSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgcmV0dXJu IG5ld0ZyYW1lLnJlbGVhc2UoKTsKIH0KSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjQ5MikKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTA3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQmxvY2sgcG9wdXBz IGZyb20gY29udGVudCBleHRlbnNpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29udGVudEV4 dGVuc2lvbnMuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKyAgICAgICAg QWRkZWQgcG9wdXAgdGVzdC4KKwogMjAxNS0wNC0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0 YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkIG15c2VsZiBhcyBh IGNvbW1pdHRlci4KSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db250 ZW50RXh0ZW5zaW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJDb3JlL0NvbnRlbnRFeHRlbnNpb25zLmNwcAkocmV2aXNpb24gMTgyNDMxKQorKysgVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbnRlbnRFeHRlbnNpb25zLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDU3LDcgKzQ1Nyw3IEBAIFRFU1RfRihDb250ZW50RXh0ZW5zaW9uVGVz dCwgTG9hZFR5cGUpCiAKIFRFU1RfRihDb250ZW50RXh0ZW5zaW9uVGVzdCwgUmVzb3VyY2VUeXBl KQogewotICAgIGF1dG8gYmFja2VuZCA9IG1ha2VCYWNrZW5kKCJbe1wiYWN0aW9uXCI6e1widHlw ZVwiOlwiYmxvY2tcIn0sXCJ0cmlnZ2VyXCI6e1widXJsLWZpbHRlclwiOlwiYmxvY2tfYWxsX3R5 cGVzLm9yZ1wiLFwicmVzb3VyY2UtdHlwZVwiOltcImRvY3VtZW50XCIsXCJpbWFnZVwiLFwic3R5 bGUtc2hlZXRcIixcInNjcmlwdFwiLFwiZm9udFwiLFwicmF3XCIsXCJzdmctZG9jdW1lbnRcIixc Im1lZGlhXCJdfX0sIgorICAgIGF1dG8gYmFja2VuZCA9IG1ha2VCYWNrZW5kKCJbe1wiYWN0aW9u XCI6e1widHlwZVwiOlwiYmxvY2tcIn0sXCJ0cmlnZ2VyXCI6e1widXJsLWZpbHRlclwiOlwiYmxv Y2tfYWxsX3R5cGVzLm9yZ1wiLFwicmVzb3VyY2UtdHlwZVwiOltcImRvY3VtZW50XCIsXCJpbWFn ZVwiLFwic3R5bGUtc2hlZXRcIixcInNjcmlwdFwiLFwiZm9udFwiLFwicmF3XCIsXCJzdmctZG9j dW1lbnRcIixcIm1lZGlhXCIsXCJwb3B1cFwiXX19LCIKICAgICAgICAgIntcImFjdGlvblwiOntc InR5cGVcIjpcImJsb2NrXCJ9LFwidHJpZ2dlclwiOntcInVybC1maWx0ZXJcIjpcImJsb2NrX29u bHlfaW1hZ2VzXCIsXCJyZXNvdXJjZS10eXBlXCI6W1wiaW1hZ2VcIl19fV0iKTsKIAogICAgIHRl c3RSZXF1ZXN0KGJhY2tlbmQsIG1haW5Eb2N1bWVudFJlcXVlc3QoImh0dHA6Ly9ibG9ja19hbGxf dHlwZXMub3JnIiwgUmVzb3VyY2VUeXBlOjpEb2N1bWVudCksIHsgQ29udGVudEV4dGVuc2lvbnM6 OkFjdGlvblR5cGU6OkJsb2NrTG9hZCB9KTsKQEAgLTQ2OCw2ICs0NjgsNyBAQCBURVNUX0YoQ29u dGVudEV4dGVuc2lvblRlc3QsIFJlc291cmNlVHlwCiAgICAgdGVzdFJlcXVlc3QoYmFja2VuZCwg bWFpbkRvY3VtZW50UmVxdWVzdCgiaHR0cDovL2Jsb2NrX2FsbF90eXBlcy5vcmciLCBSZXNvdXJj ZVR5cGU6OlJhdyksIHsgQ29udGVudEV4dGVuc2lvbnM6OkFjdGlvblR5cGU6OkJsb2NrTG9hZCB9 KTsKICAgICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBtYWluRG9jdW1lbnRSZXF1ZXN0KCJodHRwOi8v YmxvY2tfYWxsX3R5cGVzLm9yZyIsIFJlc291cmNlVHlwZTo6U1ZHRG9jdW1lbnQpLCB7IENvbnRl bnRFeHRlbnNpb25zOjpBY3Rpb25UeXBlOjpCbG9ja0xvYWQgfSk7CiAgICAgdGVzdFJlcXVlc3Qo YmFja2VuZCwgbWFpbkRvY3VtZW50UmVxdWVzdCgiaHR0cDovL2Jsb2NrX2FsbF90eXBlcy5vcmci LCBSZXNvdXJjZVR5cGU6Ok1lZGlhKSwgeyBDb250ZW50RXh0ZW5zaW9uczo6QWN0aW9uVHlwZTo6 QmxvY2tMb2FkIH0pOworICAgIHRlc3RSZXF1ZXN0KGJhY2tlbmQsIG1haW5Eb2N1bWVudFJlcXVl c3QoImh0dHA6Ly9ibG9ja19hbGxfdHlwZXMub3JnIiwgUmVzb3VyY2VUeXBlOjpQb3B1cCksIHsg Q29udGVudEV4dGVuc2lvbnM6OkFjdGlvblR5cGU6OkJsb2NrTG9hZCB9KTsKICAgICB0ZXN0UmVx dWVzdChiYWNrZW5kLCBtYWluRG9jdW1lbnRSZXF1ZXN0KCJodHRwOi8vYmxvY2tfb25seV9pbWFn ZXMub3JnIiwgUmVzb3VyY2VUeXBlOjpJbWFnZSksIHsgQ29udGVudEV4dGVuc2lvbnM6OkFjdGlv blR5cGU6OkJsb2NrTG9hZCB9KTsKICAgICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBtYWluRG9jdW1l bnRSZXF1ZXN0KCJodHRwOi8vYmxvY2tfb25seV9pbWFnZXMub3JnIiwgUmVzb3VyY2VUeXBlOjpE b2N1bWVudCksIHsgfSk7CiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODI0OTIpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0wNC0w NyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAg IEJsb2NrIHBvcHVwcyBmcm9tIGNvbnRlbnQgZXh0ZW5zaW9ucy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzQ5NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5z aW9ucy9wb3B1cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2Nv bnRlbnRleHRlbnNpb25zL3BvcHVwcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz L2NvbnRlbnRleHRlbnNpb25zL3BvcHVwcy5odG1sLmpzb246IEFkZGVkLgorCiAyMDE1LTAyLTI1 ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtD U1MgR3JpZCBMYXlvdXRdIFVwZGF0ZSB0cmFjayBzaXplcyBhZnRlciBkaXN0cmlidXRpbmcgZXh0 cmEgc3BhY2UKSW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVuc2lvbnMv cG9wdXBzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2NvbnRlbnRleHRlbnNpb25zL3BvcHVwcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3BvcHVwcy1leHBlY3RlZC50 eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0IEBACitBTEVSVDogYWJvdXQ6Ymxhbmsgc3Vj Y2Vzc2Z1bGx5IGJsb2NrZWQKK0FMRVJUOiBkYXRhIHVybCBzaG91bGQgbm90IGJlIGJsb2NrZWQK K0FMRVJUOiBkYXRhIHVybCBzaG91bGQgbm90IGJlIGJsb2NrZWQKKwpJbmRleDogTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3BvcHVwcy5odG1sCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9w b3B1cHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE4IEBACis8aHRtbD4gCis8Ym9k eT4KKzxzY3JpcHQ+IAoraWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgdGVzdFJ1bm5lci5k dW1wQXNUZXh0KCk7CisgICAgdGVzdFJ1bm5lci5zZXRDYW5PcGVuV2luZG93cyh0cnVlKTsKKyAg ICB0ZXN0UnVubmVyLnNldENsb3NlUmVtYWluaW5nV2luZG93c1doZW5Db21wbGV0ZSh0cnVlKTsK K30KKword2luID0gd2luZG93Lm9wZW4oImFib3V0OmJsYW5rIik7CithbGVydCh3aW4gPyAiRkFJ TCIgOiAiYWJvdXQ6Ymxhbmsgc3VjY2Vzc2Z1bGx5IGJsb2NrZWQiKTsKK3dpbiA9IHdpbmRvdy5v cGVuKCJkYXRhOnRleHQvaHRtbCwgaGVsbG8iKTsKK2FsZXJ0KHdpbiA/ICJkYXRhIHVybCBzaG91 bGQgbm90IGJlIGJsb2NrZWQiIDogIkZBSUwiKTsKK3dpbiA9IHdpbmRvdy5vcGVuKCJkYXRhOnRl eHQvaHRtbCwgYWJvdXQiKTsKK2FsZXJ0KHdpbiA/ICJkYXRhIHVybCBzaG91bGQgbm90IGJlIGJs b2NrZWQiIDogIkZBSUwiKTsKKzwvc2NyaXB0PiAKKzwvYm9keT4gCis8L2h0bWw+CkluZGV4OiBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3BvcHVwcy5odG1sLmpzb24K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9w b3B1cHMuaHRtbC5qc29uCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9j b250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMuaHRtbC5qc29uCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAg KzEsMTEgQEAKK1sKKyAgICB7CisgICAgICAgICJhY3Rpb24iOiB7CisgICAgICAgICAgICAidHlw ZSI6ICJibG9jayIKKyAgICAgICAgfSwKKyAgICAgICAgInRyaWdnZXIiOiB7CisgICAgICAgICAg ICAidXJsLWZpbHRlciI6ICJhYm91dCIsCisgICAgICAgICAgICAicmVzb3VyY2UtdHlwZSI6WyJw b3B1cCJdCisgICAgICAgIH0KKyAgICB9CitdCg== 250310 2015-04-07 15:45:42 -0700 2015-04-07 17:39:06 -0700 Patch bug-143497-20150407154453.patch text/plain 12119 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjQ5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA0LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQmxvY2sgcG9w dXBzIGZyb20gY29udGVudCBleHRlbnNpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9w b3B1cHMuaHRtbAorCisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZEluZm8uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6cmVhZFJlc291cmNlVHlwZSk6CisgICAgICAgICogbG9hZGVyL1Jlc291 cmNlTG9hZEluZm8uaDoKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6Om9wZW4pOgorICAgICAgICAqIHBhZ2UvVXNlckNvbnRlbnRDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJDb250ZW50Q29udHJvbGxlcjo6YWN0 aW9uc0ZvclJlc291cmNlTG9hZCk6CisgICAgICAgICogcGFnZS9Vc2VyQ29udGVudENvbnRyb2xs ZXIuaDoKKyAgICAgICAgQ2hlY2sgY29udGVudCBleHRlbnNpb25zIGJlZm9yZSBvcGVuaW5nIGEg d2luZG93LgorCiAyMDE1LTA0LTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgTW9yZSB3b3JrIG9uIG1ha2luZyB0aGUgYXBwbGljYXRpb24gY2FjaGUg c3RvcmFnZSBiZSBwZXIgcGFnZQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl TG9hZEluZm8uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRJbmZvLmNwcAkocmV2aXNpb24gMTgyNDMxKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZEluZm8uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSw2ICs4NSw4IEBAIHVp bnQxNl90IHJlYWRSZXNvdXJjZVR5cGUoY29uc3QgU3RyaW5nJiAKICAgICAgICAgcmV0dXJuIHN0 YXRpY19jYXN0PHVpbnQxNl90PihSZXNvdXJjZVR5cGU6OlNWR0RvY3VtZW50KTsKICAgICBpZiAo bmFtZSA9PSAibWVkaWEiKQogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dWludDE2X3Q+KFJl c291cmNlVHlwZTo6TWVkaWEpOworICAgIGlmIChuYW1lID09ICJwb3B1cCIpCisgICAgICAgIHJl dHVybiBzdGF0aWNfY2FzdDx1aW50MTZfdD4oUmVzb3VyY2VUeXBlOjpQb3B1cCk7CiAgICAgcmV0 dXJuIHN0YXRpY19jYXN0PHVpbnQxNl90PihSZXNvdXJjZVR5cGU6OkludmFsaWQpOwogfQogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkSW5mby5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRJbmZvLmgJKHJldmlzaW9uIDE4 MjQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRJbmZvLmgJKHdvcmtp bmcgY29weSkKQEAgLTQyLDEyICs0MiwxMyBAQCBlbnVtIGNsYXNzIFJlc291cmNlVHlwZSA6IHVp bnQxNl90IHsKICAgICBTVkdEb2N1bWVudCA9IDB4MDA0MCwKICAgICBNZWRpYSA9IDB4MDA4MCwK ICAgICBQbHVnSW5TdHJlYW0gPSAweDAxMDAsCisgICAgUG9wdXAgPSAweDAyMDAsCiB9OwogCiBl bnVtIGNsYXNzIExvYWRUeXBlIDogdWludDE2X3QgewogICAgIEludmFsaWQgPSAweDAwMDAsCi0g ICAgRmlyc3RQYXJ0eSA9IDB4MDIwMCwKLSAgICBUaGlyZFBhcnR5ID0gMHgwNDAwLAorICAgIEZp cnN0UGFydHkgPSAweDA0MDAsCisgICAgVGhpcmRQYXJ0eSA9IDB4MDgwMCwKIH07CiAKIHR5cGVk ZWYgdWludDE2X3QgUmVzb3VyY2VGbGFnczsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRE9N V2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5j cHAJKHJldmlzaW9uIDE4MjQzMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIkNTU1J1bGVMaXN0 LmgiCiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVkZSAiQ2hyb21lQ2xpZW50LmgiCisjaW5j bHVkZSAiQ29udGVudEV4dGVuc2lvbkFjdGlvbnMuaCIKKyNpbmNsdWRlICJDb250ZW50RXh0ZW5z aW9uUnVsZS5oIgogI2luY2x1ZGUgIkNyeXB0by5oIgogI2luY2x1ZGUgIkRPTUFwcGxpY2F0aW9u Q2FjaGUuaCIKICNpbmNsdWRlICJET01TZWxlY3Rpb24uaCIKQEAgLTgxLDYgKzgzLDcgQEAKICNp bmNsdWRlICJQYWdlVHJhbnNpdGlvbkV2ZW50LmgiCiAjaW5jbHVkZSAiUGVyZm9ybWFuY2UuaCIK ICNpbmNsdWRlICJQbGF0Zm9ybVNjcmVlbi5oIgorI2luY2x1ZGUgIlJlc291cmNlTG9hZEluZm8u aCIKICNpbmNsdWRlICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiU2NoZWR1 bGVkQWN0aW9uLmgiCiAjaW5jbHVkZSAiU2NyZWVuLmgiCkBAIC0yMTIxLDI0ICsyMTI0LDM4IEBA IFBhc3NSZWZQdHI8RE9NV2luZG93PiBET01XaW5kb3c6Om9wZW4oY28KICAgICBET01XaW5kb3cm IGFjdGl2ZVdpbmRvdywgRE9NV2luZG93JiBmaXJzdFdpbmRvdykKIHsKICAgICBpZiAoIWlzQ3Vy cmVudGx5RGlzcGxheWVkSW5GcmFtZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgRG9jdW1lbnQqIGFjdGl2ZURvY3VtZW50ID0gYWN0aXZlV2luZG93 LmRvY3VtZW50KCk7CiAgICAgaWYgKCFhY3RpdmVEb2N1bWVudCkKLSAgICAgICAgcmV0dXJuIDA7 CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIEZyYW1lKiBmaXJzdEZyYW1lID0gZmlyc3RX aW5kb3cuZnJhbWUoKTsKICAgICBpZiAoIWZpcnN0RnJhbWUpCi0gICAgICAgIHJldHVybiAwOwor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMp CisgICAgaWYgKGZpcnN0RnJhbWUKKyAgICAgICAgJiYgZmlyc3RGcmFtZS0+bWFpbkZyYW1lKCku cGFnZSgpCisgICAgICAgICYmIGZpcnN0RnJhbWUtPm1haW5GcmFtZSgpLnBhZ2UoKS0+dXNlckNv bnRlbnRDb250cm9sbGVyKCkKKyAgICAgICAgJiYgZmlyc3RGcmFtZS0+bWFpbkZyYW1lKCkuZG9j dW1lbnQoKSkgeworICAgICAgICBSZXNvdXJjZUxvYWRJbmZvIHJlc291cmNlTG9hZEluZm8gPSB7 VVJMKFBhcnNlZFVSTFN0cmluZywgdXJsU3RyaW5nKSwgZmlyc3RGcmFtZS0+bWFpbkZyYW1lKCku ZG9jdW1lbnQoKS0+dXJsKCksIFJlc291cmNlVHlwZTo6UG9wdXB9OworICAgICAgICBWZWN0b3I8 Q29udGVudEV4dGVuc2lvbnM6OkFjdGlvbj4gYWN0aW9ucyA9IGZpcnN0RnJhbWUtPm1haW5GcmFt ZSgpLnBhZ2UoKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCktPmFjdGlvbnNGb3JSZXNvdXJjZUxv YWQocmVzb3VyY2VMb2FkSW5mbyk7CisgICAgICAgIGZvciAoY29uc3QgQ29udGVudEV4dGVuc2lv bnM6OkFjdGlvbiYgYWN0aW9uIDogYWN0aW9ucykgeworICAgICAgICAgICAgaWYgKGFjdGlvbi50 eXBlKCkgPT0gQ29udGVudEV4dGVuc2lvbnM6OkFjdGlvblR5cGU6OkJsb2NrTG9hZCkKKyAgICAg ICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgogCiAg ICAgaWYgKCFmaXJzdFdpbmRvdy5hbGxvd1BvcFVwKCkpIHsKICAgICAgICAgLy8gQmVjYXVzZSBG cmFtZVRyZWU6OmZpbmQoKSByZXR1cm5zIHRydWUgZm9yIGVtcHR5IHN0cmluZ3MsIHdlIG11c3Qg Y2hlY2sgZm9yIGVtcHR5IGZyYW1lIG5hbWVzLgogICAgICAgICAvLyBPdGhlcndpc2UsIGlsbGVn aXRpbWF0ZSB3aW5kb3cub3BlbigpIGNhbGxzIHdpdGggbm8gbmFtZSB3aWxsIHBhc3MgcmlnaHQg dGhyb3VnaCB0aGUgcG9wdXAgYmxvY2tlci4KICAgICAgICAgaWYgKGZyYW1lTmFtZS5pc0VtcHR5 KCkgfHwgIW1fZnJhbWUtPnRyZWUoKS5maW5kKGZyYW1lTmFtZSkpCi0gICAgICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIC8vIEdldCB0 aGUgdGFyZ2V0IGZyYW1lIGZvciB0aGUgc3BlY2lhbCBjYXNlcyBvZiBfdG9wIGFuZCBfcGFyZW50 LgogICAgIC8vIEluIHRob3NlIGNhc2VzLCB3ZSBzY2hlZHVsZSBhIGxvY2F0aW9uIGNoYW5nZSBy aWdodCBub3cgYW5kIHJldHVybiBlYXJseS4KLSAgICBGcmFtZSogdGFyZ2V0RnJhbWUgPSAwOwor ICAgIEZyYW1lKiB0YXJnZXRGcmFtZSA9IG51bGxwdHI7CiAgICAgaWYgKGZyYW1lTmFtZSA9PSAi X3RvcCIpCiAgICAgICAgIHRhcmdldEZyYW1lID0gJm1fZnJhbWUtPnRyZWUoKS50b3AoKTsKICAg ICBlbHNlIGlmIChmcmFtZU5hbWUgPT0gIl9wYXJlbnQiKSB7CkBAIC0yMTQ5LDcgKzIxNjYsNyBA QCBQYXNzUmVmUHRyPERPTVdpbmRvdz4gRE9NV2luZG93OjpvcGVuKGNvCiAgICAgfQogICAgIGlm ICh0YXJnZXRGcmFtZSkgewogICAgICAgICBpZiAoIWFjdGl2ZURvY3VtZW50LT5jYW5OYXZpZ2F0 ZSh0YXJnZXRGcmFtZSkpCi0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgICAgIFVSTCBjb21wbGV0ZWRVUkwgPSBmaXJzdEZyYW1lLT5kb2N1 bWVudCgpLT5jb21wbGV0ZVVSTCh1cmxTdHJpbmcpOwogCkBAIC0yMTY5LDcgKzIxODYsNyBAQCBQ YXNzUmVmUHRyPERPTVdpbmRvdz4gRE9NV2luZG93OjpvcGVuKGNvCiAKICAgICBXaW5kb3dGZWF0 dXJlcyB3aW5kb3dGZWF0dXJlcyh3aW5kb3dGZWF0dXJlc1N0cmluZyk7CiAgICAgUmVmUHRyPEZy YW1lPiByZXN1bHQgPSBjcmVhdGVXaW5kb3codXJsU3RyaW5nLCBmcmFtZU5hbWUsIHdpbmRvd0Zl YXR1cmVzLCBhY3RpdmVXaW5kb3csIGZpcnN0RnJhbWUsIG1fZnJhbWUpOwotICAgIHJldHVybiBy ZXN1bHQgPyByZXN1bHQtPmRvY3VtZW50KCktPmRvbVdpbmRvdygpIDogMDsKKyAgICByZXR1cm4g cmVzdWx0ID8gcmVzdWx0LT5kb2N1bWVudCgpLT5kb21XaW5kb3coKSA6IG51bGxwdHI7CiB9CiAK IHZvaWQgRE9NV2luZG93OjpzaG93TW9kYWxEaWFsb2coY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcs IGNvbnN0IFN0cmluZyYgZGlhbG9nRmVhdHVyZXNTdHJpbmcsIERPTVdpbmRvdyYgYWN0aXZlV2lu ZG93LCBET01XaW5kb3cmIGZpcnN0V2luZG93LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKERPTVdpbmRv dyYpPiBwcmVwYXJlRGlhbG9nRnVuY3Rpb24pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1Vz ZXJDb250ZW50Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxODI0MzEpCisrKyBTb3VyY2Uv V2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIxMiw2ICsyMTIsMTMgQEAgdm9pZCBVc2VyQ29udGVudENvbnRyb2xsZXI6OnByb2Nlc3NDb250 ZQogICAgIG1fY29udGVudEV4dGVuc2lvbkJhY2tlbmQtPnByb2Nlc3NDb250ZW50RXh0ZW5zaW9u UnVsZXNGb3JMb2FkKHJlcXVlc3QsIHJlc291cmNlVHlwZSwgaW5pdGlhdGluZ0RvY3VtZW50TG9h ZGVyKTsKIH0KIAorVmVjdG9yPENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb24+IFVzZXJDb250ZW50 Q29udHJvbGxlcjo6YWN0aW9uc0ZvclJlc291cmNlTG9hZChjb25zdCBSZXNvdXJjZUxvYWRJbmZv JiByZXNvdXJjZUxvYWRJbmZvKQoreworICAgIGlmICghbV9jb250ZW50RXh0ZW5zaW9uQmFja2Vu ZCkKKyAgICAgICAgcmV0dXJuIFZlY3RvcjxDb250ZW50RXh0ZW5zaW9uczo6QWN0aW9uPigpOwor ICAgIAorICAgIHJldHVybiBtX2NvbnRlbnRFeHRlbnNpb25CYWNrZW5kLT5hY3Rpb25zRm9yUmVz b3VyY2VMb2FkKHJlc291cmNlTG9hZEluZm8pOworfQogI2VuZGlmCiAKIHZvaWQgVXNlckNvbnRl bnRDb250cm9sbGVyOjpyZW1vdmVBbGxVc2VyQ29udGVudCgpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgJKHJldmlzaW9uIDE4MjQzMSkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTkzLDYgKzkzLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3Zl QWxsVXNlckNvbnRlbnRFeHRlbnNpb25zKCk7CiAKICAgICB2b2lkIHByb2Nlc3NDb250ZW50RXh0 ZW5zaW9uUnVsZXNGb3JMb2FkKFJlc291cmNlUmVxdWVzdCYsIFJlc291cmNlVHlwZSwgRG9jdW1l bnRMb2FkZXImIGluaXRpYXRpbmdEb2N1bWVudExvYWRlcik7CisgICAgVmVjdG9yPENvbnRlbnRF eHRlbnNpb25zOjpBY3Rpb24+IGFjdGlvbnNGb3JSZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VM b2FkSW5mbyYpOwogI2VuZGlmCiAKIHByaXZhdGU6CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODI0OTIpCisrKyBUb29scy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNS0wNC0wNyAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEJsb2Nr IHBvcHVwcyBmcm9tIGNvbnRlbnQgZXh0ZW5zaW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzQ5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0Nv bnRlbnRFeHRlbnNpb25zLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6Cisg ICAgICAgIEFkZGVkIHBvcHVwIHRlc3QuCisKIDIwMTUtMDQtMDcgIE1pY2hhZWwgQ2F0YW56YXJv ICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFkZCBteXNl bGYgYXMgYSBjb21taXR0ZXIuCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNv cmUvQ29udGVudEV4dGVuc2lvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViQ29yZS9Db250ZW50RXh0ZW5zaW9ucy5jcHAJKHJldmlzaW9uIDE4MjQzMSkK KysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db250ZW50RXh0ZW5zaW9ucy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1Nyw3ICs0NTcsNyBAQCBURVNUX0YoQ29udGVudEV4dGVu c2lvblRlc3QsIExvYWRUeXBlKQogCiBURVNUX0YoQ29udGVudEV4dGVuc2lvblRlc3QsIFJlc291 cmNlVHlwZSkKIHsKLSAgICBhdXRvIGJhY2tlbmQgPSBtYWtlQmFja2VuZCgiW3tcImFjdGlvblwi OntcInR5cGVcIjpcImJsb2NrXCJ9LFwidHJpZ2dlclwiOntcInVybC1maWx0ZXJcIjpcImJsb2Nr X2FsbF90eXBlcy5vcmdcIixcInJlc291cmNlLXR5cGVcIjpbXCJkb2N1bWVudFwiLFwiaW1hZ2Vc IixcInN0eWxlLXNoZWV0XCIsXCJzY3JpcHRcIixcImZvbnRcIixcInJhd1wiLFwic3ZnLWRvY3Vt ZW50XCIsXCJtZWRpYVwiXX19LCIKKyAgICBhdXRvIGJhY2tlbmQgPSBtYWtlQmFja2VuZCgiW3tc ImFjdGlvblwiOntcInR5cGVcIjpcImJsb2NrXCJ9LFwidHJpZ2dlclwiOntcInVybC1maWx0ZXJc IjpcImJsb2NrX2FsbF90eXBlcy5vcmdcIixcInJlc291cmNlLXR5cGVcIjpbXCJkb2N1bWVudFwi LFwiaW1hZ2VcIixcInN0eWxlLXNoZWV0XCIsXCJzY3JpcHRcIixcImZvbnRcIixcInJhd1wiLFwi c3ZnLWRvY3VtZW50XCIsXCJtZWRpYVwiLFwicG9wdXBcIl19fSwiCiAgICAgICAgICJ7XCJhY3Rp b25cIjp7XCJ0eXBlXCI6XCJibG9ja1wifSxcInRyaWdnZXJcIjp7XCJ1cmwtZmlsdGVyXCI6XCJi bG9ja19vbmx5X2ltYWdlc1wiLFwicmVzb3VyY2UtdHlwZVwiOltcImltYWdlXCJdfX1dIik7CiAK ICAgICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBtYWluRG9jdW1lbnRSZXF1ZXN0KCJodHRwOi8vYmxv Y2tfYWxsX3R5cGVzLm9yZyIsIFJlc291cmNlVHlwZTo6RG9jdW1lbnQpLCB7IENvbnRlbnRFeHRl bnNpb25zOjpBY3Rpb25UeXBlOjpCbG9ja0xvYWQgfSk7CkBAIC00NjgsNiArNDY4LDcgQEAgVEVT VF9GKENvbnRlbnRFeHRlbnNpb25UZXN0LCBSZXNvdXJjZVR5cAogICAgIHRlc3RSZXF1ZXN0KGJh Y2tlbmQsIG1haW5Eb2N1bWVudFJlcXVlc3QoImh0dHA6Ly9ibG9ja19hbGxfdHlwZXMub3JnIiwg UmVzb3VyY2VUeXBlOjpSYXcpLCB7IENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb25UeXBlOjpCbG9j a0xvYWQgfSk7CiAgICAgdGVzdFJlcXVlc3QoYmFja2VuZCwgbWFpbkRvY3VtZW50UmVxdWVzdCgi aHR0cDovL2Jsb2NrX2FsbF90eXBlcy5vcmciLCBSZXNvdXJjZVR5cGU6OlNWR0RvY3VtZW50KSwg eyBDb250ZW50RXh0ZW5zaW9uczo6QWN0aW9uVHlwZTo6QmxvY2tMb2FkIH0pOwogICAgIHRlc3RS ZXF1ZXN0KGJhY2tlbmQsIG1haW5Eb2N1bWVudFJlcXVlc3QoImh0dHA6Ly9ibG9ja19hbGxfdHlw ZXMub3JnIiwgUmVzb3VyY2VUeXBlOjpNZWRpYSksIHsgQ29udGVudEV4dGVuc2lvbnM6OkFjdGlv blR5cGU6OkJsb2NrTG9hZCB9KTsKKyAgICB0ZXN0UmVxdWVzdChiYWNrZW5kLCBtYWluRG9jdW1l bnRSZXF1ZXN0KCJodHRwOi8vYmxvY2tfYWxsX3R5cGVzLm9yZyIsIFJlc291cmNlVHlwZTo6UG9w dXApLCB7IENvbnRlbnRFeHRlbnNpb25zOjpBY3Rpb25UeXBlOjpCbG9ja0xvYWQgfSk7CiAgICAg dGVzdFJlcXVlc3QoYmFja2VuZCwgbWFpbkRvY3VtZW50UmVxdWVzdCgiaHR0cDovL2Jsb2NrX29u bHlfaW1hZ2VzLm9yZyIsIFJlc291cmNlVHlwZTo6SW1hZ2UpLCB7IENvbnRlbnRFeHRlbnNpb25z OjpBY3Rpb25UeXBlOjpCbG9ja0xvYWQgfSk7CiAgICAgdGVzdFJlcXVlc3QoYmFja2VuZCwgbWFp bkRvY3VtZW50UmVxdWVzdCgiaHR0cDovL2Jsb2NrX29ubHlfaW1hZ2VzLm9yZyIsIFJlc291cmNl VHlwZTo6RG9jdW1lbnQpLCB7IH0pOwogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTgyNDkyKQorKysg TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTUtMDQtMDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBCbG9jayBwb3B1cHMgZnJvbSBjb250ZW50IGV4dGVuc2lvbnMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM0OTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvY29udGVu dGV4dGVuc2lvbnMvcG9wdXBzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90 ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMuaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0 cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMuaHRtbC5qc29uOiBBZGRlZC4KKwogMjAx NS0wMi0yNSAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBVcGRhdGUgdHJhY2sgc2l6ZXMgYWZ0ZXIgZGlzdHJpYnV0 aW5nIGV4dHJhIHNwYWNlCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRl bnNpb25zL3BvcHVwcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAw KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNCBAQAorQUxFUlQ6IGFib3V0OmJs YW5rIHN1Y2Nlc3NmdWxseSBibG9ja2VkCitBTEVSVDogZGF0YSB1cmwgc2hvdWxkIG5vdCBiZSBi bG9ja2VkCitBTEVSVDogZGF0YSB1cmwgc2hvdWxkIG5vdCBiZSBibG9ja2VkCisKSW5kZXg6IExh eW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVuc2lvbnMvcG9wdXBzLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMu aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVu c2lvbnMvcG9wdXBzLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxOCBAQAorPGh0bWw+ IAorPGJvZHk+Cis8c2NyaXB0PiAKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgIHRlc3RS dW5uZXIuZHVtcEFzVGV4dCgpOworICAgIHRlc3RSdW5uZXIuc2V0Q2FuT3BlbldpbmRvd3ModHJ1 ZSk7CisgICAgdGVzdFJ1bm5lci5zZXRDbG9zZVJlbWFpbmluZ1dpbmRvd3NXaGVuQ29tcGxldGUo dHJ1ZSk7Cit9CisKK3dpbiA9IHdpbmRvdy5vcGVuKCJhYm91dDpibGFuayIpOworYWxlcnQod2lu ID8gIkZBSUwiIDogImFib3V0OmJsYW5rIHN1Y2Nlc3NmdWxseSBibG9ja2VkIik7Cit3aW4gPSB3 aW5kb3cub3BlbigiZGF0YTp0ZXh0L2h0bWwsIGhlbGxvIik7CithbGVydCh3aW4gPyAiZGF0YSB1 cmwgc2hvdWxkIG5vdCBiZSBibG9ja2VkIiA6ICJGQUlMIik7Cit3aW4gPSB3aW5kb3cub3Blbigi ZGF0YTp0ZXh0L2h0bWwsIGFib3V0Iik7CithbGVydCh3aW4gPyAiZGF0YSB1cmwgc2hvdWxkIG5v dCBiZSBibG9ja2VkIiA6ICJGQUlMIik7Cis8L3NjcmlwdD4gCis8L2JvZHk+IAorPC9odG1sPgpJ bmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9wb3B1cHMuaHRt bC5qc29uCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVu c2lvbnMvcG9wdXBzLmh0bWwuanNvbgkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2h0dHAv dGVzdHMvY29udGVudGV4dGVuc2lvbnMvcG9wdXBzLmh0bWwuanNvbgkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDExIEBACitbCisgICAgeworICAgICAgICAiYWN0aW9uIjogeworICAgICAgICAg ICAgInR5cGUiOiAiYmxvY2siCisgICAgICAgIH0sCisgICAgICAgICJ0cmlnZ2VyIjogeworICAg ICAgICAgICAgInVybC1maWx0ZXIiOiAiYWJvdXQiLAorICAgICAgICAgICAgInJlc291cmNlLXR5 cGUiOlsicG9wdXAiXQorICAgICAgICB9CisgICAgfQorXQo=