155964 2016-03-29 00:36:30 -0700 Shield WebRTC JS built-ins from user scripts 2016-07-04 11:32:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf adam.bergkvist commit-queue eric.carlson oldest_to_newest 1178630 0 youennf 2016-03-29 00:36:30 -0700 We should shield WebRTC JS built-ins from user scripts, for instance in RTCPeerConnection.js or RTCPeerConnectionInternals. 1206367 1 282342 youennf 2016-06-29 06:08:49 -0700 Created attachment 282342 Patch 1207666 2 282715 youennf 2016-07-04 06:55:22 -0700 Created attachment 282715 Improving test 1207667 3 youennf 2016-07-04 06:59:10 -0700 (In reply to comment #2) > Created attachment 282715 [details] > Improving test I run the tests and the patch worked as expected on the modified tests (removing console.log lines). To be noted though that the two modified tests need rebasing (before and after this patch) and are skipped by default. Is there a reason to skip them? Should they be activated for GTK? It seems that they are useful even if not fully passing yet. 1207705 4 282715 commit-queue 2016-07-04 11:32:09 -0700 Comment on attachment 282715 Improving test Clearing flags on attachment: 282715 Committed r202810: <http://trac.webkit.org/changeset/202810> 1207706 5 commit-queue 2016-07-04 11:32:13 -0700 All reviewed patches have been landed. Closing bug. 282342 2016-06-29 06:08:49 -0700 2016-07-04 06:55:16 -0700 Patch bug-155964-20160629150830.patch text/plain 7304 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E0NmE2MTY4YjBhOWEy MThmYjIzM2ZlNTEzODM4ZWE5ZWVjNTNiNi4uOWQzODdlMWFmYzk2MDc2MGU5NDNhYzdlNGU2OWNm ODZmODUyZWQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA2LTI5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaGllbGQgV2ViUlRDIEpT IGJ1aWx0LWlucyBmcm9tIHVzZXIgc2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFraW5nIHVzZSBvZiBQcm9taXNlLnByb3RvdHlwZS5AdGhl biBpbnN0ZWFkIG9mIFByb21pc2UucHJvdG90eXBlLnRoZW4uCisgICAgICAgIENvdmVyZWQgYnkg dXBkYXRlZCB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNv bm5lY3Rpb24uanM6CisgICAgICAgIChjcmVhdGVPZmZlcik6CisgICAgICAgIChjcmVhdGVBbnN3 ZXIpOgorICAgICAgICAoc2V0TG9jYWxEZXNjcmlwdGlvbik6CisgICAgICAgIChzZXRSZW1vdGVE ZXNjcmlwdGlvbik6CisgICAgICAgIChhZGRJY2VDYW5kaWRhdGUpOgorICAgICAgICAoZ2V0U3Rh dHMpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRl cm5hbHMuanM6CisgICAgICAgIChlbnF1ZXVlT3BlcmF0aW9uKToKKwogMjAxNi0wNi0yOCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubmZAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92ZSBUaHJlYWRh YmxlTG9hZGVyT3B0aW9ucyBvcmlnaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmpzCmluZGV4IDdhOGYzMjhjNDAzODM4 YmY4ZTRlYTUxODBmNDBjMWI3ZTdhMzcwZjkuLmI4ZjdhY2M0MDQxZTBmZTMwMmJiNWM4ODQzMzE5 NDUyZGQwNjgzMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vUlRDUGVlckNvbm5lY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5qcwpAQCAtMTQ2LDcgKzE0Niw3IEBAIGZ1bmN0aW9u IGNyZWF0ZU9mZmVyKCkKICAgICB9LCBmdW5jdGlvbiAoc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNh bGxiYWNrLCBvcHRpb25zKSB7CiAgICAgICAgIC8vIExlZ2FjeSBjYWxsYmFja3MgbW9kZQogICAg ICAgICBAZW5xdWV1ZU9wZXJhdGlvbihwZWVyQ29ubmVjdGlvbiwgZnVuY3Rpb24gKCkgewotICAg ICAgICAgICAgcmV0dXJuIHBlZXJDb25uZWN0aW9uLkBxdWV1ZWRDcmVhdGVPZmZlcihvcHRpb25z KS50aGVuKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CisgICAgICAgICAgICByZXR1 cm4gcGVlckNvbm5lY3Rpb24uQHF1ZXVlZENyZWF0ZU9mZmVyKG9wdGlvbnMpLkB0aGVuKHN1Y2Nl c3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIHJldHVy biBAUHJvbWlzZS5AcmVzb2x2ZShAdW5kZWZpbmVkKTsKQEAgLTE3MCw3ICsxNzAsNyBAQCBmdW5j dGlvbiBjcmVhdGVBbnN3ZXIoKQogICAgIH0sIGZ1bmN0aW9uIChzdWNjZXNzQ2FsbGJhY2ssIGVy cm9yQ2FsbGJhY2ssIG9wdGlvbnMpIHsKICAgICAgICAgLy8gTGVnYWN5IGNhbGxiYWNrcyBtb2Rl CiAgICAgICAgIEBlbnF1ZXVlT3BlcmF0aW9uKHBlZXJDb25uZWN0aW9uLCBmdW5jdGlvbiAoKSB7 Ci0gICAgICAgICAgICByZXR1cm4gcGVlckNvbm5lY3Rpb24uQHF1ZXVlZENyZWF0ZUFuc3dlcihv cHRpb25zKS50aGVuKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CisgICAgICAgICAg ICByZXR1cm4gcGVlckNvbm5lY3Rpb24uQHF1ZXVlZENyZWF0ZUFuc3dlcihvcHRpb25zKS5AdGhl bihzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOwogICAgICAgICB9KTsKIAogICAgICAg ICByZXR1cm4gQFByb21pc2UuQHJlc29sdmUoQHVuZGVmaW5lZCk7CkBAIC0xOTksNyArMTk5LDcg QEAgZnVuY3Rpb24gc2V0TG9jYWxEZXNjcmlwdGlvbigpCiAgICAgfSwgZnVuY3Rpb24gKGRlc2Ny aXB0aW9uLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spIHsKICAgICAgICAgLy8gTGVn YWN5IGNhbGxiYWNrcyBtb2RlCiAgICAgICAgIEBlbnF1ZXVlT3BlcmF0aW9uKHBlZXJDb25uZWN0 aW9uLCBmdW5jdGlvbiAoKSB7Ci0gICAgICAgICAgICByZXR1cm4gcGVlckNvbm5lY3Rpb24uQHF1 ZXVlZFNldExvY2FsRGVzY3JpcHRpb24oZGVzY3JpcHRpb24pLnRoZW4oc3VjY2Vzc0NhbGxiYWNr LCBlcnJvckNhbGxiYWNrKTsKKyAgICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVl dWVkU2V0TG9jYWxEZXNjcmlwdGlvbihkZXNjcmlwdGlvbikuQHRoZW4oc3VjY2Vzc0NhbGxiYWNr LCBlcnJvckNhbGxiYWNrKTsKICAgICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuIEBQcm9taXNl LkByZXNvbHZlKEB1bmRlZmluZWQpOwpAQCAtMjI4LDcgKzIyOCw3IEBAIGZ1bmN0aW9uIHNldFJl bW90ZURlc2NyaXB0aW9uKCkKICAgICB9LCBmdW5jdGlvbiAoZGVzY3JpcHRpb24sIHN1Y2Nlc3ND YWxsYmFjaywgZXJyb3JDYWxsYmFjaykgewogICAgICAgICAvLyBMZWdhY3kgY2FsbGJhY2tzIG1v ZGUKICAgICAgICAgQGVucXVldWVPcGVyYXRpb24ocGVlckNvbm5lY3Rpb24sIGZ1bmN0aW9uICgp IHsKLSAgICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVldWVkU2V0UmVtb3RlRGVz Y3JpcHRpb24oZGVzY3JpcHRpb24pLnRoZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNr KTsKKyAgICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVldWVkU2V0UmVtb3RlRGVz Y3JpcHRpb24oZGVzY3JpcHRpb24pLkB0aGVuKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFj ayk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZShAdW5k ZWZpbmVkKTsKQEAgLTI1Nyw3ICsyNTcsNyBAQCBmdW5jdGlvbiBhZGRJY2VDYW5kaWRhdGUoKQog ICAgIH0sIGZ1bmN0aW9uIChjYW5kaWRhdGUsIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFj aykgewogICAgICAgICAvLyBMZWdhY3kgY2FsbGJhY2tzIG1vZGUKICAgICAgICAgQGVucXVldWVP cGVyYXRpb24ocGVlckNvbm5lY3Rpb24sIGZ1bmN0aW9uICgpIHsKLSAgICAgICAgICAgIHJldHVy biBwZWVyQ29ubmVjdGlvbi5AcXVldWVkQWRkSWNlQ2FuZGlkYXRlKGNhbmRpZGF0ZSkudGhlbihz dWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOworICAgICAgICAgICAgcmV0dXJuIHBlZXJD b25uZWN0aW9uLkBxdWV1ZWRBZGRJY2VDYW5kaWRhdGUoY2FuZGlkYXRlKS5AdGhlbihzdWNjZXNz Q2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOwogICAgICAgICB9KTsKIAogICAgICAgICByZXR1cm4g QFByb21pc2UuQHJlc29sdmUoQHVuZGVmaW5lZCk7CkBAIC0yODQsNyArMjg0LDcgQEAgZnVuY3Rp b24gZ2V0U3RhdHMoKQogICAgICAgICByZXR1cm4gcGVlckNvbm5lY3Rpb24uQHByaXZhdGVHZXRT dGF0cyhzZWxlY3Rvcik7CiAgICAgfSwgZnVuY3Rpb24gKHNlbGVjdG9yLCBzdWNjZXNzQ2FsbGJh Y2ssIGVycm9yQ2FsbGJhY2spIHsKICAgICAgICAgLy8gTGVnYWN5IGNhbGxiYWNrcyBtb2RlCi0g ICAgICAgIHBlZXJDb25uZWN0aW9uLkBwcml2YXRlR2V0U3RhdHMoc2VsZWN0b3IpLnRoZW4oc3Vj Y2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrKTsKKyAgICAgICAgcGVlckNvbm5lY3Rpb24uQHBy aXZhdGVHZXRTdGF0cyhzZWxlY3RvcikuQHRoZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxi YWNrKTsKIAogICAgICAgICByZXR1cm4gQFByb21pc2UuQHJlc29sdmUoQHVuZGVmaW5lZCk7CiAg ICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JU Q1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbkludGVybmFscy5qcwppbmRleCBlM2JjM2IzYmE3ZWQ5 ODViZTc1OTBhNDc1MDk5NjE3ZjllYTcxMTJjLi43NDEyNDI1ZTU3M2Y2MjNiNzRmNjQwZDBjNDAy ZWNhNDBlOWJhYWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRlcm5hbHMuanMKQEAgLTQ2LDcg KzQ2LDcgQEAgZnVuY3Rpb24gZW5xdWV1ZU9wZXJhdGlvbihwZWVyQ29ubmVjdGlvbiwgb3BlcmF0 aW9uKQogCiAgICAgcmV0dXJuIG5ldyBAUHJvbWlzZShmdW5jdGlvbiAocmVzb2x2ZSwgcmVqZWN0 KSB7CiAgICAgICAgIG9wZXJhdGlvbnMuQHB1c2goZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICBv cGVyYXRpb24oKS50aGVuKHJlc29sdmUsIHJlamVjdCkudGhlbihydW5OZXh0LCBydW5OZXh0KTsK KyAgICAgICAgICAgIG9wZXJhdGlvbigpLkB0aGVuKHJlc29sdmUsIHJlamVjdCkuQHRoZW4ocnVu TmV4dCwgcnVuTmV4dCk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGlmIChvcGVyYXRpb25zLmxl bmd0aCA9PSAxKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDhmNmM0MDZmNTNkOTFmYzIzYzUzYjM2YTIzNjBiNjllNjI1N2M0 NTguLmFiNWRiNmIwNWI0NDZlMWNiMzg2OGFhMzhkOGVkOGJjZDVkOGQ2YjggMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxNi0wNi0yOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CisKKyAgICAgICAgU2hpZWxkIFdlYlJUQyBKUyBidWlsdC1pbnMgZnJvbSB1c2VyIHNjcmlwdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTk2NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1jcmVhdGVPZmZlci5odG1sOgorICAgICAgICAq IGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tc3RhYmxlLmh0bWw6CisKIDIwMTYt MDYtMjggIEZyZWRlcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEFYOiBB ZGQgYWNjZXNzaWJpbGl0eSB0ZXN0cyBmb3IgTWF0aE1MIG9wZXJhdG9ycwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1jcmVhdGVPZmZl ci5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1j cmVhdGVPZmZlci5odG1sCmluZGV4IDA0N2NiODlhOTcxNzAwM2JiMzNlYmE3YmJmZjZmMjMyOWIy ZTAzYjQuLjU0NmZhZmU1NTA2NTZlYjQ2ZmQ4YWUzMmMxNGYwMDhkNjBmYTU4MmMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tY3JlYXRl T2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25u ZWN0aW9uLWNyZWF0ZU9mZmVyLmh0bWwKQEAgLTcsNiArNywxMyBAQAogICAgICAgICA8c2NyaXB0 PgogICAgICAgICAgICAgZGVzY3JpcHRpb24oIlRlc3RzIFJUQ1BlZXJDb25uZWN0aW9uIGNyZWF0 ZU9mZmVyLiIpOwogCisgICAgICAgICAgICAvLyBMZXQncyBlbnN1cmUgYnVpbHQtaW5zIGFyZSBz aGllbGRlZCBmcm9tIHVzZXIgc2NyaXB0cworICAgICAgICAgICAgdmFyIHRoZW5Qcm9taXNlID0g UHJvbWlzZS5wcm90b3R5cGUudGhlbjsKKyAgICAgICAgICAgIFByb21pc2UucHJvdG90eXBlLnRo ZW4gPSBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmxvZygiUHJvbWlzZS5w cm90b3R5cGUudGhlbiBpcyBjYWxsZWQgaW50ZXJuYWxseSIpOworICAgICAgICAgICAgICAgIHRo ZW5Qcm9taXNlLmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7CisgICAgICAgICAgICB9CisKICAgICAg ICAgICAgIHZhciBwYyA9IG51bGw7CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIHJlcXVlc3RTdWNj ZWVkZWQzKHNkKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQ ZWVyQ29ubmVjdGlvbi1zdGFibGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24tc3RhYmxlLmh0bWwKaW5kZXggMjE1MzZhZThhZTY0ZmJlYzgyMjYz YWUxOGQ4YzhkNjA2MmY0N2VkMi4uYTkxMGE0Mjg2NzNkM2RiNWFkYjNlZTU5Njk2ZjQ1NDJjZmFi MDM0MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29u bmVjdGlvbi1zdGFibGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JU Q1BlZXJDb25uZWN0aW9uLXN0YWJsZS5odG1sCkBAIC05LDYgKzksMTMgQEAKIAogICAgICAgICAg ICAgdmFyIHBjID0gbnVsbDsKIAorICAgICAgICAgICAgLy8gTGV0J3MgZW5zdXJlIGJ1aWx0LWlu cyBhcmUgc2hpZWxkZWQgZnJvbSB1c2VyIHNjcmlwdHMKKyAgICAgICAgICAgIHZhciB0aGVuUHJv bWlzZSA9IFByb21pc2UucHJvdG90eXBlLnRoZW47CisgICAgICAgICAgICBQcm9taXNlLnByb3Rv dHlwZS50aGVuID0gZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgY29uc29sZS5sb2coIlBy b21pc2UucHJvdG90eXBlLnRoZW4gaXMgY2FsbGVkIGludGVybmFsbHkiKTsKKyAgICAgICAgICAg ICAgICB0aGVuUHJvbWlzZS5hcHBseSh0aGlzLCBhcmd1bWVudHMpOworICAgICAgICAgICAgfQor CiAgICAgICAgICAgICBmdW5jdGlvbiByZXF1ZXN0U3VjY2VlZGVkMigpCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgdGVzdFBhc3NlZCgnc2V0UmVtb3RlRGVzY3JpcHRpb24gc3VjY2Vl ZGVkLicpOwo= 282715 2016-07-04 06:55:22 -0700 2016-07-04 11:32:09 -0700 Improving test bug-155964-20160704155453.patch text/plain 7348 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyODA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU5NDM1NjMwMGJkZjY1 YmZlMmY2YTc4ZDZkMTQxMjZkMTU4MzFlMy4uMDI1NWY4ZjEwYTMyMDQ0NzM1ZmExMjYwOGJiYWNl Yjc1ODM4NGVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA3LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaGllbGQgV2ViUlRDIEpT IGJ1aWx0LWlucyBmcm9tIHVzZXIgc2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFraW5nIHVzZSBvZiBQcm9taXNlLnByb3RvdHlwZS5AdGhl biBpbnN0ZWFkIG9mIFByb21pc2UucHJvdG90eXBlLnRoZW4uCisgICAgICAgIENvdmVyZWQgYnkg dXBkYXRlZCB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNv bm5lY3Rpb24uanM6CisgICAgICAgIChjcmVhdGVPZmZlcik6CisgICAgICAgIChjcmVhdGVBbnN3 ZXIpOgorICAgICAgICAoc2V0TG9jYWxEZXNjcmlwdGlvbik6CisgICAgICAgIChzZXRSZW1vdGVE ZXNjcmlwdGlvbik6CisgICAgICAgIChhZGRJY2VDYW5kaWRhdGUpOgorICAgICAgICAoZ2V0U3Rh dHMpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRl cm5hbHMuanM6CisgICAgICAgIChlbnF1ZXVlT3BlcmF0aW9uKToKKwogMjAxNi0wNy0wNCAgUGhp bGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVsZWFzZSBi dWlsZCB3aXRoIGxvZ2dpbmcgZW5hYmxlZCBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5qcyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uanMKaW5kZXggN2E4ZjMy OGM0MDM4MzhiZjhlNGVhNTE4MGY0MGMxYjdlN2EzNzBmOS4uYjhmN2FjYzQwNDFlMGZlMzAyYmI1 Yzg4NDMzMTk0NTJkZDA2ODMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmpzCkBAIC0xNDYsNyArMTQ2LDcgQEAg ZnVuY3Rpb24gY3JlYXRlT2ZmZXIoKQogICAgIH0sIGZ1bmN0aW9uIChzdWNjZXNzQ2FsbGJhY2ss IGVycm9yQ2FsbGJhY2ssIG9wdGlvbnMpIHsKICAgICAgICAgLy8gTGVnYWN5IGNhbGxiYWNrcyBt b2RlCiAgICAgICAgIEBlbnF1ZXVlT3BlcmF0aW9uKHBlZXJDb25uZWN0aW9uLCBmdW5jdGlvbiAo KSB7Ci0gICAgICAgICAgICByZXR1cm4gcGVlckNvbm5lY3Rpb24uQHF1ZXVlZENyZWF0ZU9mZmVy KG9wdGlvbnMpLnRoZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrKTsKKyAgICAgICAg ICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVldWVkQ3JlYXRlT2ZmZXIob3B0aW9ucykuQHRo ZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrKTsKICAgICAgICAgfSk7CiAKICAgICAg ICAgcmV0dXJuIEBQcm9taXNlLkByZXNvbHZlKEB1bmRlZmluZWQpOwpAQCAtMTcwLDcgKzE3MCw3 IEBAIGZ1bmN0aW9uIGNyZWF0ZUFuc3dlcigpCiAgICAgfSwgZnVuY3Rpb24gKHN1Y2Nlc3NDYWxs YmFjaywgZXJyb3JDYWxsYmFjaywgb3B0aW9ucykgewogICAgICAgICAvLyBMZWdhY3kgY2FsbGJh Y2tzIG1vZGUKICAgICAgICAgQGVucXVldWVPcGVyYXRpb24ocGVlckNvbm5lY3Rpb24sIGZ1bmN0 aW9uICgpIHsKLSAgICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVldWVkQ3JlYXRl QW5zd2VyKG9wdGlvbnMpLnRoZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrKTsKKyAg ICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcXVldWVkQ3JlYXRlQW5zd2VyKG9wdGlv bnMpLkB0aGVuKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiAgICAgICAgIH0pOwog CiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZShAdW5kZWZpbmVkKTsKQEAgLTE5OSw3 ICsxOTksNyBAQCBmdW5jdGlvbiBzZXRMb2NhbERlc2NyaXB0aW9uKCkKICAgICB9LCBmdW5jdGlv biAoZGVzY3JpcHRpb24sIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaykgewogICAgICAg ICAvLyBMZWdhY3kgY2FsbGJhY2tzIG1vZGUKICAgICAgICAgQGVucXVldWVPcGVyYXRpb24ocGVl ckNvbm5lY3Rpb24sIGZ1bmN0aW9uICgpIHsKLSAgICAgICAgICAgIHJldHVybiBwZWVyQ29ubmVj dGlvbi5AcXVldWVkU2V0TG9jYWxEZXNjcmlwdGlvbihkZXNjcmlwdGlvbikudGhlbihzdWNjZXNz Q2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOworICAgICAgICAgICAgcmV0dXJuIHBlZXJDb25uZWN0 aW9uLkBxdWV1ZWRTZXRMb2NhbERlc2NyaXB0aW9uKGRlc2NyaXB0aW9uKS5AdGhlbihzdWNjZXNz Q2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOwogICAgICAgICB9KTsKIAogICAgICAgICByZXR1cm4g QFByb21pc2UuQHJlc29sdmUoQHVuZGVmaW5lZCk7CkBAIC0yMjgsNyArMjI4LDcgQEAgZnVuY3Rp b24gc2V0UmVtb3RlRGVzY3JpcHRpb24oKQogICAgIH0sIGZ1bmN0aW9uIChkZXNjcmlwdGlvbiwg c3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrKSB7CiAgICAgICAgIC8vIExlZ2FjeSBjYWxs YmFja3MgbW9kZQogICAgICAgICBAZW5xdWV1ZU9wZXJhdGlvbihwZWVyQ29ubmVjdGlvbiwgZnVu Y3Rpb24gKCkgewotICAgICAgICAgICAgcmV0dXJuIHBlZXJDb25uZWN0aW9uLkBxdWV1ZWRTZXRS ZW1vdGVEZXNjcmlwdGlvbihkZXNjcmlwdGlvbikudGhlbihzdWNjZXNzQ2FsbGJhY2ssIGVycm9y Q2FsbGJhY2spOworICAgICAgICAgICAgcmV0dXJuIHBlZXJDb25uZWN0aW9uLkBxdWV1ZWRTZXRS ZW1vdGVEZXNjcmlwdGlvbihkZXNjcmlwdGlvbikuQHRoZW4oc3VjY2Vzc0NhbGxiYWNrLCBlcnJv ckNhbGxiYWNrKTsKICAgICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuIEBQcm9taXNlLkByZXNv bHZlKEB1bmRlZmluZWQpOwpAQCAtMjU3LDcgKzI1Nyw3IEBAIGZ1bmN0aW9uIGFkZEljZUNhbmRp ZGF0ZSgpCiAgICAgfSwgZnVuY3Rpb24gKGNhbmRpZGF0ZSwgc3VjY2Vzc0NhbGxiYWNrLCBlcnJv ckNhbGxiYWNrKSB7CiAgICAgICAgIC8vIExlZ2FjeSBjYWxsYmFja3MgbW9kZQogICAgICAgICBA ZW5xdWV1ZU9wZXJhdGlvbihwZWVyQ29ubmVjdGlvbiwgZnVuY3Rpb24gKCkgewotICAgICAgICAg ICAgcmV0dXJuIHBlZXJDb25uZWN0aW9uLkBxdWV1ZWRBZGRJY2VDYW5kaWRhdGUoY2FuZGlkYXRl KS50aGVuKHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CisgICAgICAgICAgICByZXR1 cm4gcGVlckNvbm5lY3Rpb24uQHF1ZXVlZEFkZEljZUNhbmRpZGF0ZShjYW5kaWRhdGUpLkB0aGVu KHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiAgICAgICAgIH0pOwogCiAgICAgICAg IHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZShAdW5kZWZpbmVkKTsKQEAgLTI4NCw3ICsyODQsNyBA QCBmdW5jdGlvbiBnZXRTdGF0cygpCiAgICAgICAgIHJldHVybiBwZWVyQ29ubmVjdGlvbi5AcHJp dmF0ZUdldFN0YXRzKHNlbGVjdG9yKTsKICAgICB9LCBmdW5jdGlvbiAoc2VsZWN0b3IsIHN1Y2Nl c3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjaykgewogICAgICAgICAvLyBMZWdhY3kgY2FsbGJhY2tz IG1vZGUKLSAgICAgICAgcGVlckNvbm5lY3Rpb24uQHByaXZhdGVHZXRTdGF0cyhzZWxlY3Rvciku dGhlbihzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spOworICAgICAgICBwZWVyQ29ubmVj dGlvbi5AcHJpdmF0ZUdldFN0YXRzKHNlbGVjdG9yKS5AdGhlbihzdWNjZXNzQ2FsbGJhY2ssIGVy cm9yQ2FsbGJhY2spOwogCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZShAdW5kZWZp bmVkKTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRlcm5hbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uSW50ZXJuYWxzLmpzCmluZGV4IGUzYmMz YjNiYTdlZDk4NWJlNzU5MGE0NzUwOTk2MTdmOWVhNzExMmMuLjc0MTI0MjVlNTczZjYyM2I3NGY2 NDBkMGM0MDJlY2E0MGU5YmFhZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb25JbnRlcm5hbHMuanMKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbkludGVybmFscy5qcwpA QCAtNDYsNyArNDYsNyBAQCBmdW5jdGlvbiBlbnF1ZXVlT3BlcmF0aW9uKHBlZXJDb25uZWN0aW9u LCBvcGVyYXRpb24pCiAKICAgICByZXR1cm4gbmV3IEBQcm9taXNlKGZ1bmN0aW9uIChyZXNvbHZl LCByZWplY3QpIHsKICAgICAgICAgb3BlcmF0aW9ucy5AcHVzaChmdW5jdGlvbigpIHsKLSAgICAg ICAgICAgIG9wZXJhdGlvbigpLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KS50aGVuKHJ1bk5leHQsIHJ1 bk5leHQpOworICAgICAgICAgICAgb3BlcmF0aW9uKCkuQHRoZW4ocmVzb2x2ZSwgcmVqZWN0KS5A dGhlbihydW5OZXh0LCBydW5OZXh0KTsKICAgICAgICAgfSk7CiAKICAgICAgICAgaWYgKG9wZXJh dGlvbnMubGVuZ3RoID09IDEpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWViN2UxNjk2MzU2MmQ3MjZhNTI4ZDBlMzNiN2U4 NGE1NzI0YjYyMi4uM2U1ZDhkYWM3YTU3Y2RlNDlmODgzZmExMjRjZDM1MzhlZjE3MjE2MyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTA3LTA0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KKworICAgICAgICBTaGllbGQgV2ViUlRDIEpTIGJ1aWx0LWlucyBmcm9tIHVzZXIg c2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU1OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWNyZWF0ZU9mZmVyLmh0bWw6Cisg ICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1zdGFibGUuaHRtbDoK KwogMjAxNi0wNy0wNCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCBza2lwIG1pc2MtYnVncy04NDczODktanBlZzIwMDAuanMgaW4g anNjIHN0cmVzcyB0ZXN0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVh bS9SVENQZWVyQ29ubmVjdGlvbi1jcmVhdGVPZmZlci5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1jcmVhdGVPZmZlci5odG1sCmluZGV4IDA0N2Ni ODlhOTcxNzAwM2JiMzNlYmE3YmJmZjZmMjMyOWIyZTAzYjQuLjkyZDliOGFjNmYwZDk5MjlkZjY5 YzJiZTMzOGYzN2YxMjE4N2E1YTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tY3JlYXRlT2ZmZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWNyZWF0ZU9mZmVyLmh0bWwKQEAg LTcsNiArNywxMyBAQAogICAgICAgICA8c2NyaXB0PgogICAgICAgICAgICAgZGVzY3JpcHRpb24o IlRlc3RzIFJUQ1BlZXJDb25uZWN0aW9uIGNyZWF0ZU9mZmVyLiIpOwogCisgICAgICAgICAgICAv LyBMZXQncyBlbnN1cmUgYnVpbHQtaW5zIGFyZSBzaGllbGRlZCBmcm9tIHVzZXIgc2NyaXB0cwor ICAgICAgICAgICAgdmFyIHRoZW5Qcm9taXNlID0gUHJvbWlzZS5wcm90b3R5cGUudGhlbjsKKyAg ICAgICAgICAgIFByb21pc2UucHJvdG90eXBlLnRoZW4gPSBmdW5jdGlvbigpIHsKKyAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygiUHJvbWlzZS5wcm90b3R5cGUudGhlbiBpcyBjYWxsZWQgaW50 ZXJuYWxseSIpOworICAgICAgICAgICAgICAgIHJldHVybiB0aGVuUHJvbWlzZS5hcHBseSh0aGlz LCBhcmd1bWVudHMpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB2YXIgcGMgPSBudWxs OwogCiAgICAgICAgICAgICBmdW5jdGlvbiByZXF1ZXN0U3VjY2VlZGVkMyhzZCkKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tc3RhYmxl Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLXN0 YWJsZS5odG1sCmluZGV4IDIxNTM2YWU4YWU2NGZiZWM4MjI2M2FlMThkOGM4ZDYwNjJmNDdlZDIu LjJlY2JlY2NlNmQ4Y2NjNGQyYzQwZDljY2JjZGQ5M2UzYTViZjJkNzIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tc3RhYmxlLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1zdGFi bGUuaHRtbApAQCAtOSw2ICs5LDEzIEBACiAKICAgICAgICAgICAgIHZhciBwYyA9IG51bGw7CiAK KyAgICAgICAgICAgIC8vIExldCdzIGVuc3VyZSBidWlsdC1pbnMgYXJlIHNoaWVsZGVkIGZyb20g dXNlciBzY3JpcHRzCisgICAgICAgICAgICB2YXIgdGhlblByb21pc2UgPSBQcm9taXNlLnByb3Rv dHlwZS50aGVuOworICAgICAgICAgICAgUHJvbWlzZS5wcm90b3R5cGUudGhlbiA9IGZ1bmN0aW9u KCkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJQcm9taXNlLnByb3RvdHlwZS50aGVu IGlzIGNhbGxlZCBpbnRlcm5hbGx5Iik7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRoZW5Qcm9t aXNlLmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAg IGZ1bmN0aW9uIHJlcXVlc3RTdWNjZWVkZWQyKCkKICAgICAgICAgICAgIHsKICAgICAgICAgICAg ICAgICB0ZXN0UGFzc2VkKCdzZXRSZW1vdGVEZXNjcmlwdGlvbiBzdWNjZWVkZWQuJyk7Cg==