82753 2012-03-30 10:52:55 -0700 Web Inspector: CodeGeneratorInspector.py: add missing runtime assert method for InspectorObject 2012-03-30 11:54:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 prybin webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik vsevik yurys oldest_to_newest 592291 0 prybin 2012-03-30 10:52:55 -0700 Do not allow InspectorObject and other raw interfaces from Console and DOMDebugger domains anymore. 592308 1 134840 prybin 2012-03-30 11:02:14 -0700 Created attachment 134840 Patch 592329 2 134840 vsevik 2012-03-30 11:19:40 -0700 Comment on attachment 134840 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134840&action=review > Source/WebCore/ChangeLog:10 > + Type validator generator is extended to support missing InspectorObject type and Looks like this is main thing done in this patch. Could you please name the bug accordignly? 592338 3 prybin 2012-03-30 11:28:18 -0700 Among all types that needs assert for runtime validator, InspectorObject is missing and should be also supported. Switching Console and DOMDebugger to strict typed api reduces to more of a drive-by fix. 592343 4 134846 prybin 2012-03-30 11:33:11 -0700 Created attachment 134846 Patch 592360 5 vsevik 2012-03-30 11:54:23 -0700 Committed r112706: <http://trac.webkit.org/changeset/112706> 134840 2012-03-30 11:02:14 -0700 2012-03-30 11:33:01 -0700 Patch bug-82753-20120330220212.patch text/plain 6930 prybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGZkN2YxY2Q1ZjdlMWY3 ZjVlMjEyMDE5NDFiZjI4ODhiZjZmYWU5OC4uMGJiYjg5MmY5NTdjZmRiZDFlYTQ2MGI2YmY5YjQy MmZmNWVkMzYyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAzLTMwICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDb2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5OiBzd2l0Y2ggQ29uc29sZSBhbmQgRE9NRGVidWdn ZXIgZG9tYWlucyB0byB0eXBlZCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgyNzUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3RyaWN0IHR5cGVzIGFyZSBlbmFibGVkIGZvciAyIG1vcmUgZG9tYWlu cy4KKworICAgICAgICBUeXBlIHZhbGlkYXRvciBnZW5lcmF0b3IgaXMgZXh0ZW5kZWQgdG8gc3Vw cG9ydCBtaXNzaW5nIEluc3BlY3Rvck9iamVjdCB0eXBlIGFuZAorICAgICAgICBtYWRlIG1vcmUg YWNjdXJhdGUgZm9yICJpbnQiIHR5cGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVy YXRvckluc3BlY3Rvci5weToKKyAgICAgICAgKFJhd1R5cGVzLkJhc2VUeXBlLmdlbmVyYXRlX3Zh bGlkYXRlX21ldGhvZCk6CisgICAgICAgIChSYXdUeXBlcy5TdHJpbmcuZ2V0X3ZhbGlkYXRlX21l dGhvZF9wYXJhbXMuVmFsaWRhdGVNZXRob2RQYXJhbXMpOgorICAgICAgICAoUmF3VHlwZXMuSW50 KToKKyAgICAgICAgKFJhd1R5cGVzLkludC5nZW5lcmF0ZV92YWxpZGF0ZV9tZXRob2QpOgorICAg ICAgICAoUmF3VHlwZXMuSW50LmdldF9yYXdfdmFsaWRhdG9yX2NhbGxfdGV4dCk6CisgICAgICAg IChSYXdUeXBlcy5OdW1iZXIuZ2V0X3ZhbGlkYXRlX21ldGhvZF9wYXJhbXMuVmFsaWRhdGVNZXRo b2RQYXJhbXMpOgorICAgICAgICAoUmF3VHlwZXMuQm9vbC5nZXRfdmFsaWRhdGVfbWV0aG9kX3Bh cmFtcy5WYWxpZGF0ZU1ldGhvZFBhcmFtcyk6CisgICAgICAgIChSYXdUeXBlcy5PYmplY3QuZ2V0 X3ZhbGlkYXRlX21ldGhvZF9wYXJhbXMuVmFsaWRhdGVNZXRob2RQYXJhbXMpOgorICAgICAgICAo UmF3VHlwZXMuT2JqZWN0LmdldF92YWxpZGF0ZV9tZXRob2RfcGFyYW1zKToKKyAgICAgICAgKFR5 cGVCaW5kaW5ncy5jcmVhdGVfdHlwZV9kZWNsYXJhdGlvbl8uQ2xhc3NCaW5kaW5nLnJlcXVlc3Rf aW50ZXJuYWxfcnVudGltZV9jYXN0KToKKyAgICAgICAgKFBsYWluT2JqZWN0QmluZGluZy5yZXF1 ZXN0X2ludGVybmFsX3J1bnRpbWVfY2FzdCk6CisgICAgICAgIChQbGFpbk9iamVjdEJpbmRpbmcu Z2V0X3ZhbGlkYXRvcl9jYWxsX3RleHQpOgorICAgICAgICAoQXJyYXlCaW5kaW5nLnJlcXVlc3Rf aW50ZXJuYWxfcnVudGltZV9jYXN0KToKKwogMjAxMi0wMy0yOCAgUGV0ZXIgUnliaW4gIDxwZXRl ci5yeWJpbkBnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29kZUdlbmVyYXRv ckluc3BlY3Rvci5weTogc3dpdGNoIFJ1bnRpbWUsIE5ldHdvcmsgYW5kIERPTSBkb21haW5zIHRv IHR5cGVkIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5l cmF0b3JJbnNwZWN0b3IucHkgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRv ckluc3BlY3Rvci5weQppbmRleCA3OWVlNzE0ZTQ1NGUxNDNkOGY5Y2ZjODllNGUxNWMzMzhhZGU4 ZGJiLi4wZWFlOTQ3ZDRlN2MwNjJjYTRlY2M1ZGZhMzQ4ZjQ5MzA5YjliNTBmIDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weQpAQCAt NTksNyArNTksOCBAQCBUWVBFX05BTUVfRklYX01BUCA9IHsKIFRZUEVTX1dJVEhfUlVOVElNRV9D QVNUX1NFVCA9IGZyb3plbnNldChbIlJ1bnRpbWUuUmVtb3RlT2JqZWN0IiwgIlJ1bnRpbWUuUHJv cGVydHlEZXNjcmlwdG9yIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIkRlYnVnZ2VyLkZ1bmN0aW9uRGV0YWlscyIsICJEZWJ1Z2dlci5DYWxsRnJhbWUiXSkKIAot U1RSSUNUX0VOQUJMRURfRE9NQUlOUyA9IFsiQ1NTIiwgIkRlYnVnZ2VyIiwgIkRPTSIsICJOZXR3 b3JrIiwgIlBhZ2UiLCAiUnVudGltZSJdCitTVFJJQ1RfRU5BQkxFRF9ET01BSU5TID0gWyJDb25z b2xlIiwgIkRPTURlYnVnZ2VyIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIkNTUyIsICJE ZWJ1Z2dlciIsICJET00iLCAiTmV0d29yayIsICJQYWdlIiwgIlJ1bnRpbWUiXQogCiAKIGNtZGxp bmVfcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKCkKQEAgLTIzNyw5ICsyMzgsNyBAQCBj bGFzcyBSYXdUeXBlcyhvYmplY3QpOgogICAgICAgICAgICAgcGFyYW1zID0gY2xzLmdldF92YWxp ZGF0ZV9tZXRob2RfcGFyYW1zKCkKICAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJzdGF0aWMg dm9pZCBhc3NlcnQlcyhJbnNwZWN0b3JWYWx1ZSogdmFsdWUpXG4iICUgcGFyYW1zLm5hbWUpCiAg ICAgICAgICAgICB3cml0ZXIubmV3bGluZSgie1xuIikKLSAgICAgICAgICAgIHdyaXRlci5uZXds aW5lKCIgICAgJXMgdjtcbiIgJSBwYXJhbXMudmFyX3R5cGUpCi0gICAgICAgICAgICB3cml0ZXIu bmV3bGluZSgiICAgIGJvb2wgY2FzdFJlcyA9IHZhbHVlLT5hcyVzKCZ2KTtcbiIgJSBwYXJhbXMu YXNfbWV0aG9kX25hbWUpCi0gICAgICAgICAgICB3cml0ZXIubmV3bGluZSgiICAgIEFTU0VSVF9V TlVTRUQoY2FzdFJlcywgY2FzdFJlcyk7XG4iKQorICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUo IiAgICBBU1NFUlQodmFsdWUtPnR5cGUoKSA9PSBJbnNwZWN0b3JWYWx1ZTo6VHlwZSVzKTtcbiIg JSBwYXJhbXMuYXNfbWV0aG9kX25hbWUpCiAgICAgICAgICAgICB3cml0ZXIubmV3bGluZSgifVxu XG5cbiIpCiAKICAgICAgICAgQGNsYXNzbWV0aG9kCkBAIC0yNzQsNyArMjczLDYgQEAgY2xhc3Mg UmF3VHlwZXMob2JqZWN0KToKICAgICAgICAgZGVmIGdldF92YWxpZGF0ZV9tZXRob2RfcGFyYW1z KCk6CiAgICAgICAgICAgICBjbGFzcyBWYWxpZGF0ZU1ldGhvZFBhcmFtczoKICAgICAgICAgICAg ICAgICBuYW1lID0gIlN0cmluZyIKLSAgICAgICAgICAgICAgICB2YXJfdHlwZSA9ICJTdHJpbmci CiAgICAgICAgICAgICAgICAgYXNfbWV0aG9kX25hbWUgPSAiU3RyaW5nIgogICAgICAgICAgICAg cmV0dXJuIFZhbGlkYXRlTWV0aG9kUGFyYW1zCiAKQEAgLTMxMSwxMyArMzA5LDE5IEBAIGNsYXNz IFJhd1R5cGVzKG9iamVjdCk6CiAgICAgICAgIGRlZiBnZXRfanNfYmluZF90eXBlKCk6CiAgICAg ICAgICAgICByZXR1cm4gIm51bWJlciIKIAotICAgICAgICBAc3RhdGljbWV0aG9kCi0gICAgICAg IGRlZiBnZXRfdmFsaWRhdGVfbWV0aG9kX3BhcmFtcygpOgotICAgICAgICAgICAgY2xhc3MgVmFs aWRhdGVNZXRob2RQYXJhbXM6Ci0gICAgICAgICAgICAgICAgbmFtZSA9ICJJbnQiCi0gICAgICAg ICAgICAgICAgdmFyX3R5cGUgPSAiaW50IgotICAgICAgICAgICAgICAgIGFzX21ldGhvZF9uYW1l ID0gIk51bWJlciIKLSAgICAgICAgICAgIHJldHVybiBWYWxpZGF0ZU1ldGhvZFBhcmFtcworICAg ICAgICBAY2xhc3NtZXRob2QKKyAgICAgICAgZGVmIGdlbmVyYXRlX3ZhbGlkYXRlX21ldGhvZChj bHMsIHdyaXRlcik6CisgICAgICAgICAgICB3cml0ZXIubmV3bGluZSgic3RhdGljIHZvaWQgYXNz ZXJ0SW50KEluc3BlY3RvclZhbHVlKiB2YWx1ZSlcbiIpCisgICAgICAgICAgICB3cml0ZXIubmV3 bGluZSgie1xuIikKKyAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCIgICAgZG91YmxlIHY7XG4i KQorICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUoIiAgICBib29sIGNhc3RSZXMgPSB2YWx1ZS0+ YXNOdW1iZXIoJnYpO1xuIikKKyAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCIgICAgQVNTRVJU X1VOVVNFRChjYXN0UmVzLCBjYXN0UmVzKTtcbiIpCisgICAgICAgICAgICB3cml0ZXIubmV3bGlu ZSgiICAgIEFTU0VSVChzdGF0aWNfY2FzdDxkb3VibGU+KHN0YXRpY19jYXN0PGludD4odikpID09 IHYpO1xuIikKKyAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJ9XG5cblxuIikKKworICAgICAg ICBAY2xhc3NtZXRob2QKKyAgICAgICAgZGVmIGdldF9yYXdfdmFsaWRhdG9yX2NhbGxfdGV4dChj bHMpOgorICAgICAgICAgICAgcmV0dXJuICJhc3NlcnRJbnQiCiAKICAgICAgICAgQHN0YXRpY21l dGhvZAogICAgICAgICBkZWYgZ2V0X291dHB1dF9wYXNzX21vZGVsKCk6CkBAIC0zNTYsNyArMzYw LDYgQEAgY2xhc3MgUmF3VHlwZXMob2JqZWN0KToKICAgICAgICAgZGVmIGdldF92YWxpZGF0ZV9t ZXRob2RfcGFyYW1zKCk6CiAgICAgICAgICAgICBjbGFzcyBWYWxpZGF0ZU1ldGhvZFBhcmFtczoK ICAgICAgICAgICAgICAgICBuYW1lID0gIkRvdWJsZSIKLSAgICAgICAgICAgICAgICB2YXJfdHlw ZSA9ICJkb3VibGUiCiAgICAgICAgICAgICAgICAgYXNfbWV0aG9kX25hbWUgPSAiTnVtYmVyIgog ICAgICAgICAgICAgcmV0dXJuIFZhbGlkYXRlTWV0aG9kUGFyYW1zCiAKQEAgLTM5NSw3ICszOTgs NiBAQCBjbGFzcyBSYXdUeXBlcyhvYmplY3QpOgogICAgICAgICBkZWYgZ2V0X3ZhbGlkYXRlX21l dGhvZF9wYXJhbXMoKToKICAgICAgICAgICAgIGNsYXNzIFZhbGlkYXRlTWV0aG9kUGFyYW1zOgog ICAgICAgICAgICAgICAgIG5hbWUgPSAiQm9vbGVhbiIKLSAgICAgICAgICAgICAgICB2YXJfdHlw ZSA9ICJib29sIgogICAgICAgICAgICAgICAgIGFzX21ldGhvZF9uYW1lID0gIkJvb2xlYW4iCiAg ICAgICAgICAgICByZXR1cm4gVmFsaWRhdGVNZXRob2RQYXJhbXMKIApAQCAtNDM2LDcgKzQzOCwx MCBAQCBjbGFzcyBSYXdUeXBlcyhvYmplY3QpOgogCiAgICAgICAgIEBzdGF0aWNtZXRob2QKICAg ICAgICAgZGVmIGdldF92YWxpZGF0ZV9tZXRob2RfcGFyYW1zKCk6Ci0gICAgICAgICAgICByYWlz ZSBFeGNlcHRpb24oIlRPRE8iKQorICAgICAgICAgICAgY2xhc3MgVmFsaWRhdGVNZXRob2RQYXJh bXM6CisgICAgICAgICAgICAgICAgbmFtZSA9ICJPYmplY3QiCisgICAgICAgICAgICAgICAgYXNf bWV0aG9kX25hbWUgPSAiT2JqZWN0IgorICAgICAgICAgICAgcmV0dXJuIFZhbGlkYXRlTWV0aG9k UGFyYW1zCiAKICAgICAgICAgQHN0YXRpY21ldGhvZAogICAgICAgICBkZWYgZ2V0X291dHB1dF9w YXNzX21vZGVsKCk6CkBAIC0xMTIwLDYgKzExMjUsOCBAQCBjbGFzcyBUeXBlQmluZGluZ3M6CiAK ICAgICAgICAgICAgICAgICAgICAgQGNsYXNzbWV0aG9kCiAgICAgICAgICAgICAgICAgICAgIGRl ZiByZXF1ZXN0X2ludGVybmFsX3J1bnRpbWVfY2FzdChjbHMpOgorICAgICAgICAgICAgICAgICAg ICAgICAgaWYgY2xzLm5lZWRfaW50ZXJuYWxfcnVudGltZV9jYXN0XzoKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgICAgICAgICAgICAgICAgIGNscy5uZWVkX2lu dGVybmFsX3J1bnRpbWVfY2FzdF8gPSBUcnVlCiAgICAgICAgICAgICAgICAgICAgICAgICBmb3Ig cCBpbiBjbHMucmVzb2x2ZV9kYXRhXy5tYWluX3Byb3BlcnRpZXM6CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcC5wYXJhbV90eXBlX2JpbmRpbmcucmVxdWVzdF9pbnRlcm5hbF9ydW50aW1l X2Nhc3QoKQpAQCAtMTM4Niw3ICsxMzkzLDcgQEAgY2xhc3MgVHlwZUJpbmRpbmdzOgogCiAgICAg ICAgICAgICAgICAgICAgIEBzdGF0aWNtZXRob2QKICAgICAgICAgICAgICAgICAgICAgZGVmIHJl cXVlc3RfaW50ZXJuYWxfcnVudGltZV9jYXN0KCk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBw YXNzCisgICAgICAgICAgICAgICAgICAgICAgICBSYXdUeXBlcy5PYmplY3QucmVxdWVzdF9yYXdf aW50ZXJuYWxfcnVudGltZV9jYXN0KCkKIAogICAgICAgICAgICAgICAgICAgICBAc3RhdGljbWV0 aG9kCiAgICAgICAgICAgICAgICAgICAgIGRlZiBnZXRfY29kZV9nZW5lcmF0b3IoKToKQEAgLTEz OTQsNyArMTQwMSw3IEBAIGNsYXNzIFR5cGVCaW5kaW5nczoKIAogICAgICAgICAgICAgICAgICAg ICBAc3RhdGljbWV0aG9kCiAgICAgICAgICAgICAgICAgICAgIGRlZiBnZXRfdmFsaWRhdG9yX2Nh bGxfdGV4dCgpOgotICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJVbnN1 cHBvcnRlZCIpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gImFzc2VydE9iamVjdCIK IAogICAgICAgICAgICAgICAgICAgICBAY2xhc3NtZXRob2QKICAgICAgICAgICAgICAgICAgICAg ZGVmIGdldF9hcnJheV9pdGVtX2NfdHlwZV90ZXh0KGNscyk6CkBAIC0xNDU2LDYgKzE0NjMsOCBA QCBjbGFzcyBUeXBlQmluZGluZ3M6CiAKICAgICAgICAgICAgICAgICAgICAgQGNsYXNzbWV0aG9k CiAgICAgICAgICAgICAgICAgICAgIGRlZiByZXF1ZXN0X2ludGVybmFsX3J1bnRpbWVfY2FzdChj bHMpOgorICAgICAgICAgICAgICAgICAgICAgICAgaWYgY2xzLm5lZWRfaW50ZXJuYWxfcnVudGlt ZV9jYXN0XzoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4KICAgICAgICAgICAg ICAgICAgICAgICAgIGNscy5uZWVkX2ludGVybmFsX3J1bnRpbWVfY2FzdF8gPSBUcnVlCiAgICAg ICAgICAgICAgICAgICAgICAgICBjbHMucmVzb2x2ZV9kYXRhXy5pdGVtX3R5cGVfYmluZGluZy5y ZXF1ZXN0X2ludGVybmFsX3J1bnRpbWVfY2FzdCgpCiAK 134846 2012-03-30 11:33:11 -0700 2012-03-30 11:53:21 -0700 Patch bug-82753-20120330223309.patch text/plain 6932 prybin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGZkN2YxY2Q1ZjdlMWY3 ZjVlMjEyMDE5NDFiZjI4ODhiZjZmYWU5OC4uZTgyMzdhZWE2YzA4NTY1NGFkZTQzNDdiZGE5NTg0 MDc2MjBiYWY2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAzLTMwICBQZXRl ciBSeWJpbiAgPHBldGVyLnJ5YmluQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDb2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5OiBhZGQgbWlzc2luZyBydW50aW1lIGFzc2VydCBt ZXRob2QgZm9yIEluc3BlY3Rvck9iamVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODI3NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUeXBlIHZhbGlkYXRvciBnZW5lcmF0b3IgaXMgZXh0ZW5kZWQgdG8g c3VwcG9ydCBtaXNzaW5nIEluc3BlY3Rvck9iamVjdCB0eXBlIGFuZAorICAgICAgICBtYWRlIG1v cmUgYWNjdXJhdGUgZm9yICJpbnQiIHR5cGUuCisKKyAgICAgICAgU3RyaWN0IHR5cGVzIGFyZSBl bmFibGVkIGZvciAyIG1vcmUgZG9tYWlucy4KKworICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2Vu ZXJhdG9ySW5zcGVjdG9yLnB5OgorICAgICAgICAoUmF3VHlwZXMuQmFzZVR5cGUuZ2VuZXJhdGVf dmFsaWRhdGVfbWV0aG9kKToKKyAgICAgICAgKFJhd1R5cGVzLlN0cmluZy5nZXRfdmFsaWRhdGVf bWV0aG9kX3BhcmFtcy5WYWxpZGF0ZU1ldGhvZFBhcmFtcyk6CisgICAgICAgIChSYXdUeXBlcy5J bnQpOgorICAgICAgICAoUmF3VHlwZXMuSW50LmdlbmVyYXRlX3ZhbGlkYXRlX21ldGhvZCk6Cisg ICAgICAgIChSYXdUeXBlcy5JbnQuZ2V0X3Jhd192YWxpZGF0b3JfY2FsbF90ZXh0KToKKyAgICAg ICAgKFJhd1R5cGVzLk51bWJlci5nZXRfdmFsaWRhdGVfbWV0aG9kX3BhcmFtcy5WYWxpZGF0ZU1l dGhvZFBhcmFtcyk6CisgICAgICAgIChSYXdUeXBlcy5Cb29sLmdldF92YWxpZGF0ZV9tZXRob2Rf cGFyYW1zLlZhbGlkYXRlTWV0aG9kUGFyYW1zKToKKyAgICAgICAgKFJhd1R5cGVzLk9iamVjdC5n ZXRfdmFsaWRhdGVfbWV0aG9kX3BhcmFtcy5WYWxpZGF0ZU1ldGhvZFBhcmFtcyk6CisgICAgICAg IChSYXdUeXBlcy5PYmplY3QuZ2V0X3ZhbGlkYXRlX21ldGhvZF9wYXJhbXMpOgorICAgICAgICAo VHlwZUJpbmRpbmdzLmNyZWF0ZV90eXBlX2RlY2xhcmF0aW9uXy5DbGFzc0JpbmRpbmcucmVxdWVz dF9pbnRlcm5hbF9ydW50aW1lX2Nhc3QpOgorICAgICAgICAoUGxhaW5PYmplY3RCaW5kaW5nLnJl cXVlc3RfaW50ZXJuYWxfcnVudGltZV9jYXN0KToKKyAgICAgICAgKFBsYWluT2JqZWN0QmluZGlu Zy5nZXRfdmFsaWRhdG9yX2NhbGxfdGV4dCk6CisgICAgICAgIChBcnJheUJpbmRpbmcucmVxdWVz dF9pbnRlcm5hbF9ydW50aW1lX2Nhc3QpOgorCiAyMDEyLTAzLTI4ICBQZXRlciBSeWJpbiAgPHBl dGVyLnJ5YmluQGdtYWlsLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5OiBzd2l0Y2ggUnVudGltZSwgTmV0d29yayBhbmQgRE9NIGRvbWFpbnMg dG8gdHlwZWQgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdl bmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5CmluZGV4IDc5ZWU3MTRlNDU0ZTE0M2Q4ZjljZmM4OWU0ZTE1YzMzOGFk ZThkYmIuLjBlYWU5NDdkNGU3YzA2MmNhNGVjYzVkZmEzNDhmNDkzMDliOWI1MGYgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5Cisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBA IC01OSw3ICs1OSw4IEBAIFRZUEVfTkFNRV9GSVhfTUFQID0gewogVFlQRVNfV0lUSF9SVU5USU1F X0NBU1RfU0VUID0gZnJvemVuc2V0KFsiUnVudGltZS5SZW1vdGVPYmplY3QiLCAiUnVudGltZS5Q cm9wZXJ0eURlc2NyaXB0b3IiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiRGVidWdnZXIuRnVuY3Rpb25EZXRhaWxzIiwgIkRlYnVnZ2VyLkNhbGxGcmFtZSJdKQog Ci1TVFJJQ1RfRU5BQkxFRF9ET01BSU5TID0gWyJDU1MiLCAiRGVidWdnZXIiLCAiRE9NIiwgIk5l dHdvcmsiLCAiUGFnZSIsICJSdW50aW1lIl0KK1NUUklDVF9FTkFCTEVEX0RPTUFJTlMgPSBbIkNv bnNvbGUiLCAiRE9NRGVidWdnZXIiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAiQ1NTIiwg IkRlYnVnZ2VyIiwgIkRPTSIsICJOZXR3b3JrIiwgIlBhZ2UiLCAiUnVudGltZSJdCiAKIAogY21k bGluZV9wYXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIoKQpAQCAtMjM3LDkgKzIzOCw3IEBA IGNsYXNzIFJhd1R5cGVzKG9iamVjdCk6CiAgICAgICAgICAgICBwYXJhbXMgPSBjbHMuZ2V0X3Zh bGlkYXRlX21ldGhvZF9wYXJhbXMoKQogICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUoInN0YXRp YyB2b2lkIGFzc2VydCVzKEluc3BlY3RvclZhbHVlKiB2YWx1ZSlcbiIgJSBwYXJhbXMubmFtZSkK ICAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJ7XG4iKQotICAgICAgICAgICAgd3JpdGVyLm5l d2xpbmUoIiAgICAlcyB2O1xuIiAlIHBhcmFtcy52YXJfdHlwZSkKLSAgICAgICAgICAgIHdyaXRl ci5uZXdsaW5lKCIgICAgYm9vbCBjYXN0UmVzID0gdmFsdWUtPmFzJXMoJnYpO1xuIiAlIHBhcmFt cy5hc19tZXRob2RfbmFtZSkKLSAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCIgICAgQVNTRVJU X1VOVVNFRChjYXN0UmVzLCBjYXN0UmVzKTtcbiIpCisgICAgICAgICAgICB3cml0ZXIubmV3bGlu ZSgiICAgIEFTU0VSVCh2YWx1ZS0+dHlwZSgpID09IEluc3BlY3RvclZhbHVlOjpUeXBlJXMpO1xu IiAlIHBhcmFtcy5hc19tZXRob2RfbmFtZSkKICAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJ9 XG5cblxuIikKIAogICAgICAgICBAY2xhc3NtZXRob2QKQEAgLTI3NCw3ICsyNzMsNiBAQCBjbGFz cyBSYXdUeXBlcyhvYmplY3QpOgogICAgICAgICBkZWYgZ2V0X3ZhbGlkYXRlX21ldGhvZF9wYXJh bXMoKToKICAgICAgICAgICAgIGNsYXNzIFZhbGlkYXRlTWV0aG9kUGFyYW1zOgogICAgICAgICAg ICAgICAgIG5hbWUgPSAiU3RyaW5nIgotICAgICAgICAgICAgICAgIHZhcl90eXBlID0gIlN0cmlu ZyIKICAgICAgICAgICAgICAgICBhc19tZXRob2RfbmFtZSA9ICJTdHJpbmciCiAgICAgICAgICAg ICByZXR1cm4gVmFsaWRhdGVNZXRob2RQYXJhbXMKIApAQCAtMzExLDEzICszMDksMTkgQEAgY2xh c3MgUmF3VHlwZXMob2JqZWN0KToKICAgICAgICAgZGVmIGdldF9qc19iaW5kX3R5cGUoKToKICAg ICAgICAgICAgIHJldHVybiAibnVtYmVyIgogCi0gICAgICAgIEBzdGF0aWNtZXRob2QKLSAgICAg ICAgZGVmIGdldF92YWxpZGF0ZV9tZXRob2RfcGFyYW1zKCk6Ci0gICAgICAgICAgICBjbGFzcyBW YWxpZGF0ZU1ldGhvZFBhcmFtczoKLSAgICAgICAgICAgICAgICBuYW1lID0gIkludCIKLSAgICAg ICAgICAgICAgICB2YXJfdHlwZSA9ICJpbnQiCi0gICAgICAgICAgICAgICAgYXNfbWV0aG9kX25h bWUgPSAiTnVtYmVyIgotICAgICAgICAgICAgcmV0dXJuIFZhbGlkYXRlTWV0aG9kUGFyYW1zCisg ICAgICAgIEBjbGFzc21ldGhvZAorICAgICAgICBkZWYgZ2VuZXJhdGVfdmFsaWRhdGVfbWV0aG9k KGNscywgd3JpdGVyKToKKyAgICAgICAgICAgIHdyaXRlci5uZXdsaW5lKCJzdGF0aWMgdm9pZCBh c3NlcnRJbnQoSW5zcGVjdG9yVmFsdWUqIHZhbHVlKVxuIikKKyAgICAgICAgICAgIHdyaXRlci5u ZXdsaW5lKCJ7XG4iKQorICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUoIiAgICBkb3VibGUgdjtc biIpCisgICAgICAgICAgICB3cml0ZXIubmV3bGluZSgiICAgIGJvb2wgY2FzdFJlcyA9IHZhbHVl LT5hc051bWJlcigmdik7XG4iKQorICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUoIiAgICBBU1NF UlRfVU5VU0VEKGNhc3RSZXMsIGNhc3RSZXMpO1xuIikKKyAgICAgICAgICAgIHdyaXRlci5uZXds aW5lKCIgICAgQVNTRVJUKHN0YXRpY19jYXN0PGRvdWJsZT4oc3RhdGljX2Nhc3Q8aW50Pih2KSkg PT0gdik7XG4iKQorICAgICAgICAgICAgd3JpdGVyLm5ld2xpbmUoIn1cblxuXG4iKQorCisgICAg ICAgIEBjbGFzc21ldGhvZAorICAgICAgICBkZWYgZ2V0X3Jhd192YWxpZGF0b3JfY2FsbF90ZXh0 KGNscyk6CisgICAgICAgICAgICByZXR1cm4gImFzc2VydEludCIKIAogICAgICAgICBAc3RhdGlj bWV0aG9kCiAgICAgICAgIGRlZiBnZXRfb3V0cHV0X3Bhc3NfbW9kZWwoKToKQEAgLTM1Niw3ICsz NjAsNiBAQCBjbGFzcyBSYXdUeXBlcyhvYmplY3QpOgogICAgICAgICBkZWYgZ2V0X3ZhbGlkYXRl X21ldGhvZF9wYXJhbXMoKToKICAgICAgICAgICAgIGNsYXNzIFZhbGlkYXRlTWV0aG9kUGFyYW1z OgogICAgICAgICAgICAgICAgIG5hbWUgPSAiRG91YmxlIgotICAgICAgICAgICAgICAgIHZhcl90 eXBlID0gImRvdWJsZSIKICAgICAgICAgICAgICAgICBhc19tZXRob2RfbmFtZSA9ICJOdW1iZXIi CiAgICAgICAgICAgICByZXR1cm4gVmFsaWRhdGVNZXRob2RQYXJhbXMKIApAQCAtMzk1LDcgKzM5 OCw2IEBAIGNsYXNzIFJhd1R5cGVzKG9iamVjdCk6CiAgICAgICAgIGRlZiBnZXRfdmFsaWRhdGVf bWV0aG9kX3BhcmFtcygpOgogICAgICAgICAgICAgY2xhc3MgVmFsaWRhdGVNZXRob2RQYXJhbXM6 CiAgICAgICAgICAgICAgICAgbmFtZSA9ICJCb29sZWFuIgotICAgICAgICAgICAgICAgIHZhcl90 eXBlID0gImJvb2wiCiAgICAgICAgICAgICAgICAgYXNfbWV0aG9kX25hbWUgPSAiQm9vbGVhbiIK ICAgICAgICAgICAgIHJldHVybiBWYWxpZGF0ZU1ldGhvZFBhcmFtcwogCkBAIC00MzYsNyArNDM4 LDEwIEBAIGNsYXNzIFJhd1R5cGVzKG9iamVjdCk6CiAKICAgICAgICAgQHN0YXRpY21ldGhvZAog ICAgICAgICBkZWYgZ2V0X3ZhbGlkYXRlX21ldGhvZF9wYXJhbXMoKToKLSAgICAgICAgICAgIHJh aXNlIEV4Y2VwdGlvbigiVE9ETyIpCisgICAgICAgICAgICBjbGFzcyBWYWxpZGF0ZU1ldGhvZFBh cmFtczoKKyAgICAgICAgICAgICAgICBuYW1lID0gIk9iamVjdCIKKyAgICAgICAgICAgICAgICBh c19tZXRob2RfbmFtZSA9ICJPYmplY3QiCisgICAgICAgICAgICByZXR1cm4gVmFsaWRhdGVNZXRo b2RQYXJhbXMKIAogICAgICAgICBAc3RhdGljbWV0aG9kCiAgICAgICAgIGRlZiBnZXRfb3V0cHV0 X3Bhc3NfbW9kZWwoKToKQEAgLTExMjAsNiArMTEyNSw4IEBAIGNsYXNzIFR5cGVCaW5kaW5nczoK IAogICAgICAgICAgICAgICAgICAgICBAY2xhc3NtZXRob2QKICAgICAgICAgICAgICAgICAgICAg ZGVmIHJlcXVlc3RfaW50ZXJuYWxfcnVudGltZV9jYXN0KGNscyk6CisgICAgICAgICAgICAgICAg ICAgICAgICBpZiBjbHMubmVlZF9pbnRlcm5hbF9ydW50aW1lX2Nhc3RfOgorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAgICAgICAgICAgICAgICAgY2xzLm5lZWRf aW50ZXJuYWxfcnVudGltZV9jYXN0XyA9IFRydWUKICAgICAgICAgICAgICAgICAgICAgICAgIGZv ciBwIGluIGNscy5yZXNvbHZlX2RhdGFfLm1haW5fcHJvcGVydGllczoKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwLnBhcmFtX3R5cGVfYmluZGluZy5yZXF1ZXN0X2ludGVybmFsX3J1bnRp bWVfY2FzdCgpCkBAIC0xMzg2LDcgKzEzOTMsNyBAQCBjbGFzcyBUeXBlQmluZGluZ3M6CiAKICAg ICAgICAgICAgICAgICAgICAgQHN0YXRpY21ldGhvZAogICAgICAgICAgICAgICAgICAgICBkZWYg cmVxdWVzdF9pbnRlcm5hbF9ydW50aW1lX2Nhc3QoKToKLSAgICAgICAgICAgICAgICAgICAgICAg IHBhc3MKKyAgICAgICAgICAgICAgICAgICAgICAgIFJhd1R5cGVzLk9iamVjdC5yZXF1ZXN0X3Jh d19pbnRlcm5hbF9ydW50aW1lX2Nhc3QoKQogCiAgICAgICAgICAgICAgICAgICAgIEBzdGF0aWNt ZXRob2QKICAgICAgICAgICAgICAgICAgICAgZGVmIGdldF9jb2RlX2dlbmVyYXRvcigpOgpAQCAt MTM5NCw3ICsxNDAxLDcgQEAgY2xhc3MgVHlwZUJpbmRpbmdzOgogCiAgICAgICAgICAgICAgICAg ICAgIEBzdGF0aWNtZXRob2QKICAgICAgICAgICAgICAgICAgICAgZGVmIGdldF92YWxpZGF0b3Jf Y2FsbF90ZXh0KCk6Ci0gICAgICAgICAgICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oIlVu c3VwcG9ydGVkIikKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiAiYXNzZXJ0T2JqZWN0 IgogCiAgICAgICAgICAgICAgICAgICAgIEBjbGFzc21ldGhvZAogICAgICAgICAgICAgICAgICAg ICBkZWYgZ2V0X2FycmF5X2l0ZW1fY190eXBlX3RleHQoY2xzKToKQEAgLTE0NTYsNiArMTQ2Myw4 IEBAIGNsYXNzIFR5cGVCaW5kaW5nczoKIAogICAgICAgICAgICAgICAgICAgICBAY2xhc3NtZXRo b2QKICAgICAgICAgICAgICAgICAgICAgZGVmIHJlcXVlc3RfaW50ZXJuYWxfcnVudGltZV9jYXN0 KGNscyk6CisgICAgICAgICAgICAgICAgICAgICAgICBpZiBjbHMubmVlZF9pbnRlcm5hbF9ydW50 aW1lX2Nhc3RfOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybgogICAgICAgICAg ICAgICAgICAgICAgICAgY2xzLm5lZWRfaW50ZXJuYWxfcnVudGltZV9jYXN0XyA9IFRydWUKICAg ICAgICAgICAgICAgICAgICAgICAgIGNscy5yZXNvbHZlX2RhdGFfLml0ZW1fdHlwZV9iaW5kaW5n LnJlcXVlc3RfaW50ZXJuYWxfcnVudGltZV9jYXN0KCkKIAo=