229853 2021-09-03 01:10:27 -0700 [JSC] Fix WebKitAdditions directory traversal in offlineasm part 2 2021-09-03 11:15:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1790079 0 ysuzuki 2021-09-03 01:10:27 -0700 [JSC] Fix WebKitAdditions directory traversal in offlineasm part 2 1790080 1 437251 ysuzuki 2021-09-03 01:17:43 -0700 Created attachment 437251 Patch 1790111 2 437251 mark.lam 2021-09-03 04:04:47 -0700 Comment on attachment 437251 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437251&action=review r=me > Source/JavaScriptCore/offlineasm/asm.rb:343 > + opts.on("--webkit-additions-path=PATH", "Flag to use deployment location.") do |path| Can you change “Flag to use deployment location” to “WebKitAdditions path”? > Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:52 > + opts.on("--webkit-additions-path=PATH", "Flag to use deployment location.") do |path| Ditto. > Source/JavaScriptCore/offlineasm/generate_settings_extractor.rb:49 > + opts.on("--webkit-additions-path=PATH", "Flag to use deployment location.") do |path| Ditto. 1790243 3 ryanhaddad 2021-09-03 10:47:25 -0700 rdar://82728326 1790249 4 ysuzuki 2021-09-03 11:15:46 -0700 Committed r282009 (241316@main): <https://commits.webkit.org/241316@main> 437251 2021-09-03 01:17:43 -0700 2021-09-03 04:04:47 -0700 Patch bug-229853-20210903011742.patch text/plain 12503 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl YzhiNmM1OTNjNTk0MTNiMzIzN2YyN2I3MTk5MTY1YTJlY2NkYWEyLi41ODYyNjNkMzgxOTdmNzIz M2ZlNjMzMWNiM2ExOTY1YWRiNzg1YjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAyMS0wOS0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEZpeCBXZWJLaXRBZGRpdGlvbnMgZGlyZWN0b3J5IHRyYXZlcnNh bCBpbiBvZmZsaW5lYXNtIHBhcnQgMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI5ODUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiBERVBMT1lNRU5UX0xPQ0FUSU9OIGlzIFlFUywgV0VCS0lUQURE SVRJT05TX0hFQURFUlNfRk9MREVSX1BBVEggaXMgL3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFk ZGl0aW9ucy4KKyAgICAgICAgQnV0IHNvbWVob3cgWGNvZGUgY2hhbmdlcyBpdCB0byAvdG1wL1Nh ZmFyaS9XZWJLaXRfT3BlblNvdXJjZS5yb290cy9TREtzLy4uLi91c3IvbG9jYWwvaW5jbHVkZS9X ZWJLaXRBZGRpdGlvbnMuCisgICAgICAgIFRodXMsIHdlIHNob3VsZCBwYXNzIHRoaXMgZGlyZWN0 b3J5IGluc3RlYWQgb2YgL3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucy4KKworICAg ICAgICBJbiB0aGlzIHBhdGNoLCB3ZSByZXBsYWNlIC0tdXNlLWRlcGxveW1lbnQtbG9jYXRpb24g d2l0aCAtLXdlYmtpdC1hZGRpdGlvbnMtcGF0aD1wYXRoIGFuZCBwYXNzaW5nIFdlYktpdEFkZGl0 aW9ucworICAgICAgICBwYXRoIGRpcmVjdGx5LiBXZSBkZWZpbmUgV0tfV0VCS0lUQURESVRJT05T X0lOU1RBTExfUEFUSCBhbmQgV0tfV0VCS0lUQURESVRJT05TX0hFQURFUlNfRk9MREVSX1BBVEgg aW4gSmF2YVNjcmlwdENvcmUvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZworICAgICAgICB0 byBwb3B1bGF0ZSB0aGlzIHZhcmlhYmxlIGFuZCBwYXNzIFdLX1dFQktJVEFERElUSU9OU19IRUFE RVJTX0ZPTERFUl9QQVRIIHRvIHRoZSBzY3JpcHRzLgorCisgICAgICAgIFdlIGFsc28gZml4IG9m ZmxpbmVhc20ncyBwYXRoIGNvbmNhdGVuYXRpb24uIEl0IHdhcyB1c2luZyArLCBidXQgdGhpcyBk b2VzIG5vdCB3b3JrIGlmIGRpcmVjdG9yeSBkb2Vzbid0IGVuZCB3aXRoICcvJy4KKyAgICAgICAg V2Ugc2hvdWxkIHVzZSBGaWxlLmpvaW4gd2hlbiBjb25jYXRlbmF0aW5nIGZpbGUgcGF0aHMuCisK KyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAgICAgICAqIEphdmFT Y3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogb2ZmbGluZWFz bS9hc20ucmI6CisgICAgICAgICogb2ZmbGluZWFzbS9nZW5lcmF0ZV9vZmZzZXRfZXh0cmFjdG9y LnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vZ2VuZXJhdGVfc2V0dGluZ3NfZXh0cmFjdG9yLnJi OgorICAgICAgICAqIG9mZmxpbmVhc20vcGFyc2VyLnJiOgorCiAyMDIxLTA5LTAyICBZdXN1a2Ug U3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gRml4IFdlYktpdEFk ZGl0aW9ucyBkaXJlY3RvcnkgdHJhdmVyc2FsIGluIG9mZmxpbmVhc20KZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL0NvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKaW5kZXggODhkM2Q0 ZTk5NDI1NzZlYjAyZjExODNhZmI3MTQ1NjViMjg0ODNhNy4uNDQ5MmQ3NGZjYjk5Yzg2NWFjZjZl OGE2NjY4OTQ5ZTFjMTJlYWU4NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0Nv bmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0Nv bmZpZ3VyYXRpb25zL0Jhc2UueGNjb25maWcKQEAgLTE4MCw2ICsxODAsOSBAQCBXS19DT0NPQV9U T1VDSF9hcHBsZXR2b3MgPSBjb2NvYXRvdWNoOwogV0tfQ09DT0FfVE9VQ0hfYXBwbGV0dnNpbXVs YXRvciA9IGNvY29hdG91Y2g7CiBXS19JU19DT0NPQV9UT1VDSCA9ICQoV0tfTk9UXyQoV0tfRU1Q VFlfJChXS19DT0NPQV9UT1VDSCkpKTsKIAorV0tfV0VCS0lUQURESVRJT05TX0lOU1RBTExfUEFU SCA9IC91c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRBZGRpdGlvbnMKK1dLX1dFQktJVEFERElUSU9O U19IRUFERVJTX0ZPTERFUl9QQVRIID0gJChTREtST09UKS8kKFdLX1dFQktJVEFERElUSU9OU19J TlNUQUxMX1BBVEgpCisKIC8vIERpc2FibGUgTFRPIGZvciBKYXZhU2NyaXB0Q29yZSwgZHVlIHRv IDxyZGFyOi8vcHJvYmxlbS8yNDU0MzU0Nz4uIEFkZCBiYWNrIHRoZSBmb2xsb3dpbmcgbGluZSBh bmQgZGVsZXRlIHRoZSBvbmUgdGhhdCBzYXlzICJMTFZNX0xUTyA9IE5PIiB3aGVuIHRoYXQgaXNz dWUgaXMgcmVzb2x2ZWQuCiAvLyBMTFZNX0xUTyA9ICQoV0tfTExWTV9MVE9fJChXS19YQ09ERV9T VVBQT1JUU19MVE8pKTsKIExMVk1fTFRPID0gTk87CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CmluZGV4IGU3ODc3ZGMxNzM3ODNhZTllNjE3MTYzYjE3Mzg5NTRjNjg3ZTUzYTIuLjcxMDBkNWUw OWZmNjhiY2YxODkyNDQxYjM2YjQ2OGM3ZGUxYzllYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCkBAIC0xMTIyOSw3ICsxMTIyOSw3IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxv eW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwotCQkJc2hl bGxTY3JpcHQgPSAic2V0IC1lXG5cbk9GRkxJTkVBU01fQVJHUz1cIlwiXG5pZiBbWyBcIiR7REVQ TE9ZTUVOVF9MT0NBVElPTn1cIiA9PSBcIllFU1wiIF1dOyB0aGVuXG4gICAgT0ZGTElORUFTTV9B UkdTPVwiJHtPRkZMSU5FQVNNX0FSR1N9IC0tdXNlLWRlcGxveW1lbnQtbG9jYXRpb25cIlxuZmlc blxubWtkaXIgLXAgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9 XCJcblxuL3Vzci9iaW4vZW52IHJ1YnkgXCIke1NSQ1JPT1R9L29mZmxpbmVhc20vZ2VuZXJhdGVf b2Zmc2V0X2V4dHJhY3Rvci5yYlwiIFwiLUkke0JVSUxUX1BST0RVQ1RTX0RJUn0vRGVyaXZlZFNv dXJjZXMvSmF2YVNjcmlwdENvcmVcIiBcIiR7U1JDUk9PVH0vbGxpbnQvTG93TGV2ZWxJbnRlcnBy ZXRlci5hc21cIiAgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vSlNDTExJbnRTZXR0aW5nc0V4dHJh Y3RvclwiIFwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfS9MTElu dERlc2lyZWRPZmZzZXRzLmhcIiBcIiR7QVJDSFN9IENfTE9PUFwiIFwiJHtCVUlMRF9WQVJJQU5U U31cIiAke09GRkxJTkVBU01fQVJHU31cbiI7CisJCQlzaGVsbFNjcmlwdCA9ICJzZXQgLWVcblxu T0ZGTElORUFTTV9BUkdTPVwiXCJcbmlmIFtbIFwiJHtERVBMT1lNRU5UX0xPQ0FUSU9OfVwiID09 IFwiWUVTXCIgXV07IHRoZW5cbiAgICBPRkZMSU5FQVNNX0FSR1M9XCIke09GRkxJTkVBU01fQVJH U30gLS13ZWJraXQtYWRkaXRpb25zLXBhdGg9JHtXS19XRUJLSVRBRERJVElPTlNfSEVBREVSU19G T0xERVJfUEFUSH1cIlxuZmlcblxubWtkaXIgLXAgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vTExJ bnRPZmZzZXRzLyR7QVJDSFN9XCJcblxuL3Vzci9iaW4vZW52IHJ1YnkgXCIke1NSQ1JPT1R9L29m ZmxpbmVhc20vZ2VuZXJhdGVfb2Zmc2V0X2V4dHJhY3Rvci5yYlwiIFwiLUkke0JVSUxUX1BST0RV Q1RTX0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmVcIiBcIiR7U1JDUk9PVH0vbGxp bnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc21cIiAgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vSlND TExJbnRTZXR0aW5nc0V4dHJhY3RvclwiIFwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0xMSW50T2Zm c2V0cy8ke0FSQ0hTfS9MTEludERlc2lyZWRPZmZzZXRzLmhcIiBcIiR7QVJDSFN9IENfTE9PUFwi IFwiJHtCVUlMRF9WQVJJQU5UU31cIiAke09GRkxJTkVBU01fQVJHU31cbiI7CiAJCX07CiAJCTE0 QkQ2ODkyMjE1MTkxNDUwMDUwREFGRiAvKiBHZW5lcmF0ZSBEZXJpdmVkIFNvdXJjZXMgKi8gPSB7 CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CkBAIC0xMTI0Myw3ICsxMTI0Myw3 IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJ CQlzaGVsbFBhdGggPSAvYmluL3NoOwotCQkJc2hlbGxTY3JpcHQgPSAic2V0IC1lXG5cbk9GRkxJ TkVBU01fQVJHUz1cIlwiXG5pZiBbWyBcIiR7REVQTE9ZTUVOVF9MT0NBVElPTn1cIiA9PSBcIllF U1wiIF1dOyB0aGVuXG4gICAgT0ZGTElORUFTTV9BUkdTPVwiJHtPRkZMSU5FQVNNX0FSR1N9IC0t dXNlLWRlcGxveW1lbnQtbG9jYXRpb25cIlxuZmlcblxubWtkaXIgLXAgXCIke0JVSUxUX1BST0RV Q1RTX0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9XCJcblxuL3Vzci9iaW4vZW52IHJ1YnkgXCIk e1NSQ1JPT1R9L29mZmxpbmVhc20vZ2VuZXJhdGVfc2V0dGluZ3NfZXh0cmFjdG9yLnJiXCIgXCIt SSR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZVwiIFwi JHtTUkNST09UfS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbVwiIFwiJHtCVUlMVF9QUk9E VUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfS9MTEludERlc2lyZWRTZXR0aW5ncy5oXCIg XCIke0FSQ0hTfSBDX0xPT1BcIiAke09GRkxJTkVBU01fQVJHU31cbiI7CisJCQlzaGVsbFNjcmlw dCA9ICJzZXQgLWVcblxuT0ZGTElORUFTTV9BUkdTPVwiXCJcbmlmIFtbIFwiJHtERVBMT1lNRU5U X0xPQ0FUSU9OfVwiID09IFwiWUVTXCIgXV07IHRoZW5cbiAgICBPRkZMSU5FQVNNX0FSR1M9XCIk e09GRkxJTkVBU01fQVJHU30gLS13ZWJraXQtYWRkaXRpb25zLXBhdGg9JHtXS19XRUJLSVRBRERJ VElPTlNfSEVBREVSU19GT0xERVJfUEFUSH1cIlxuZmlcblxubWtkaXIgLXAgXCIke0JVSUxUX1BS T0RVQ1RTX0RJUn0vTExJbnRPZmZzZXRzLyR7QVJDSFN9XCJcblxuL3Vzci9iaW4vZW52IHJ1Ynkg XCIke1NSQ1JPT1R9L29mZmxpbmVhc20vZ2VuZXJhdGVfc2V0dGluZ3NfZXh0cmFjdG9yLnJiXCIg XCItSSR7QlVJTFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZVwi IFwiJHtTUkNST09UfS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbVwiIFwiJHtCVUlMVF9Q Uk9EVUNUU19ESVJ9L0xMSW50T2Zmc2V0cy8ke0FSQ0hTfS9MTEludERlc2lyZWRTZXR0aW5ncy5o XCIgXCIke0FSQ0hTfSBDX0xPT1BcIiAke09GRkxJTkVBU01fQVJHU31cbiI7CiAJCX07CiAJCTFB MDJEOUE4MUIzNEE4ODIwMDBEMTUyMiAvKiBBZGQgU3ltbGluayBpbiAvU3lzdGVtL0xpYnJhcnkv UHJpdmF0ZUZyYW1ld29ya3MgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhh c2U7CkBAIC0xMTQ4OSw3ICsxMTQ4OSw3IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1l bnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwotCQkJc2hlbGxT Y3JpcHQgPSAiaWYgW1sgXCIke0FDVElPTn1cIiA9PSBcImluc3RhbGxoZHJzXCIgXV07IHRoZW5c biAgICBleGl0IDBcbmZpXG5cbk9GRkxJTkVBU01fQVJHUz1cIlwiXG5pZiBbWyBcIiR7REVQTE9Z TUVOVF9MT0NBVElPTn1cIiA9PSBcIllFU1wiIF1dOyB0aGVuXG4gICAgT0ZGTElORUFTTV9BUkdT PVwiJHtPRkZMSU5FQVNNX0FSR1N9IC0tdXNlLWRlcGxveW1lbnQtbG9jYXRpb25cIlxuZmlcblxu Y2QgXCIke0JVSUxUX1BST0RVQ1RTX0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmVc IlxuXG4vdXNyL2Jpbi9lbnYgcnVieSBKYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzbS5yYiBc Ii1JJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlXCIg SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20gXCIke0JVSUxUX1BS T0RVQ1RTX0RJUn0vSlNDTExJbnRPZmZzZXRzRXh0cmFjdG9yXCIgTExJbnRBc3NlbWJseS5oIFwi JHtCVUlMRF9WQVJJQU5UU31cIiAke09GRkxJTkVBU01fQVJHU30gfHwgZXhpdCAxXG4iOworCQkJ c2hlbGxTY3JpcHQgPSAiaWYgW1sgXCIke0FDVElPTn1cIiA9PSBcImluc3RhbGxoZHJzXCIgXV07 IHRoZW5cbiAgICBleGl0IDBcbmZpXG5cbk9GRkxJTkVBU01fQVJHUz1cIlwiXG5pZiBbWyBcIiR7 REVQTE9ZTUVOVF9MT0NBVElPTn1cIiA9PSBcIllFU1wiIF1dOyB0aGVuXG4gICAgT0ZGTElORUFT TV9BUkdTPVwiJHtPRkZMSU5FQVNNX0FSR1N9IC0td2Via2l0LWFkZGl0aW9ucy1wYXRoPSR7V0tf V0VCS0lUQURESVRJT05TX0hFQURFUlNfRk9MREVSX1BBVEh9XCJcbmZpXG5cbmNkIFwiJHtCVUlM VF9QUk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlXCJcblxuL3Vzci9i aW4vZW52IHJ1YnkgSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc20ucmIgXCItSSR7QlVJTFRf UFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZVwiIEphdmFTY3JpcHRD b3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtIFwiJHtCVUlMVF9QUk9EVUNUU19ESVJ9 L0pTQ0xMSW50T2Zmc2V0c0V4dHJhY3RvclwiIExMSW50QXNzZW1ibHkuaCBcIiR7QlVJTERfVkFS SUFOVFN9XCIgJHtPRkZMSU5FQVNNX0FSR1N9IHx8IGV4aXQgMVxuIjsKIAkJfTsKIAkJNjVGQjNG NjUwOUQxMUU5MTAwRjQ5REVCIC8qIEdlbmVyYXRlIERlcml2ZWQgU291cmNlcyAqLyA9IHsKIAkJ CWlzYSA9IFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzbS5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZs aW5lYXNtL2FzbS5yYgppbmRleCA5ZDAxODJhOWViZWY3YjRjMjFhZGM3MjUyNmIwMTAxMjNmZWJj Njk5Li5iMzNlZDE1ZjdiNTQ3MjU2ZGRiMjE2YjRjOTRlNGIyMjY3MDc0OWMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc20ucmIKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXNtLnJiCkBAIC0zMzUsMTMgKzMzNSwxMyBAQCBkZWYg ZGVidWdBbm5vdGF0aW9uKHRleHQpCiAKICRvcHRpb25zID0ge30KIE9wdGlvblBhcnNlci5uZXcg ZG8gfG9wdHN8Ci0gICAgb3B0cy5iYW5uZXIgPSAiVXNhZ2U6IGFzbS5yYiBhc21GaWxlIG9mZnNl dHNGaWxlIG91dHB1dEZpbGVOYW1lIFstLWFzc2VtYmxlcj08QVNNPl0gWy0tdXNlLWRlcGxveW1l bnQtbG9jYXRpb25dIgorICAgIG9wdHMuYmFubmVyID0gIlVzYWdlOiBhc20ucmIgYXNtRmlsZSBv ZmZzZXRzRmlsZSBvdXRwdXRGaWxlTmFtZSBbLS1hc3NlbWJsZXI9PEFTTT5dIFstLXdlYmtpdC1h ZGRpdGlvbnMtcGF0aD08cGF0aD5dIgogICAgICMgVGhpcyBvcHRpb24gaXMgY3VycmVudGx5IG9u bHkgdXNlZCB0byBzcGVjaWZ5IHRoZSBtYXNtIGFzc2VtYmxlcgogICAgIG9wdHMub24oIi0tYXNz ZW1ibGVyPVtBU01dIiwgIlNwZWNpZnkgYW4gYXNzZW1ibGVyIHRvIHVzZS4iKSBkbyB8YXNzZW1i bGVyfAogICAgICAgICAkb3B0aW9uc1s6YXNzZW1ibGVyXSA9IGFzc2VtYmxlcgogICAgIGVuZAot ICAgIG9wdHMub24oIi0tdXNlLWRlcGxveW1lbnQtbG9jYXRpb24iLCAiRmxhZyB0byB1c2UgZGVw bG95bWVudCBsb2NhdGlvbi4iKSBkbyB8ZmxhZ3wKLSAgICAgICAgJG9wdGlvbnNbOnVzZV9kZXBs b3ltZW50X2xvY2F0aW9uXSA9IGZsYWcKKyAgICBvcHRzLm9uKCItLXdlYmtpdC1hZGRpdGlvbnMt cGF0aD1QQVRIIiwgIkZsYWcgdG8gdXNlIGRlcGxveW1lbnQgbG9jYXRpb24uIikgZG8gfHBhdGh8 CisgICAgICAgICRvcHRpb25zWzp3ZWJraXRfYWRkaXRpb25zX3BhdGhdID0gcGF0aAogICAgIGVu ZAogZW5kLnBhcnNlIQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9nZW5lcmF0ZV9vZmZzZXRfZXh0cmFjdG9yLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L29mZmxpbmVhc20vZ2VuZXJhdGVfb2Zmc2V0X2V4dHJhY3Rvci5yYgppbmRleCA5MmUwNDQ1OTFk M2IzOGNmOWVjYzkwNTBkMmE5NDk1ZDY0Y2YyYjYzLi43ZTRhOWYxMDRiMzU4MjE2MWY2MjI4ZWYz ZDQ1NDM2NjViZTc2NDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9nZW5lcmF0ZV9vZmZzZXRfZXh0cmFjdG9yLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9vZmZsaW5lYXNtL2dlbmVyYXRlX29mZnNldF9leHRyYWN0b3IucmIKQEAgLTQ4LDkgKzQ4 LDkgQEAKIAogJG9wdGlvbnMgPSB7fQogT3B0aW9uUGFyc2VyLm5ldyBkbyB8b3B0c3wKLSAgICBv cHRzLmJhbm5lciA9ICJVc2FnZTogZ2VuZXJhdGVfb2Zmc2V0X2V4dHJhY3Rvci5yYiBhc21GaWxl IHNldHRpbmdGaWxlIG91dHB1dEZpbGVOYW1lIGJhY2tlbmRzIHZhcmlhbnRzIFstLXVzZS1kZXBs b3ltZW50LWxvY2F0aW9uXSIKLSAgICBvcHRzLm9uKCItLXVzZS1kZXBsb3ltZW50LWxvY2F0aW9u IiwgIkZsYWcgdG8gdXNlIGRlcGxveW1lbnQgbG9jYXRpb24uIikgZG8gfGZsYWd8Ci0gICAgICAg ICRvcHRpb25zWzp1c2VfZGVwbG95bWVudF9sb2NhdGlvbl0gPSBmbGFnCisgICAgb3B0cy5iYW5u ZXIgPSAiVXNhZ2U6IGdlbmVyYXRlX29mZnNldF9leHRyYWN0b3IucmIgYXNtRmlsZSBzZXR0aW5n RmlsZSBvdXRwdXRGaWxlTmFtZSBiYWNrZW5kcyB2YXJpYW50cyBbLS13ZWJraXQtYWRkaXRpb25z LXBhdGg9PHBhdGg+XSIKKyAgICBvcHRzLm9uKCItLXdlYmtpdC1hZGRpdGlvbnMtcGF0aD1QQVRI IiwgIkZsYWcgdG8gdXNlIGRlcGxveW1lbnQgbG9jYXRpb24uIikgZG8gfHBhdGh8CisgICAgICAg ICRvcHRpb25zWzp3ZWJraXRfYWRkaXRpb25zX3BhdGhdID0gcGF0aAogICAgIGVuZAogZW5kLnBh cnNlIQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9nZW5l cmF0ZV9zZXR0aW5nc19leHRyYWN0b3IucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9nZW5lcmF0ZV9zZXR0aW5nc19leHRyYWN0b3IucmIKaW5kZXggMjM0NWJjMDU5MDlmNDA0 NDM1YWIxMTBkYmU2MmY2MjJjNGEwNWJiMy4uNjQ3MjRjOTdiNzU1ZDllNTAzN2ZmM2QyODZiYzA3 MzVmNWFlYTgyNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v Z2VuZXJhdGVfc2V0dGluZ3NfZXh0cmFjdG9yLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9vZmZsaW5lYXNtL2dlbmVyYXRlX3NldHRpbmdzX2V4dHJhY3Rvci5yYgpAQCAtNDUsOSArNDUs OSBAQAogCiAkb3B0aW9ucyA9IHt9CiBPcHRpb25QYXJzZXIubmV3IGRvIHxvcHRzfAotICAgIG9w dHMuYmFubmVyID0gIlVzYWdlOiBnZW5lcmF0ZV9zZXR0aW5nc19leHRyYWN0b3IucmIgYXNtRmls ZSBzZXR0aW5nRmlsZSBbLS11c2UtZGVwbG95bWVudC1sb2NhdGlvbl0iCi0gICAgb3B0cy5vbigi LS11c2UtZGVwbG95bWVudC1sb2NhdGlvbiIsICJGbGFnIHRvIHVzZSBkZXBsb3ltZW50IGxvY2F0 aW9uLiIpIGRvIHxmbGFnfAotICAgICAgICAkb3B0aW9uc1s6dXNlX2RlcGxveW1lbnRfbG9jYXRp b25dID0gZmxhZworICAgIG9wdHMuYmFubmVyID0gIlVzYWdlOiBnZW5lcmF0ZV9zZXR0aW5nc19l eHRyYWN0b3IucmIgYXNtRmlsZSBzZXR0aW5nRmlsZSBbLS13ZWJraXQtYWRkaXRpb25zLXBhdGg9 PHBhdGg+XSIKKyAgICBvcHRzLm9uKCItLXdlYmtpdC1hZGRpdGlvbnMtcGF0aD1QQVRIIiwgIkZs YWcgdG8gdXNlIGRlcGxveW1lbnQgbG9jYXRpb24uIikgZG8gfHBhdGh8CisgICAgICAgICRvcHRp b25zWzp3ZWJraXRfYWRkaXRpb25zX3BhdGhdID0gcGF0aAogICAgIGVuZAogZW5kLnBhcnNlIQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9wYXJzZXIucmIg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9wYXJzZXIucmIKaW5kZXggZmZkMzA4 ZmYzYjQ0NmIyOWU1ZjFlMWVkZTA2N2RmMGM5YjI2YjM4Ni4uZDZlMDliMDNlOGI0MzRkYjhlZDAw NzEzNDIwNDlhZjM2ZTM1MjAyYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29m ZmxpbmVhc20vcGFyc2VyLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L3BhcnNlci5yYgpAQCAtODQsMTQgKzg0LDE0IEBAIGRlZiBpbml0aWFsaXplKG1vZHVsZU5hbWUs IGRlZmF1bHREaXIpCiAgICAgICAgIGRpcmVjdG9yeSA9IG5pbAogICAgICAgICBAQGluY2x1ZGVE aXJzLmVhY2ggewogICAgICAgICAgICAgfCBpbmNsdWRlUGF0aCB8Ci0gICAgICAgICAgICBmaWxl TmFtZSA9IGluY2x1ZGVQYXRoICsgKG1vZHVsZU5hbWUgKyAiLmFzbSIpCisgICAgICAgICAgICBm aWxlTmFtZSA9IEZpbGUuam9pbihpbmNsdWRlUGF0aCwgbW9kdWxlTmFtZSArICIuYXNtIikKICAg ICAgICAgICAgIGRpcmVjdG9yeSA9IGluY2x1ZGVQYXRoIHVubGVzcyBub3QgRmlsZS5maWxlPyhm aWxlTmFtZSkKICAgICAgICAgfQogICAgICAgICBpZiBub3QgZGlyZWN0b3J5CiAgICAgICAgICAg ICBkaXJlY3RvcnkgPSBkZWZhdWx0RGlyCiAgICAgICAgIGVuZAogCi0gICAgICAgIEBmaWxlTmFt ZSA9IGRpcmVjdG9yeSArIChtb2R1bGVOYW1lICsgIi5hc20iKQorICAgICAgICBAZmlsZU5hbWUg PSBGaWxlLmpvaW4oZGlyZWN0b3J5LCBtb2R1bGVOYW1lICsgIi5hc20iKQogICAgIGVuZAogCiAg ICAgZGVmIHNlbGYucHJvY2Vzc0luY2x1ZGVPcHRpb25zKCkKQEAgLTgzMSw4ICs4MzEsOCBAQCBk ZWYgcGFyc2VTZXF1ZW5jZShmaW5hbCwgY29tbWVudCkKICAgICAgICAgICAgICAgICBwYXJzZUVy cm9yIHVubGVzcyBpc0lkZW50aWZpZXIoQHRva2Vuc1tAaWR4XSkKICAgICAgICAgICAgICAgICBt b2R1bGVOYW1lID0gQHRva2Vuc1tAaWR4XS5zdHJpbmcKICAgICAgICAgICAgICAgICBAaWR4ICs9 IDEKLSAgICAgICAgICAgICAgICBpZiBAb3B0aW9uc1s6dXNlX2RlcGxveW1lbnRfbG9jYXRpb25d Ci0gICAgICAgICAgICAgICAgICAgIGFkZGl0aW9uc0RpcmVjdG9yeU5hbWUgPSAiL3Vzci9sb2Nh bC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucy8iCisgICAgICAgICAgICAgICAgaWYgQG9wdGlvbnNb OndlYmtpdF9hZGRpdGlvbnNfcGF0aF0KKyAgICAgICAgICAgICAgICAgICAgYWRkaXRpb25zRGly ZWN0b3J5TmFtZSA9IEBvcHRpb25zWzp3ZWJraXRfYWRkaXRpb25zX3BhdGhdCiAgICAgICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICBhZGRpdGlvbnNEaXJlY3RvcnlOYW1lID0g IiN7QGJ1aWxkUHJvZHVjdHNEaXJlY3Rvcnl9L3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0 aW9ucy8iCiAgICAgICAgICAgICAgICAgZW5kCkBAIC04NjcsOCArODY3LDggQEAgZGVmIHBhcnNl SW5jbHVkZXMoZmluYWwsIGNvbW1lbnQpCiAgICAgICAgICAgICAgICAgcGFyc2VFcnJvciB1bmxl c3MgaXNJZGVudGlmaWVyKEB0b2tlbnNbQGlkeF0pCiAgICAgICAgICAgICAgICAgbW9kdWxlTmFt ZSA9IEB0b2tlbnNbQGlkeF0uc3RyaW5nCiAgICAgICAgICAgICAgICAgQGlkeCArPSAxCi0gICAg ICAgICAgICAgICAgaWYgQG9wdGlvbnNbOnVzZV9kZXBsb3ltZW50X2xvY2F0aW9uXQotICAgICAg ICAgICAgICAgICAgICBhZGRpdGlvbnNEaXJlY3RvcnlOYW1lID0gIi91c3IvbG9jYWwvaW5jbHVk ZS9XZWJLaXRBZGRpdGlvbnMvIgorICAgICAgICAgICAgICAgIGlmIEBvcHRpb25zWzp3ZWJraXRf YWRkaXRpb25zX3BhdGhdCisgICAgICAgICAgICAgICAgICAgIGFkZGl0aW9uc0RpcmVjdG9yeU5h bWUgPSBAb3B0aW9uc1s6d2Via2l0X2FkZGl0aW9uc19wYXRoXQogICAgICAgICAgICAgICAgIGVs c2UKICAgICAgICAgICAgICAgICAgICAgYWRkaXRpb25zRGlyZWN0b3J5TmFtZSA9ICIje0BidWls ZFByb2R1Y3RzRGlyZWN0b3J5fS91c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRBZGRpdGlvbnMvIgog ICAgICAgICAgICAgICAgIGVuZAo=