57518 2011-03-30 18:38:43 -0700 Clean up the sandbox parameter code 2011-03-30 18:45:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 376841 0 andersca 2011-03-30 18:38:43 -0700 Clean up the sandbox parameter code 376843 1 87653 andersca 2011-03-30 18:41:11 -0700 Created attachment 87653 Patch 376845 2 87653 sam 2011-03-30 18:43:06 -0700 Comment on attachment 87653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87653&action=review > Source/WebKit2/WebProcess/mac/WebProcessMac.mm:153 > +static void appendReadonlySandboxDirectory(Vector<const char*>& vector, const char* name, const String& path) > +{ > + appendSandboxParameterPathInternal(vector, name, [(NSString *)path fileSystemRepresentation]); > +} > + > +static void appendReadwriteSandboxDirectory(Vector<const char*>& vector, const char* name, const String& path) > +{ > + appendSandboxParameterPathInternal(vector, name, [(NSString *)path fileSystemRepresentation]); > +} These should take NSStrings. 376848 3 andersca 2011-03-30 18:45:28 -0700 Committed r82530: <http://trac.webkit.org/changeset/82530> 87653 2011-03-30 18:41:11 -0700 2011-03-30 18:43:06 -0700 Patch bug-57518-20110330184110.patch text/plain 9106 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyNTI5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMzAgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCB0aGUgc2FuZGJveCBwYXJhbWV0ZXIgY29k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc1MTgK KworICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAg ICAgIE1ha2UgbnNVUkxDYWNoZVBhdGggYW5kIHVpUHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aCBT dHJpbmdzIHRvIG1hdGNoIHRoZSBvdGhlciBwYXRocyB3ZSBzZW5kIG92ZXIuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICBuc1VSTENhY2hl UGF0aCBhbmQgdWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoIGFyZSBub3cgU3RyaW5ncy4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW06CisgICAgICAgIChXZWJL aXQ6OmFwcGVuZFNhbmRib3hQYXJhbWV0ZXJQYXRoSW50ZXJuYWwpOgorICAgICAgICAoV2ViS2l0 OjphcHBlbmRSZWFkd3JpdGVDb25mRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6YXBwZW5k UmVhZG9ubHlTYW5kYm94RGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6YXBwZW5kUmVhZHdy aXRlU2FuZGJveERpcmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6OmluaXRpYWxpemVTYW5kYm94 KToKKyAgICAgICAgTWFrZSBpdCBtb3JlIGNsZWFyIHdoZXRoZXIgdGhlIGRpcmVjdG9yaWVzIHdl J3JlIGFkZGluZyBhcmUgcmVhZG9ubHkgb3IgcmVhZHdyaXRlLiBObyBmdW5jdGlvbmFsaXR5IGNo YW5nZS4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnBsYXRmb3JtSW5p dGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICBuc1VSTENhY2hlUGF0aCBpcyBub3cgYSBzdHJp bmcuCisKIDIwMTEtMDMtMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIv U2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lv biA4MjUyNikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTg4LDEzICs4OCwxNCBAQCBzdHJ1Y3QgV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgcGlkX3QgcHJlc2VudGVyQXBwbGljYXRpb25Q aWQ7CiAKICAgICAvLyBGSVhNRTogVGhlc2Ugc2hvdWxkIGJlIG1lcmdlZCB3aXRoIENGVVJMQ2Fj aGUgY291bnRlcnBhcnRzIGJlbG93LgotICAgIENTdHJpbmcgbnNVUkxDYWNoZVBhdGg7CisgICAg U3RyaW5nIG5zVVJMQ2FjaGVQYXRoOwogICAgIHVpbnQ2NF90IG5zVVJMQ2FjaGVNZW1vcnlDYXBh Y2l0eTsKICAgICB1aW50NjRfdCBuc1VSTENhY2hlRGlza0NhcGFjaXR5OwogCiAgICAgQ29yZUlQ Qzo6TWFjaFBvcnQgYWNjZWxlcmF0ZWRDb21wb3NpdGluZ1BvcnQ7CiAKLSAgICBDU3RyaW5nIHVp UHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aDsKKyAgICBTdHJpbmcgdWlQcm9jZXNzQnVuZGxlUmVz b3VyY2VQYXRoOworCiAjZWxpZiBQTEFURk9STShXSU4pCiAgICAgU3RyaW5nIGNmVVJMQ2FjaGVQ YXRoOwogICAgIHVpbnQ2NF90IGNmVVJMQ2FjaGVEaXNrQ2FwYWNpdHk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCShyZXZpc2lvbiA4MjUy NikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtODQsMTIgKzg0LDExIEBAIHZvaWQgV2ViQ29udGV4dDo6cGxhdGZvcm1J bml0aWFsaXplV2ViUHIKICAgICBOU1VSTENhY2hlICp1cmxDYWNoZSA9IFtOU1VSTENhY2hlIHNo YXJlZFVSTENhY2hlXTsKIAogICAgIHBhcmFtZXRlcnMucGFyZW50UHJvY2Vzc05hbWUgPSBbW05T UHJvY2Vzc0luZm8gcHJvY2Vzc0luZm9dIHByb2Nlc3NOYW1lXTsgICAgCi0gICAgcGFyYW1ldGVy cy5uc1VSTENhY2hlUGF0aCA9IGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihbKE5TU3RyaW5nICop Y2FjaGVQYXRoLmdldCgpIHN0cmluZ0J5U3RhbmRhcmRpemluZ1BhdGhdKTsKKyAgICBwYXJhbWV0 ZXJzLm5zVVJMQ2FjaGVQYXRoID0gWyhOU1N0cmluZyAqKWNhY2hlUGF0aC5nZXQoKSBzdHJpbmdC eVN0YW5kYXJkaXppbmdQYXRoXTsKICAgICBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVNZW1vcnlDYXBh Y2l0eSA9IFt1cmxDYWNoZSBtZW1vcnlDYXBhY2l0eV07CiAgICAgcGFyYW1ldGVycy5uc1VSTENh Y2hlRGlza0NhcGFjaXR5ID0gW3VybENhY2hlIGRpc2tDYXBhY2l0eV07CiAKLSAgICBBU1NFUlQo c3RybGVuKHBhcmFtZXRlcnMubnNVUkxDYWNoZVBhdGguZGF0YSgpKSk7Ci0gICAgQVNTRVJUKHBh cmFtZXRlcnMubnNVUkxDYWNoZVBhdGguZGF0YSgpW3N0cmxlbihwYXJhbWV0ZXJzLm5zVVJMQ2Fj aGVQYXRoLmRhdGEoKSkgLSAxXSAhPSAnLycpOyAvLyBOZWNlc3NhcnkgZm9yIE5TVVJMQ2FjaGUg dG8gZmluZCB0aGUgY2FjaGUgZmlsZS4KKyAgICBBU1NFUlQoIXBhcmFtZXRlcnMubnNVUkxDYWNo ZVBhdGguaXNFbXB0eSgpKTsKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykgJiYg SEFWRShIT1NURURfQ09SRV9BTklNQVRJT04pCiAgICAgbWFjaF9wb3J0X3QgcmVuZGVyU2VydmVy UG9ydCA9IFdLSW5pdGlhbGl6ZVJlbmRlclNlcnZlcigpOwpAQCAtOTgsNyArOTcsNyBAQCB2b2lk IFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAjZW5kaWYKIAogICAgIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCByZWFsbHkgYmUgY29uZmlndXJhYmxlOyB3ZSBzaG91bGRuJ3QganVz dCBibGluZGx5IGFsbG93IHJlYWQgYWNjZXNzIHRvIHRoZSBVSSBwcm9jZXNzIGJ1bmRsZS4KLSAg ICBwYXJhbWV0ZXJzLnVpUHJvY2Vzc0J1bmRsZVJlc291cmNlUGF0aCA9IGZpbGVTeXN0ZW1SZXBy ZXNlbnRhdGlvbihbW05TQnVuZGxlIG1haW5CdW5kbGVdIHJlc291cmNlUGF0aF0pOworICAgIHBh cmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoID0gW1tOU0J1bmRsZSBtYWluQnVu ZGxlXSByZXNvdXJjZVBhdGhdOwogCiAjaWYgVVNFKENGVVJMU1RPUkFHRVNFU1NJT05TKQogICAg IHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllciA9IFN0cmluZyhbW05TQnVuZGxl IG1haW5CdW5kbGVdIGJ1bmRsZUlkZW50aWZpZXJdKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbQkocmV2aXNpb24gODI1MjYpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0zMCw2ICszMCw3IEBACiAjaW1wb3J0ICJTYW5kYm94RXh0ZW5zaW9uLmgiCiAjaW1w b3J0ICJXZWJQYWdlLmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgi CisjaW1wb3J0IDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbXBvcnQgPFdlYkNvcmUvTWVtb3J5 Q2FjaGUuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGFnZUNhY2hlLmg+CiAjaW1wb3J0IDxXZWJLaXRT eXN0ZW1JbnRlcmZhY2UuaD4KQEAgLTEyMiw3ICsxMjMsNyBAQCBib29sIFdlYlByb2Nlc3M6OmZ1 bGxLZXlib2FyZEFjY2Vzc0VuYWJsCiB9CiAKICNpZiBFTkFCTEUoV0VCX1BST0NFU1NfU0FOREJP WCkKLXN0YXRpYyB2b2lkIGFwcGVuZFNhbmRib3hQYXJhbWV0ZXJQYXRoKFZlY3Rvcjxjb25zdCBj aGFyKj4mIHZlY3RvciwgY29uc3QgY2hhciogbmFtZSwgY29uc3QgY2hhciogcGF0aCkKK3N0YXRp YyB2b2lkIGFwcGVuZFNhbmRib3hQYXJhbWV0ZXJQYXRoSW50ZXJuYWwoVmVjdG9yPGNvbnN0IGNo YXIqPiYgdmVjdG9yLCBjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBjaGFyKiBwYXRoKQogewogICAg IGNoYXIgbm9ybWFsaXplZFBhdGhbUEFUSF9NQVhdOwogICAgIGlmICghcmVhbHBhdGgocGF0aCwg bm9ybWFsaXplZFBhdGgpKQpAQCAtMTMyLDE0ICsxMzMsMjUgQEAgc3RhdGljIHZvaWQgYXBwZW5k U2FuZGJveFBhcmFtZXRlclBhdGgoVgogICAgIHZlY3Rvci5hcHBlbmQoZmFzdFN0ckR1cChub3Jt YWxpemVkUGF0aCkpOwogfQogCi1zdGF0aWMgdm9pZCBhcHBlbmRTYW5kYm94UGFyYW1ldGVyQ29u ZlBhdGgoVmVjdG9yPGNvbnN0IGNoYXIqPiYgdmVjdG9yLCBjb25zdCBjaGFyKiBuYW1lLCBpbnQg Y29uZklEKQorc3RhdGljIHZvaWQgYXBwZW5kUmVhZHdyaXRlQ29uZkRpcmVjdG9yeShWZWN0b3I8 Y29uc3QgY2hhcio+JiB2ZWN0b3IsIGNvbnN0IGNoYXIqIG5hbWUsIGludCBjb25mSUQpCiB7CiAg ICAgY2hhciBwYXRoW1BBVEhfTUFYXTsKICAgICBpZiAoY29uZnN0cihjb25mSUQsIHBhdGgsIFBB VEhfTUFYKSA8PSAwKQogICAgICAgICBwYXRoWzBdID0gJ1wwJzsKIAotICAgIGFwcGVuZFNhbmRi b3hQYXJhbWV0ZXJQYXRoKHZlY3RvciwgbmFtZSwgcGF0aCk7CisgICAgYXBwZW5kU2FuZGJveFBh cmFtZXRlclBhdGhJbnRlcm5hbCh2ZWN0b3IsIG5hbWUsIHBhdGgpOwogfQorCitzdGF0aWMgdm9p ZCBhcHBlbmRSZWFkb25seVNhbmRib3hEaXJlY3RvcnkoVmVjdG9yPGNvbnN0IGNoYXIqPiYgdmVj dG9yLCBjb25zdCBjaGFyKiBuYW1lLCBjb25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgYXBwZW5k U2FuZGJveFBhcmFtZXRlclBhdGhJbnRlcm5hbCh2ZWN0b3IsIG5hbWUsIFsoTlNTdHJpbmcgKilw YXRoIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl0pOworfQorCitzdGF0aWMgdm9pZCBhcHBlbmRS ZWFkd3JpdGVTYW5kYm94RGlyZWN0b3J5KFZlY3Rvcjxjb25zdCBjaGFyKj4mIHZlY3RvciwgY29u c3QgY2hhciogbmFtZSwgY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIGFwcGVuZFNhbmRib3hQ YXJhbWV0ZXJQYXRoSW50ZXJuYWwodmVjdG9yLCBuYW1lLCBbKE5TU3RyaW5nICopcGF0aCBmaWxl U3lzdGVtUmVwcmVzZW50YXRpb25dKTsKK30KKwogI2VuZGlmCiAKIHN0YXRpYyB2b2lkIGluaXRp YWxpemVTYW5kYm94KGNvbnN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRl cnMpCkBAIC0xNTIsMTQgKzE2NCwyMCBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2FuZGJveChj b25zdCBXZWJQCiAKICAgICBWZWN0b3I8Y29uc3QgY2hhcio+IHNhbmRib3hQYXJhbWV0ZXJzOwog Ci0gICAgYXBwZW5kU2FuZGJveFBhcmFtZXRlclBhdGgoc2FuZGJveFBhcmFtZXRlcnMsICJIT01F X0RJUiIsIFtOU0hvbWVEaXJlY3RvcnkoKSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dKTsKLSAg ICBhcHBlbmRTYW5kYm94UGFyYW1ldGVyUGF0aChzYW5kYm94UGFyYW1ldGVycywgIldFQktJVDJf RlJBTUVXT1JLX0RJUiIsIFtbW1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpOU0NsYXNzRnJvbVN0 cmluZyhAIldLVmlldyIpXSBidW5kbGVQYXRoXSBzdHJpbmdCeURlbGV0aW5nTGFzdFBhdGhDb21w b25lbnRdIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl0pOwotICAgIGFwcGVuZFNhbmRib3hQYXJh bWV0ZXJDb25mUGF0aChzYW5kYm94UGFyYW1ldGVycywgIkRBUldJTl9VU0VSX1RFTVBfRElSIiwg X0NTX0RBUldJTl9VU0VSX1RFTVBfRElSKTsKLSAgICBhcHBlbmRTYW5kYm94UGFyYW1ldGVyQ29u ZlBhdGgoc2FuZGJveFBhcmFtZXRlcnMsICJEQVJXSU5fVVNFUl9DQUNIRV9ESVIiLCBfQ1NfREFS V0lOX1VTRVJfQ0FDSEVfRElSKTsKLSAgICBhcHBlbmRTYW5kYm94UGFyYW1ldGVyUGF0aChzYW5k Ym94UGFyYW1ldGVycywgIldFQktJVF9EQVRBQkFTRV9ESVIiLCBbKE5TU3RyaW5nICopcGFyYW1l dGVycy5kYXRhYmFzZURpcmVjdG9yeSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb25dKTsKLSAgICBh cHBlbmRTYW5kYm94UGFyYW1ldGVyUGF0aChzYW5kYm94UGFyYW1ldGVycywgIldFQktJVF9MT0NB TFNUT1JBR0VfRElSIiwgWyhOU1N0cmluZyAqKXBhcmFtZXRlcnMubG9jYWxTdG9yYWdlRGlyZWN0 b3J5IGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl0pOwotICAgIGFwcGVuZFNhbmRib3hQYXJhbWV0 ZXJQYXRoKHNhbmRib3hQYXJhbWV0ZXJzLCAiTlNVUkxfQ0FDSEVfRElSIiwgcGFyYW1ldGVycy5u c1VSTENhY2hlUGF0aC5kYXRhKCkpOwotICAgIGFwcGVuZFNhbmRib3hQYXJhbWV0ZXJQYXRoKHNh bmRib3hQYXJhbWV0ZXJzLCAiVUlfUFJPQ0VTU19CVU5ETEVfUkVTT1VSQ0VfRElSIiwgcGFyYW1l dGVycy51aVByb2Nlc3NCdW5kbGVSZXNvdXJjZVBhdGguZGF0YSgpKTsKKyAgICAvLyBUaGVzZSBh cmUgcmVhZC1vbmx5LgorICAgIGFwcGVuZFJlYWRvbmx5U2FuZGJveERpcmVjdG9yeShzYW5kYm94 UGFyYW1ldGVycywgIldFQktJVDJfRlJBTUVXT1JLX0RJUiIsIFtbW05TQnVuZGxlIGJ1bmRsZUZv ckNsYXNzOk5TQ2xhc3NGcm9tU3RyaW5nKEAiV0tWaWV3IildIGJ1bmRsZVBhdGhdIHN0cmluZ0J5 RGVsZXRpbmdMYXN0UGF0aENvbXBvbmVudF0pOworICAgIGFwcGVuZFJlYWRvbmx5U2FuZGJveERp cmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIlVJX1BST0NFU1NfQlVORExFX1JFU09VUkNFX0RJ UiIsIHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoKTsKKworICAgIC8vIFRo ZXNlIGFyZSByZWFkLXdyaXRlIGdldGNvbmYgcGF0aHMuCisgICAgYXBwZW5kUmVhZHdyaXRlQ29u ZkRpcmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIkRBUldJTl9VU0VSX1RFTVBfRElSIiwgX0NT X0RBUldJTl9VU0VSX1RFTVBfRElSKTsKKyAgICBhcHBlbmRSZWFkd3JpdGVDb25mRGlyZWN0b3J5 KHNhbmRib3hQYXJhbWV0ZXJzLCAiREFSV0lOX1VTRVJfQ0FDSEVfRElSIiwgX0NTX0RBUldJTl9V U0VSX0NBQ0hFX0RJUik7CisKKyAgICAvLyBUaGVzZSBhcmUgcmVhZC13cml0ZSBwYXRocy4KKyAg ICBhcHBlbmRSZWFkd3JpdGVTYW5kYm94RGlyZWN0b3J5KHNhbmRib3hQYXJhbWV0ZXJzLCAiSE9N RV9ESVIiLCBOU0hvbWVEaXJlY3RvcnkoKSk7CisgICAgYXBwZW5kUmVhZHdyaXRlU2FuZGJveERp cmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIldFQktJVF9EQVRBQkFTRV9ESVIiLCBwYXJhbWV0 ZXJzLmRhdGFiYXNlRGlyZWN0b3J5KTsKKyAgICBhcHBlbmRSZWFkd3JpdGVTYW5kYm94RGlyZWN0 b3J5KHNhbmRib3hQYXJhbWV0ZXJzLCAiV0VCS0lUX0xPQ0FMU1RPUkFHRV9ESVIiLCBwYXJhbWV0 ZXJzLmxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CisgICAgYXBwZW5kUmVhZHdyaXRlU2FuZGJveERp cmVjdG9yeShzYW5kYm94UGFyYW1ldGVycywgIk5TVVJMX0NBQ0hFX0RJUiIsIHBhcmFtZXRlcnMu bnNVUkxDYWNoZVBhdGgpOworCiAgICAgc2FuZGJveFBhcmFtZXRlcnMuYXBwZW5kKHN0YXRpY19j YXN0PGNvbnN0IGNoYXIqPigwKSk7CiAKICAgICBjb25zdCBjaGFyKiBwcm9maWxlUGF0aCA9IFtb W05TQnVuZGxlIG1haW5CdW5kbGVdIHBhdGhGb3JSZXNvdXJjZTpAImNvbS5hcHBsZS5XZWJQcm9j ZXNzIiBvZlR5cGU6QCJzYiJdIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbl07CkBAIC0yMDEsOCAr MjE5LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgICAg ICBOU1VJbnRlZ2VyIGNhY2hlTWVtb3J5Q2FwYWNpdHkgPSBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVN ZW1vcnlDYXBhY2l0eTsKICAgICAgICAgTlNVSW50ZWdlciBjYWNoZURpc2tDYXBhY2l0eSA9IHBh cmFtZXRlcnMubnNVUkxDYWNoZURpc2tDYXBhY2l0eTsKIAotICAgICAgICBOU1N0cmluZyAqbnND YWNoZVBhdGggPSBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHN0cmluZ1dpdGhGaWxl U3lzdGVtUmVwcmVzZW50YXRpb246cGFyYW1ldGVycy5uc1VSTENhY2hlUGF0aC5kYXRhKCkgbGVu Z3RoOnN0cmxlbihwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVQYXRoLmRhdGEoKSldOwotICAgICAgICBS ZXRhaW5QdHI8TlNVUkxDYWNoZT4gcGFyZW50UHJvY2Vzc1VSTENhY2hlKEFkb3B0TlMsIFtbTlNV UkxDYWNoZSBhbGxvY10gaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTpjYWNoZU1lbW9yeUNhcGFjaXR5 IGRpc2tDYXBhY2l0eTpjYWNoZURpc2tDYXBhY2l0eSBkaXNrUGF0aDpuc0NhY2hlUGF0aF0pOwor ICAgICAgICBSZXRhaW5QdHI8TlNVUkxDYWNoZT4gcGFyZW50UHJvY2Vzc1VSTENhY2hlKEFkb3B0 TlMsIFtbTlNVUkxDYWNoZSBhbGxvY10gaW5pdFdpdGhNZW1vcnlDYXBhY2l0eTpjYWNoZU1lbW9y eUNhcGFjaXR5IGRpc2tDYXBhY2l0eTpjYWNoZURpc2tDYXBhY2l0eSBkaXNrUGF0aDpwYXJhbWV0 ZXJzLm5zVVJMQ2FjaGVQYXRoXSk7CiAgICAgICAgIFtOU1VSTENhY2hlIHNldFNoYXJlZFVSTENh Y2hlOnBhcmVudFByb2Nlc3NVUkxDYWNoZS5nZXQoKV07CiAgICAgfQogCg==