214639 2020-07-22 06:08:43 -0700 [ews-app] Pass api key in more secure manner 2020-07-22 11:40:02 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1673800 0 aakash_jain 2020-07-22 06:08:43 -0700 Pass api key in more secure manner in EWS django app. Instead of appending the api key in the url, it should be passed as a requests.get parameter. One benefit of that is, if the url is logged, api key wouldn't appear in the logs. Similar to https://trac.webkit.org/changeset/258008/webkit 1673826 1 404925 aakash_jain 2020-07-22 08:44:57 -0700 Created attachment 404925 Patch 1673844 2 404925 jbedard 2020-07-22 09:24:18 -0700 Comment on attachment 404925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404925&action=review > Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:98 > + # Catching all exceptions here to safeguard api key. You say you're catching all exceptions to safeguard the API key, but then you log the exception anyways? Is that deliberate? I suppose you're guaranteeing that the exception won't end up in the response, but the API could still end up in the log, no? 1673862 3 404925 aakash_jain 2020-07-22 09:47:46 -0700 Comment on attachment 404925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404925&action=review >> Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:98 >> + # Catching all exceptions here to safeguard api key. > > You say you're catching all exceptions to safeguard the API key, but then you log the exception anyways? Is that deliberate? I suppose you're guaranteeing that the exception won't end up in the response, but the API could still end up in the log, no? Oops, I printed the exception here for debugging. Thanks for catching that. 1673873 4 404935 aakash_jain 2020-07-22 10:07:57 -0700 Created attachment 404935 Patch 1673888 5 ews-feeder 2020-07-22 11:16:44 -0700 Committed r264711: <https://trac.webkit.org/changeset/264711> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404935. 1673889 6 webkit-bug-importer 2020-07-22 11:17:15 -0700 <rdar://problem/65945882> 1673906 7 aakash_jain 2020-07-22 11:40:02 -0700 Deployed the change on the server. 404925 2020-07-22 08:44:57 -0700 2020-07-22 10:07:54 -0700 Patch bug-214639-20200722114456.patch text/plain 5267 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA3LTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWFwcF0gUGFzcyBhcGkga2V5IGluIG1vcmUgc2VjdXJlIG1hbm5l cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NjM5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVnemlsbGEucHk6CisgICAgICAgIChC dWd6aWxsYS5nZXRfYnVnemlsbGFfYXBpX2tleSk6IE1ldGhvZCB0byByZWFkIGFwaSBrZXkgZnJv bSBmaWxlIGluc3RlYWQgb2YgZW52aXJvbm1lbnQgdmFyaWFibGUuCisgICAgICAgIChCdWd6aWxs YS5mZXRjaF9kYXRhX2Zyb21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbik6IE1ldGhvZCB0 byBmZXRjaCBkYXRhIGZyb20gYnVnemlsbGEgdXNpbmcgYXBpIGtleS4KKyAgICAgICAgKEJ1Z3pp bGxhLl9mZXRjaF9hdHRhY2htZW50X2pzb24pOiBEbyBub3QgYXBwZW5kIGFwaSBrZXkgaW4gdGhl IHVybCwgdXNlIG5ldyBtZXRob2QgaW5zdGVhZC4KKyAgICAgICAgKEJ1Z3ppbGxhLl9nZXRfYnVn X2pzb24pOiBEaXR0by4KKyAgICAgICAgKEJ1Z3ppbGxhLl9nZXRfY29tbWl0X3F1ZXVlX3BhdGNo ZXNfZnJvbV9idWcpOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBw L2V3cy9jb21tb24vdXRpbC5weToKKyAgICAgICAgKGZldGNoX2RhdGFfZnJvbV91cmwpOiBMb2cg dGhlIHVybCB0byBoZWxwIGluIGRlYnVnZ2luZyBhbnkgcG9zc2libGUgaXNzdWVzLgorCiAyMDIw LTA3LTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXVtXUEVdIElUUDogdXNlIHRoZSBkYXRhYmFzZSBzdG9yZSB1bmNvbmRpdGlvbmFs bHkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6 aWxsYS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9jb21tb24vYnVnemlsbGEucHkJKHJldmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6aWxsYS5weQkod29ya2luZyBjb3B5KQpA QCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE4LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMSw5ICsyMSwx MSBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgYmFzZTY0CitpbXBvcnQganNvbgogaW1wb3J0 IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJlCitpbXBvcnQgcmVxdWVzdHMKIGltcG9ydCBz b2NrZXQKIGltcG9ydCB0aW1lCiAKQEAgLTc1LDE2ICs3NywzNyBAQCBjbGFzcyBCdWd6aWxsYSgp OgogICAgICAgICAgICAgYXR0YWNobWVudF9maWxlLndyaXRlKGF0dGFjaG1lbnRfZGF0YSkKIAog ICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBnZXRfYnVnemlsbGFfYXBpX2tleShjbHMpOgorICAg ICAgICB0cnk6CisgICAgICAgICAgICBwYXNzd29yZHMgPSBqc29uLmxvYWQob3BlbigncGFzc3dv cmRzLmpzb24nKSkKKyAgICAgICAgICAgIHJldHVybiBwYXNzd29yZHMuZ2V0KCdCVUdaSUxMQV9B UElfS0VZJywgJycpCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAg IF9sb2cuZXJyb3IoJ0Vycm9yIGluIHJlYWRpbmcgQnVnemlsbGEgYXBpIGtleScpCisgICAgICAg ICAgICByZXR1cm4gJycKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBmZXRjaF9kYXRhX2Zy b21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbihjbHMsIHVybCk6CisgICAgICAgIF9sb2cu aW5mbygnRmV0Y2hpbmcgZnJvbSBidWd6aWxsYToge30nLmZvcm1hdCh1cmwpKQorICAgICAgICBy ZXNwb25zZSA9IE5vbmUKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmVzcG9uc2UgPSByZXF1 ZXN0cy5nZXQodXJsLCB0aW1lb3V0PTEwLCBwYXJhbXM9eydCdWd6aWxsYV9hcGlfa2V5JzogY2xz LmdldF9idWd6aWxsYV9hcGlfa2V5KCl9KQorICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVz X2NvZGUgIT0gMjAwOgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0FjY2Vzc2VkIHt1cmx9 IHdpdGggdW5leHBlY3RlZCBzdGF0dXMgY29kZSB7c3RhdHVzX2NvZGV9LlxuJy5mb3JtYXQodXJs PXVybCwgc3RhdHVzX2NvZGU9cmVzcG9uc2Uuc3RhdHVzX2NvZGUpKQorICAgICAgICAgICAgICAg IHJldHVybiBOb25lCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAg ICMgQ2F0Y2hpbmcgYWxsIGV4Y2VwdGlvbnMgaGVyZSB0byBzYWZlZ3VhcmQgYXBpIGtleS4KKyAg ICAgICAgICAgIF9sb2cuZXJyb3IoJ0ZhaWxlZCB0byBhY2Nlc3Mge30sIHt9LlxuJy5mb3JtYXQo dXJsLCBlKSkKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVybiByZXNwb25z ZQorCisgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIF9mZXRjaF9hdHRhY2htZW50X2pzb24oY2xz LCBhdHRhY2htZW50X2lkKToKICAgICAgICAgaWYgbm90IFBhdGNoLmlzX3ZhbGlkX3BhdGNoX2lk KGF0dGFjaG1lbnRfaWQpOgogICAgICAgICAgICAgX2xvZy53YXJuKCdJbnZhbGlkIGF0dGFjaG1l bnQgaWQ6ICJ7fSIsIHNraXBwaW5nIGRvd25sb2FkLicuZm9ybWF0KGF0dGFjaG1lbnRfaWQpKQog ICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAgICBhdHRhY2htZW50X3VybCA9ICd7fXJl c3QvYnVnL2F0dGFjaG1lbnQve30nLmZvcm1hdChjb25maWcuQlVHX1NFUlZFUl9VUkwsIGF0dGFj aG1lbnRfaWQpCi0gICAgICAgIGFwaV9rZXkgPSBvcy5nZXRlbnYoJ0JVR1pJTExBX0FQSV9LRVkn LCBOb25lKQotICAgICAgICBpZiBhcGlfa2V5OgotICAgICAgICAgICAgYXR0YWNobWVudF91cmwg Kz0gJz9hcGlfa2V5PXt9Jy5mb3JtYXQoYXBpX2tleSkKLSAgICAgICAgYXR0YWNobWVudCA9IHV0 aWwuZmV0Y2hfZGF0YV9mcm9tX3VybChhdHRhY2htZW50X3VybCkKKyAgICAgICAgYXR0YWNobWVu dCA9IGNscy5mZXRjaF9kYXRhX2Zyb21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbihhdHRh Y2htZW50X3VybCkKICAgICAgICAgaWYgbm90IGF0dGFjaG1lbnQ6CiAgICAgICAgICAgICByZXR1 cm4gTm9uZQogICAgICAgICBhdHRhY2htZW50X2pzb24gPSBhdHRhY2htZW50Lmpzb24oKS5nZXQo J2F0dGFjaG1lbnRzJykKQEAgLTk5LDEwICsxMjIsNyBAQCBjbGFzcyBCdWd6aWxsYSgpOgogICAg ICAgICAgICAgcmV0dXJuIFtdCiAKICAgICAgICAgYnVnX3VybCA9ICd7fXJlc3QvYnVnL3t9Jy5m b3JtYXQoY29uZmlnLkJVR19TRVJWRVJfVVJMLCBidWdfaWQpCi0gICAgICAgIGFwaV9rZXkgPSBv cy5nZXRlbnYoJ0JVR1pJTExBX0FQSV9LRVknLCBOb25lKQotICAgICAgICBpZiBhcGlfa2V5Ogot ICAgICAgICAgICAgYnVnX3VybCArPSAnP2FwaV9rZXk9e30nLmZvcm1hdChhcGlfa2V5KQotICAg ICAgICBidWcgPSB1dGlsLmZldGNoX2RhdGFfZnJvbV91cmwoYnVnX3VybCkKKyAgICAgICAgYnVn ID0gY2xzLmZldGNoX2RhdGFfZnJvbV9idWd6aWxsYV93aXRoX2F1dGhlbnRpY2F0aW9uKGJ1Z191 cmwpCiAgICAgICAgIGlmIG5vdCBidWc6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAgICAg ICBidWdzX2pzb24gPSBidWcuanNvbigpLmdldCgnYnVncycpCkBAIC0xMTcsMTAgKzEzNyw3IEBA IGNsYXNzIEJ1Z3ppbGxhKCk6CiAgICAgICAgICAgICByZXR1cm4gW10KIAogICAgICAgICBidWdf dXJsID0gJ3t9cmVzdC9idWcve30vYXR0YWNobWVudCcuZm9ybWF0KGNvbmZpZy5CVUdfU0VSVkVS X1VSTCwgYnVnX2lkKQotICAgICAgICBhcGlfa2V5ID0gb3MuZ2V0ZW52KCdCVUdaSUxMQV9BUElf S0VZJywgTm9uZSkKLSAgICAgICAgaWYgYXBpX2tleToKLSAgICAgICAgICAgIGJ1Z191cmwgKz0g Jz9hcGlfa2V5PXt9Jy5mb3JtYXQoYXBpX2tleSkKLSAgICAgICAgYnVnID0gdXRpbC5mZXRjaF9k YXRhX2Zyb21fdXJsKGJ1Z191cmwpCisgICAgICAgIGJ1ZyA9IGNscy5mZXRjaF9kYXRhX2Zyb21f YnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbihidWdfdXJsKQogICAgICAgICBpZiBub3QgYnVn OgogICAgICAgICAgICAgcmV0dXJuIFtdCiAgICAgICAgIGJ1Z19qc29uID0gYnVnLmpzb24oKS5n ZXQoJ2J1Z3MnKQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29t bW9uL3V0aWwucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFw cC9ld3MvY29tbW9uL3V0aWwucHkJKHJldmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi91dGlsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y Nyw3ICsyNyw3IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBkZWYg ZmV0Y2hfZGF0YV9mcm9tX3VybCh1cmwpOgotICAgIF9sb2cuZGVidWcoJ0ZldGNoaW5nOiB7fScu Zm9ybWF0KHVybCkpCisgICAgX2xvZy5pbmZvKCdGZXRjaGluZzoge30nLmZvcm1hdCh1cmwpKQog ICAgIHJlc3BvbnNlID0gTm9uZQogICAgIHRyeToKICAgICAgICAgcmVzcG9uc2UgPSByZXF1ZXN0 cy5nZXQodXJsLCB0aW1lb3V0PTEwKQo= 404935 2020-07-22 10:07:57 -0700 2020-07-22 11:16:45 -0700 Patch bug-214639-20200722130756.patch text/plain 5255 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA3LTIyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWFwcF0gUGFzcyBhcGkga2V5IGluIG1vcmUgc2VjdXJlIG1hbm5l cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NjM5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVnemlsbGEucHk6CisgICAgICAgIChC dWd6aWxsYS5nZXRfYnVnemlsbGFfYXBpX2tleSk6IE1ldGhvZCB0byByZWFkIGFwaSBrZXkgZnJv bSBmaWxlIGluc3RlYWQgb2YgZW52aXJvbm1lbnQgdmFyaWFibGUuCisgICAgICAgIChCdWd6aWxs YS5mZXRjaF9kYXRhX2Zyb21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbik6IE1ldGhvZCB0 byBmZXRjaCBkYXRhIGZyb20gYnVnemlsbGEgdXNpbmcgYXBpIGtleS4KKyAgICAgICAgKEJ1Z3pp bGxhLl9mZXRjaF9hdHRhY2htZW50X2pzb24pOiBEbyBub3QgYXBwZW5kIGFwaSBrZXkgaW4gdGhl IHVybCwgdXNlIG5ldyBtZXRob2QgaW5zdGVhZC4KKyAgICAgICAgKEJ1Z3ppbGxhLl9nZXRfYnVn X2pzb24pOiBEaXR0by4KKyAgICAgICAgKEJ1Z3ppbGxhLl9nZXRfY29tbWl0X3F1ZXVlX3BhdGNo ZXNfZnJvbV9idWcpOiBEaXR0by4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBw L2V3cy9jb21tb24vdXRpbC5weToKKyAgICAgICAgKGZldGNoX2RhdGFfZnJvbV91cmwpOiBMb2cg dGhlIHVybCB0byBoZWxwIGluIGRlYnVnZ2luZyBhbnkgcG9zc2libGUgaXNzdWVzLgorCiAyMDIw LTA3LTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXVtXUEVdIElUUDogdXNlIHRoZSBkYXRhYmFzZSBzdG9yZSB1bmNvbmRpdGlvbmFs bHkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6 aWxsYS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9jb21tb24vYnVnemlsbGEucHkJKHJldmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6aWxsYS5weQkod29ya2luZyBjb3B5KQpA QCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE4LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMSw5ICsyMSwx MSBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgYmFzZTY0CitpbXBvcnQganNvbgogaW1wb3J0 IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJlCitpbXBvcnQgcmVxdWVzdHMKIGltcG9ydCBz b2NrZXQKIGltcG9ydCB0aW1lCiAKQEAgLTc1LDE2ICs3NywzNyBAQCBjbGFzcyBCdWd6aWxsYSgp OgogICAgICAgICAgICAgYXR0YWNobWVudF9maWxlLndyaXRlKGF0dGFjaG1lbnRfZGF0YSkKIAog ICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBnZXRfYnVnemlsbGFfYXBpX2tleShjbHMpOgorICAg ICAgICB0cnk6CisgICAgICAgICAgICBwYXNzd29yZHMgPSBqc29uLmxvYWQob3BlbigncGFzc3dv cmRzLmpzb24nKSkKKyAgICAgICAgICAgIHJldHVybiBwYXNzd29yZHMuZ2V0KCdCVUdaSUxMQV9B UElfS0VZJywgJycpCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAg IF9sb2cuZXJyb3IoJ0Vycm9yIGluIHJlYWRpbmcgQnVnemlsbGEgYXBpIGtleScpCisgICAgICAg ICAgICByZXR1cm4gJycKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBmZXRjaF9kYXRhX2Zy b21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbihjbHMsIHVybCk6CisgICAgICAgIF9sb2cu aW5mbygnRmV0Y2hpbmcgZnJvbSBidWd6aWxsYToge30nLmZvcm1hdCh1cmwpKQorICAgICAgICBy ZXNwb25zZSA9IE5vbmUKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmVzcG9uc2UgPSByZXF1 ZXN0cy5nZXQodXJsLCB0aW1lb3V0PTEwLCBwYXJhbXM9eydCdWd6aWxsYV9hcGlfa2V5JzogY2xz LmdldF9idWd6aWxsYV9hcGlfa2V5KCl9KQorICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVz X2NvZGUgIT0gMjAwOgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0FjY2Vzc2VkIHt1cmx9 IHdpdGggdW5leHBlY3RlZCBzdGF0dXMgY29kZSB7c3RhdHVzX2NvZGV9LicuZm9ybWF0KHVybD11 cmwsIHN0YXR1c19jb2RlPXJlc3BvbnNlLnN0YXR1c19jb2RlKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gTm9uZQorICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAgICAj IENhdGNoaW5nIGFsbCBleGNlcHRpb25zIGhlcmUgdG8gc2FmZWd1YXJkIGFwaSBrZXkuCisgICAg ICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQgdG8gYWNjZXNzIHt9Jy5mb3JtYXQodXJsKSkKKyAg ICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVybiByZXNwb25zZQorCisgICAgQGNs YXNzbWV0aG9kCiAgICAgZGVmIF9mZXRjaF9hdHRhY2htZW50X2pzb24oY2xzLCBhdHRhY2htZW50 X2lkKToKICAgICAgICAgaWYgbm90IFBhdGNoLmlzX3ZhbGlkX3BhdGNoX2lkKGF0dGFjaG1lbnRf aWQpOgogICAgICAgICAgICAgX2xvZy53YXJuKCdJbnZhbGlkIGF0dGFjaG1lbnQgaWQ6ICJ7fSIs IHNraXBwaW5nIGRvd25sb2FkLicuZm9ybWF0KGF0dGFjaG1lbnRfaWQpKQogICAgICAgICAgICAg cmV0dXJuIE5vbmUKIAogICAgICAgICBhdHRhY2htZW50X3VybCA9ICd7fXJlc3QvYnVnL2F0dGFj aG1lbnQve30nLmZvcm1hdChjb25maWcuQlVHX1NFUlZFUl9VUkwsIGF0dGFjaG1lbnRfaWQpCi0g ICAgICAgIGFwaV9rZXkgPSBvcy5nZXRlbnYoJ0JVR1pJTExBX0FQSV9LRVknLCBOb25lKQotICAg ICAgICBpZiBhcGlfa2V5OgotICAgICAgICAgICAgYXR0YWNobWVudF91cmwgKz0gJz9hcGlfa2V5 PXt9Jy5mb3JtYXQoYXBpX2tleSkKLSAgICAgICAgYXR0YWNobWVudCA9IHV0aWwuZmV0Y2hfZGF0 YV9mcm9tX3VybChhdHRhY2htZW50X3VybCkKKyAgICAgICAgYXR0YWNobWVudCA9IGNscy5mZXRj aF9kYXRhX2Zyb21fYnVnemlsbGFfd2l0aF9hdXRoZW50aWNhdGlvbihhdHRhY2htZW50X3VybCkK ICAgICAgICAgaWYgbm90IGF0dGFjaG1lbnQ6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAg ICAgICBhdHRhY2htZW50X2pzb24gPSBhdHRhY2htZW50Lmpzb24oKS5nZXQoJ2F0dGFjaG1lbnRz JykKQEAgLTk5LDEwICsxMjIsNyBAQCBjbGFzcyBCdWd6aWxsYSgpOgogICAgICAgICAgICAgcmV0 dXJuIFtdCiAKICAgICAgICAgYnVnX3VybCA9ICd7fXJlc3QvYnVnL3t9Jy5mb3JtYXQoY29uZmln LkJVR19TRVJWRVJfVVJMLCBidWdfaWQpCi0gICAgICAgIGFwaV9rZXkgPSBvcy5nZXRlbnYoJ0JV R1pJTExBX0FQSV9LRVknLCBOb25lKQotICAgICAgICBpZiBhcGlfa2V5OgotICAgICAgICAgICAg YnVnX3VybCArPSAnP2FwaV9rZXk9e30nLmZvcm1hdChhcGlfa2V5KQotICAgICAgICBidWcgPSB1 dGlsLmZldGNoX2RhdGFfZnJvbV91cmwoYnVnX3VybCkKKyAgICAgICAgYnVnID0gY2xzLmZldGNo X2RhdGFfZnJvbV9idWd6aWxsYV93aXRoX2F1dGhlbnRpY2F0aW9uKGJ1Z191cmwpCiAgICAgICAg IGlmIG5vdCBidWc6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICBidWdzX2pzb24g PSBidWcuanNvbigpLmdldCgnYnVncycpCkBAIC0xMTcsMTAgKzEzNyw3IEBAIGNsYXNzIEJ1Z3pp bGxhKCk6CiAgICAgICAgICAgICByZXR1cm4gW10KIAogICAgICAgICBidWdfdXJsID0gJ3t9cmVz dC9idWcve30vYXR0YWNobWVudCcuZm9ybWF0KGNvbmZpZy5CVUdfU0VSVkVSX1VSTCwgYnVnX2lk KQotICAgICAgICBhcGlfa2V5ID0gb3MuZ2V0ZW52KCdCVUdaSUxMQV9BUElfS0VZJywgTm9uZSkK LSAgICAgICAgaWYgYXBpX2tleToKLSAgICAgICAgICAgIGJ1Z191cmwgKz0gJz9hcGlfa2V5PXt9 Jy5mb3JtYXQoYXBpX2tleSkKLSAgICAgICAgYnVnID0gdXRpbC5mZXRjaF9kYXRhX2Zyb21fdXJs KGJ1Z191cmwpCisgICAgICAgIGJ1ZyA9IGNscy5mZXRjaF9kYXRhX2Zyb21fYnVnemlsbGFfd2l0 aF9hdXRoZW50aWNhdGlvbihidWdfdXJsKQogICAgICAgICBpZiBub3QgYnVnOgogICAgICAgICAg ICAgcmV0dXJuIFtdCiAgICAgICAgIGJ1Z19qc29uID0gYnVnLmpzb24oKS5nZXQoJ2J1Z3MnKQpJ bmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9uL3V0aWwucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9u L3V0aWwucHkJKHJldmlzaW9uIDI2NDY5NSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1hcHAvZXdzL2NvbW1vbi91dGlsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNyw3ICsyNyw3IEBA IF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBkZWYgZmV0Y2hfZGF0YV9m cm9tX3VybCh1cmwpOgotICAgIF9sb2cuZGVidWcoJ0ZldGNoaW5nOiB7fScuZm9ybWF0KHVybCkp CisgICAgX2xvZy5pbmZvKCdGZXRjaGluZzoge30nLmZvcm1hdCh1cmwpKQogICAgIHJlc3BvbnNl ID0gTm9uZQogICAgIHRyeToKICAgICAgICAgcmVzcG9uc2UgPSByZXF1ZXN0cy5nZXQodXJsLCB0 aW1lb3V0PTEwKQo=