198415 2019-05-31 04:47:37 -0700 [ews-app] Add authentication while fetching bugs 2019-06-04 14:40:05 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1540690 0 aakash_jain 2019-05-31 04:47:37 -0700 Add bugzilla authentication to Django ews-app for fetching bug list with r? flag, and the individual bugs. 1540691 1 webkit-bug-importer 2019-05-31 04:47:47 -0700 <rdar://problem/51298710> 1540702 2 371052 aakash_jain 2019-05-31 05:58:55 -0700 Created attachment 371052 WIP 1541598 3 371288 aakash_jain 2019-06-04 09:04:58 -0700 Created attachment 371288 Patch 1541621 4 371288 jbedard 2019-06-04 10:13:41 -0700 Comment on attachment 371288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371288&action=review > Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:110 > + if self.authenticated: This code concerns me. What happens if we authenticate, and then this class sticks around for too long, and bugzilla logs us out? If that happens, we have no recourse. I would think that we would set authenticated to false at the beginning on this function. > Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:136 > + if attempts < 5: Can we do: if attempts >= 5: raise Exception(errorMessage) _log.error(errorMessage) time.sleep(5) 1541672 5 371288 aakash_jain 2019-06-04 11:34:26 -0700 Comment on attachment 371288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371288&action=review >> Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:110 >> + if self.authenticated: > > This code concerns me. > > What happens if we authenticate, and then this class sticks around for too long, and bugzilla logs us out? If that happens, we have no recourse. I would think that we would set authenticated to false at the beginning on this function. Agree.. modified to remove caching. >> Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:136 >> + if attempts < 5: > > Can we do: > > if attempts >= 5: > raise Exception(errorMessage) > _log.error(errorMessage) > time.sleep(5) Modified in updated patch. 1541673 6 371312 aakash_jain 2019-06-04 11:37:07 -0700 Created attachment 371312 Patch 1541743 7 371312 aakash_jain 2019-06-04 14:40:02 -0700 Comment on attachment 371312 Patch Clearing flags on attachment: 371312 Committed r246082: <https://trac.webkit.org/changeset/246082> 1541744 8 aakash_jain 2019-06-04 14:40:05 -0700 All reviewed patches have been landed. Closing bug. 371052 2019-05-31 05:58:55 -0700 2019-06-04 09:04:55 -0700 WIP authentication.patch text/plain 6097 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NTk2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA1LTMxICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWFwcF0gQWRkIGF1dGhlbnRpY2F0aW9uIHdoaWxlIGZldGNoaW5n IGJ1Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODQxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEyOTg3MTA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVnemlsbGEucHk6CisgICAgICAgIChCcm93c2VyKTogTW92ZWQgY29t bW9uIGNvZGUgdG8gQnJvd3NlciBjbGFzcy4KKyAgICAgICAgKEJ1Z3ppbGxhLl9mZXRjaF9hdHRh Y2htZW50X2pzb24pOiBDaGFuZ2VkIHRoaXMgdG8gYW4gaW5zdGFuY2UgbWV0aG9kIGFzIHRoaXMg bmVlZCB0byBjYWxsIGF1dGhlbnRpY2F0ZSgpCisgICAgICAgIGFuZCB1c2Ugb3RoZXIgaW5zdGFu Y2UgdmFyaWFibGVzLgorICAgICAgICAoQnVnemlsbGFCZWF1dGlmdWxTb3VwKToKKyAgICAgICAg KEJ1Z3ppbGxhQmVhdXRpZnVsU291cC5fbG9hZF9xdWVyeSk6IEFkZGVkIGF1dGhlbnRpY2F0aW9u LgorICAgICAgICAoQnVnemlsbGFCZWF1dGlmdWxTb3VwLl9nZXRfYnJvd3Nlcik6IE1vdmVkIHRv IGNvbW1vbiBjbGFzcy4KKyAgICAgICAgKEJ1Z3ppbGxhQmVhdXRpZnVsU291cC5fc2V0X2Jyb3dz ZXIpOiBEaXR0by4KKwogMjAxOS0wNS0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gQnVpbGQgYXQtc3BpMi1jb3JlIHdpdGhvdXQg eDExIHN1cHBvcnQgaW4gamhidWlsZApJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWFwcC9ld3MvY29tbW9uL2J1Z3ppbGxhLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6aWxsYS5weQkocmV2aXNpb24gMjQ1OTYw KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9uL2J1Z3ppbGxh LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBAIGltcG9ydCBsb2dnaW5nCiBpbXBv cnQgb3MKIGltcG9ydCByZQogaW1wb3J0IHNvY2tldAoraW1wb3J0IHRpbWUKIAogZnJvbSBkYXRl dGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQogCkBAIC0zNiwxMCArMzcsNjUgQEAgaW1w b3J0IGV3cy5jb25maWcgYXMgY29uZmlnCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1l X18pCiAKIAotY2xhc3MgQnVnemlsbGEoKToKK2NsYXNzIEJyb3dzZXIoKToKKyAgICBkZWYgX19p bml0X18oc2VsZik6CisgICAgICAgIHNlbGYuX2Jyb3dzZXIgPSBOb25lCisgICAgICAgIHNlbGYu YXV0aGVudGljYXRlZCA9IEZhbHNlCisKKyAgICBkZWYgX2dldF9icm93c2VyKHNlbGYpOgorICAg ICAgICBpZiBub3Qgc2VsZi5fYnJvd3NlcjoKKyAgICAgICAgICAgIHNvY2tldC5zZXRkZWZhdWx0 dGltZW91dCg2MDApCisgICAgICAgICAgICBmcm9tIG1lY2hhbml6ZSBpbXBvcnQgQnJvd3Nlcgor ICAgICAgICAgICAgc2VsZi5fYnJvd3NlciA9IEJyb3dzZXIoKQorICAgICAgICAgICAgc2VsZi5f YnJvd3Nlci5zZXRfaGFuZGxlX3JvYm90cyhGYWxzZSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2Jy b3dzZXIKKworICAgIGRlZiBfc2V0X2Jyb3dzZXIoc2VsZiwgdmFsdWUpOgorICAgICAgICBzZWxm Ll9icm93c2VyID0gdmFsdWUKKworICAgIGJyb3dzZXIgPSBwcm9wZXJ0eShfZ2V0X2Jyb3dzZXIs IF9zZXRfYnJvd3NlcikKKworICAgIGRlZiBhdXRoZW50aWNhdGUoc2VsZik6CisgICAgICAgIGlm IHNlbGYuYXV0aGVudGljYXRlZDoKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICB1c2VybmFt ZSA9IG9zLmdldGVudignQlVHWklMTEFfVVNFUk5BTUUnLCBOb25lKQorICAgICAgICBwYXNzd29y ZCA9IG9zLmdldGVudignQlVHWklMTEFfUEFTU1dPUkQnLCBOb25lKQorICAgICAgICBpZiBub3Qg dXNlcm5hbWUgb3Igbm90IHBhc3N3b3JkOgorICAgICAgICAgICAgX2xvZy53YXJuKCJVc2VybmFt ZS9wYXNzd29yZCBub3QgY29uZmlndXJlZCBpbiBlbnZpcm9ubWVudCB2YXJpYWJsZXMuIFNraXBw aW5nIGF1dGhlbnRpY2F0aW9uLiIpCisgICAgICAgICAgICByZXR1cm4KKworICAgICAgICBhdHRl bXB0cyA9IDAKKyAgICAgICAgd2hpbGUgbm90IHNlbGYuYXV0aGVudGljYXRlZDoKKyAgICAgICAg ICAgIGF0dGVtcHRzICs9IDEKKyAgICAgICAgICAgIF9sb2cuaW5mbygiTG9nZ2luZyBpbiBhcyAl cy4uLiIgJSB1c2VybmFtZSkKKyAgICAgICAgICAgIHNlbGYuYnJvd3Nlci5vcGVuKGNvbmZpZy5C VUdfU0VSVkVSX1VSTCArICJpbmRleC5jZ2k/R29BaGVhZEFuZExvZ0luPTEiKQorICAgICAgICAg ICAgX2xvZy5pbmZvKCJPcGVuaW5nIHt9Ii5mb3JtYXQoY29uZmlnLkJVR19TRVJWRVJfVVJMICsg ImluZGV4LmNnaT9Hb0FoZWFkQW5kTG9nSW49MSIpKQorICAgICAgICAgICAgc2VsZi5icm93c2Vy LnNlbGVjdF9mb3JtKG5hbWU9ImxvZ2luIikKKyAgICAgICAgICAgIHNlbGYuYnJvd3NlclsnQnVn emlsbGFfbG9naW4nXSA9IHVzZXJuYW1lCisgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ0J1Z3pp bGxhX3Bhc3N3b3JkJ10gPSBwYXNzd29yZAorICAgICAgICAgICAgc2VsZi5icm93c2VyLmZpbmRf Y29udHJvbCgiQnVnemlsbGFfcmVzdHJpY3Rsb2dpbiIpLml0ZW1zWzBdLnNlbGVjdGVkID0gRmFs c2UKKyAgICAgICAgICAgIHJlc3BvbnNlID0gc2VsZi5icm93c2VyLnN1Ym1pdCgpCisKKyAgICAg ICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCI8dGl0bGU+KC4rPyk8L3RpdGxlPiIsIHJlc3BvbnNl LnJlYWQoKSkKKyAgICAgICAgICAgICMgSWYgdGhlIHJlc3VsdGluZyBwYWdlIGhhcyBhIHRpdGxl LCBhbmQgaXQgY29udGFpbnMgdGhlIHdvcmQKKyAgICAgICAgICAgICMgImludmFsaWQiIGFzc3Vt ZSBpdCdzIHRoZSBsb2dpbiBmYWlsdXJlIHBhZ2UuCisgICAgICAgICAgICBpZiBtYXRjaCBhbmQg cmUuc2VhcmNoKCJJbnZhbGlkIiwgbWF0Y2guZ3JvdXAoMSksIHJlLklHTk9SRUNBU0UpOgorICAg ICAgICAgICAgICAgIGVycm9yTWVzc2FnZSA9ICJCdWd6aWxsYSBsb2dpbiBmYWlsZWQ6ICVzIiAl IG1hdGNoLmdyb3VwKDEpCisgICAgICAgICAgICAgICAgIyByYWlzZSBhbiBleGNlcHRpb24gb25s eSBpZiB0aGlzIHdhcyB0aGUgbGFzdCBhdHRlbXB0CisgICAgICAgICAgICAgICAgaWYgYXR0ZW1w dHMgPCA1OgorICAgICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKGVycm9yTWVzc2FnZSkKKyAg ICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24o ZXJyb3JNZXNzYWdlKQorICAgICAgICAgICAgICAgIHRpbWUuc2xlZXAoNSkKKyAgICAgICAgICAg IGVsc2U6CisgICAgICAgICAgICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gVHJ1ZQorICAgICAg ICAgICAgICAgIHNlbGYudXNlcm5hbWUgPSB1c2VybmFtZQorCisKK2NsYXNzIEJ1Z3ppbGxhKEJy b3dzZXIpOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiByZXRyaWV2ZV9hdHRhY2htZW50KGNs cywgYXR0YWNobWVudF9pZCk6Ci0gICAgICAgIGF0dGFjaG1lbnRfanNvbiA9IEJ1Z3ppbGxhLl9m ZXRjaF9hdHRhY2htZW50X2pzb24oYXR0YWNobWVudF9pZCkKKyAgICAgICAgYXR0YWNobWVudF9q c29uID0gQnVnemlsbGEoKS5fZmV0Y2hfYXR0YWNobWVudF9qc29uKGF0dGFjaG1lbnRfaWQpCiAg ICAgICAgIGlmIG5vdCBhdHRhY2htZW50X2pzb24gb3Igbm90IGF0dGFjaG1lbnRfanNvbi5nZXQo J2RhdGEnKToKICAgICAgICAgICAgIF9sb2cud2FybignVW5hYmxlIHRvIGZldGNoIGF0dGFjaG1l bnQgInt9Ii4nLmZvcm1hdChhdHRhY2htZW50X2lkKSkKICAgICAgICAgICAgIHJldHVybiBOb25l CkBAIC01NCw4ICsxMTAsOCBAQCBjbGFzcyBCdWd6aWxsYSgpOgogICAgICAgICB3aXRoIG9wZW4o QnVnemlsbGEuZmlsZV9wYXRoX2Zvcl9wYXRjaChhdHRhY2htZW50X2lkKSwgJ3cnKSBhcyBhdHRh Y2htZW50X2ZpbGU6CiAgICAgICAgICAgICBhdHRhY2htZW50X2ZpbGUud3JpdGUoYXR0YWNobWVu dF9kYXRhKQogCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9mZXRjaF9hdHRhY2htZW50X2pz b24oY2xzLCBhdHRhY2htZW50X2lkKToKKyAgICBkZWYgX2ZldGNoX2F0dGFjaG1lbnRfanNvbihz ZWxmLCBhdHRhY2htZW50X2lkKToKKyAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQogICAgICAg ICBpZiBub3QgUGF0Y2guaXNfdmFsaWRfcGF0Y2hfaWQoYXR0YWNobWVudF9pZCk6CiAgICAgICAg ICAgICBfbG9nLndhcm4oJ0ludmFsaWQgYXR0YWNobWVudCBpZDogInt9Iiwgc2tpcHBpbmcgZG93 bmxvYWQuJy5mb3JtYXQoYXR0YWNobWVudF9pZCkpCiAgICAgICAgICAgICByZXR1cm4gTm9uZQpA QCAtODMsMjMgKzEzOSwxMCBAQCBjbGFzcyBCdWd6aWxsYSgpOgogICAgICAgICByZXR1cm4gaWRz X25lZWRpbmdfcmV2aWV3CiAKIAotY2xhc3MgQnVnemlsbGFCZWF1dGlmdWxTb3VwKCk6CitjbGFz cyBCdWd6aWxsYUJlYXV0aWZ1bFNvdXAoQnJvd3Nlcik6CiAgICAgIyBGSVhNRTogRGVwcmVjYXRl IHRoaXMgY2xhc3Mgd2hlbiBodHRwczovL2J1Z3ppbGxhLm1vemlsbGEub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTA4NTMxIGlzIGZpeGVkLgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAg c2VsZi5fYnJvd3NlciA9IE5vbmUKLQotICAgIGRlZiBfZ2V0X2Jyb3dzZXIoc2VsZik6Ci0gICAg ICAgIGlmIG5vdCBzZWxmLl9icm93c2VyOgotICAgICAgICAgICAgc29ja2V0LnNldGRlZmF1bHR0 aW1lb3V0KDYwMCkKLSAgICAgICAgICAgIGZyb20gbWVjaGFuaXplIGltcG9ydCBCcm93c2VyCi0g ICAgICAgICAgICBzZWxmLl9icm93c2VyID0gQnJvd3NlcigpCi0gICAgICAgICAgICBzZWxmLl9i cm93c2VyLnNldF9oYW5kbGVfcm9ib3RzKEZhbHNlKQotICAgICAgICByZXR1cm4gc2VsZi5fYnJv d3NlcgotCi0gICAgZGVmIF9zZXRfYnJvd3NlcihzZWxmLCB2YWx1ZSk6Ci0gICAgICAgIHNlbGYu X2Jyb3dzZXIgPSB2YWx1ZQotCi0gICAgYnJvd3NlciA9IHByb3BlcnR5KF9nZXRfYnJvd3Nlciwg X3NldF9icm93c2VyKQorICAgICAgICBCcm93c2VyLl9faW5pdF9fKHNlbGYpCiAKICAgICBkZWYg ZmV0Y2hfYXR0YWNobWVudF9pZHNfZnJvbV9yZXZpZXdfcXVldWUoc2VsZiwgc2luY2U9Tm9uZSwg b25seV9zZWN1cml0eV9idWdzPUZhbHNlKToKICAgICAgICAgcmV2aWV3X3F1ZXVlX3VybCA9ICdy ZXF1ZXN0LmNnaT9hY3Rpb249cXVldWUmdHlwZT1yZXZpZXcmZ3JvdXA9dHlwZScKQEAgLTEwOCw3 ICsxNTEsNyBAQCBjbGFzcyBCdWd6aWxsYUJlYXV0aWZ1bFNvdXAoKToKICAgICAgICAgcmV0dXJu IHNlbGYuX3BhcnNlX2F0dGFjaG1lbnRfaWRzX3JlcXVlc3RfcXVlcnkoc2VsZi5fbG9hZF9xdWVy eShyZXZpZXdfcXVldWVfdXJsKSwgc2luY2UpCiAKICAgICBkZWYgX2xvYWRfcXVlcnkoc2VsZiwg cXVlcnkpOgotICAgICAgICAjIFRPRE86IGNoZWNrIGlmIHdlIG5lZWQgdG8gYXV0aGVudGljYXRl LgorICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCiAgICAgICAgIGZ1bGxfdXJsID0gJ3t9e30n LmZvcm1hdChjb25maWcuQlVHX1NFUlZFUl9VUkwsIHF1ZXJ5KQogICAgICAgICBfbG9nLmluZm8o J0dldHRpbmcgbGlzdCBvZiBwYXRjaGVzIG5lZWRpbmcgcmV2aWV3LCBVUkw6IHt9Jy5mb3JtYXQo ZnVsbF91cmwpKQogICAgICAgICByZXR1cm4gc2VsZi5icm93c2VyLm9wZW4oZnVsbF91cmwpCg== 371288 2019-06-04 09:04:58 -0700 2019-06-04 11:37:05 -0700 Patch bug-198415-20190604120456.patch text/plain 4495 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjA2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA2LTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWFwcF0gQWRkIGF1dGhlbnRpY2F0aW9uIHdoaWxlIGZldGNoaW5n IGJ1Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODQxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEyOTg3MTA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVnemlsbGEucHk6CisgICAgICAgIChCdWd6aWxsYS5fZmV0Y2hfYXR0 YWNobWVudF9qc29uKTogVXNlIGFwaV9rZXkgaWYgY29uZmlndXJlZCBpbiBlbnZpcm9ubWVudCB2 YXJpYWJsZS4KKyAgICAgICAgKEJ1Z3ppbGxhQmVhdXRpZnVsU291cC5hdXRoZW50aWNhdGUpOiBN ZXRob2QgdG8gYXV0aGVudGljYXRlLCBsb2dpYyBjb3BpZWQgZnJvbSB3ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisgICAgICAgIChCdWd6aWxsYUJlYXV0aWZ1bFNvdXAu X2xvYWRfcXVlcnkpOgorCiAyMDE5LTA2LTA0ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KIAogICAgICAgICBbbWlzY10gUmVtb3ZlIEpTQ09ubHkgQVJNdjcgVHJhZGl0aW9u YWwgYm90CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24v YnVnemlsbGEucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFw cC9ld3MvY29tbW9uL2J1Z3ppbGxhLnB5CShyZXZpc2lvbiAyNDYwNjMpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVnemlsbGEucHkJKHdvcmtpbmcgY29w eSkKQEAgLTI1LDYgKzI1LDcgQEAgaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJl CiBpbXBvcnQgc29ja2V0CitpbXBvcnQgdGltZQogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRl dGltZSwgdGltZWRlbHRhCiAKQEAgLTYxLDYgKzYyLDkgQEAgY2xhc3MgQnVnemlsbGEoKToKICAg ICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICAgICAgYXR0YWNobWVudF91cmwgPSAne31yZXN0 L2J1Zy9hdHRhY2htZW50L3t9Jy5mb3JtYXQoY29uZmlnLkJVR19TRVJWRVJfVVJMLCBhdHRhY2ht ZW50X2lkKQorICAgICAgICBhcGlfa2V5ID0gb3MuZ2V0ZW52KCdCVUdaSUxMQV9BUElfS0VZJywg Tm9uZSkKKyAgICAgICAgaWYgYXBpX2tleToKKyAgICAgICAgICAgIGF0dGFjaG1lbnRfdXJsICs9 ICc/YXBpX2tleT17fScuZm9ybWF0KGFwaV9rZXkpCiAgICAgICAgIGF0dGFjaG1lbnQgPSB1dGls LmZldGNoX2RhdGFfZnJvbV91cmwoYXR0YWNobWVudF91cmwpCiAgICAgICAgIGlmIG5vdCBhdHRh Y2htZW50OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKQEAgLTg3LDYgKzkxLDcgQEAgY2xhc3Mg QnVnemlsbGFCZWF1dGlmdWxTb3VwKCk6CiAgICAgIyBGSVhNRTogRGVwcmVjYXRlIHRoaXMgY2xh c3Mgd2hlbiBodHRwczovL2J1Z3ppbGxhLm1vemlsbGEub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA4 NTMxIGlzIGZpeGVkLgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgc2VsZi5fYnJv d3NlciA9IE5vbmUKKyAgICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gRmFsc2UKIAogICAgIGRl ZiBfZ2V0X2Jyb3dzZXIoc2VsZik6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9icm93c2VyOgpAQCAt MTAxLDYgKzEwNiw0MiBAQCBjbGFzcyBCdWd6aWxsYUJlYXV0aWZ1bFNvdXAoKToKIAogICAgIGJy b3dzZXIgPSBwcm9wZXJ0eShfZ2V0X2Jyb3dzZXIsIF9zZXRfYnJvd3NlcikKIAorICAgIGRlZiBh dXRoZW50aWNhdGUoc2VsZik6CisgICAgICAgIGlmIHNlbGYuYXV0aGVudGljYXRlZDoKKyAgICAg ICAgICAgIHJldHVybgorICAgICAgICB1c2VybmFtZSA9IG9zLmdldGVudignQlVHWklMTEFfVVNF Uk5BTUUnLCBOb25lKQorICAgICAgICBwYXNzd29yZCA9IG9zLmdldGVudignQlVHWklMTEFfUEFT U1dPUkQnLCBOb25lKQorICAgICAgICBpZiBub3QgdXNlcm5hbWUgb3Igbm90IHBhc3N3b3JkOgor ICAgICAgICAgICAgX2xvZy53YXJuKCJVc2VybmFtZS9wYXNzd29yZCBub3QgY29uZmlndXJlZCBp biBlbnZpcm9ubWVudCB2YXJpYWJsZXMuIFNraXBwaW5nIGF1dGhlbnRpY2F0aW9uLiIpCisgICAg ICAgICAgICByZXR1cm4KKworICAgICAgICBhdHRlbXB0cyA9IDAKKyAgICAgICAgd2hpbGUgbm90 IHNlbGYuYXV0aGVudGljYXRlZDoKKyAgICAgICAgICAgIGF0dGVtcHRzICs9IDEKKyAgICAgICAg ICAgIF9sb2cuaW5mbygiTG9nZ2luZyBpbiBhcyAlcy4uLiIgJSB1c2VybmFtZSkKKyAgICAgICAg ICAgIHNlbGYuYnJvd3Nlci5vcGVuKGNvbmZpZy5CVUdfU0VSVkVSX1VSTCArICJpbmRleC5jZ2k/ R29BaGVhZEFuZExvZ0luPTEiKQorICAgICAgICAgICAgX2xvZy5pbmZvKCJPcGVuaW5nIHt9Ii5m b3JtYXQoY29uZmlnLkJVR19TRVJWRVJfVVJMICsgImluZGV4LmNnaT9Hb0FoZWFkQW5kTG9nSW49 MSIpKQorICAgICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9mb3JtKG5hbWU9ImxvZ2luIikK KyAgICAgICAgICAgIHNlbGYuYnJvd3NlclsnQnVnemlsbGFfbG9naW4nXSA9IHVzZXJuYW1lCisg ICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ0J1Z3ppbGxhX3Bhc3N3b3JkJ10gPSBwYXNzd29yZAor ICAgICAgICAgICAgc2VsZi5icm93c2VyLmZpbmRfY29udHJvbCgiQnVnemlsbGFfcmVzdHJpY3Rs b2dpbiIpLml0ZW1zWzBdLnNlbGVjdGVkID0gRmFsc2UKKyAgICAgICAgICAgIHJlc3BvbnNlID0g c2VsZi5icm93c2VyLnN1Ym1pdCgpCisKKyAgICAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKCI8 dGl0bGU+KC4rPyk8L3RpdGxlPiIsIHJlc3BvbnNlLnJlYWQoKSkKKyAgICAgICAgICAgICMgSWYg dGhlIHJlc3VsdGluZyBwYWdlIGhhcyBhIHRpdGxlLCBhbmQgaXQgY29udGFpbnMgdGhlIHdvcmQK KyAgICAgICAgICAgICMgImludmFsaWQiIGFzc3VtZSBpdCdzIHRoZSBsb2dpbiBmYWlsdXJlIHBh Z2UuCisgICAgICAgICAgICBpZiBtYXRjaCBhbmQgcmUuc2VhcmNoKCJJbnZhbGlkIiwgbWF0Y2gu Z3JvdXAoMSksIHJlLklHTk9SRUNBU0UpOgorICAgICAgICAgICAgICAgIGVycm9yTWVzc2FnZSA9 ICJCdWd6aWxsYSBsb2dpbiBmYWlsZWQ6ICVzIiAlIG1hdGNoLmdyb3VwKDEpCisgICAgICAgICAg ICAgICAgIyByYWlzZSBhbiBleGNlcHRpb24gb25seSBpZiB0aGlzIHdhcyB0aGUgbGFzdCBhdHRl bXB0CisgICAgICAgICAgICAgICAgaWYgYXR0ZW1wdHMgPCA1OgorICAgICAgICAgICAgICAgICAg ICBfbG9nLmVycm9yKGVycm9yTWVzc2FnZSkKKyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAg ICAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oZXJyb3JNZXNzYWdlKQorICAgICAgICAgICAg ICAgIHRpbWUuc2xlZXAoNSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgc2Vs Zi5hdXRoZW50aWNhdGVkID0gVHJ1ZQorICAgICAgICAgICAgICAgIHNlbGYudXNlcm5hbWUgPSB1 c2VybmFtZQorCiAgICAgZGVmIGZldGNoX2F0dGFjaG1lbnRfaWRzX2Zyb21fcmV2aWV3X3F1ZXVl KHNlbGYsIHNpbmNlPU5vbmUsIG9ubHlfc2VjdXJpdHlfYnVncz1GYWxzZSk6CiAgICAgICAgIHJl dmlld19xdWV1ZV91cmwgPSAncmVxdWVzdC5jZ2k/YWN0aW9uPXF1ZXVlJnR5cGU9cmV2aWV3Jmdy b3VwPXR5cGUnCiAgICAgICAgIGlmIG9ubHlfc2VjdXJpdHlfYnVnczoKQEAgLTEwOCw3ICsxNDks NyBAQCBjbGFzcyBCdWd6aWxsYUJlYXV0aWZ1bFNvdXAoKToKICAgICAgICAgcmV0dXJuIHNlbGYu X3BhcnNlX2F0dGFjaG1lbnRfaWRzX3JlcXVlc3RfcXVlcnkoc2VsZi5fbG9hZF9xdWVyeShyZXZp ZXdfcXVldWVfdXJsKSwgc2luY2UpCiAKICAgICBkZWYgX2xvYWRfcXVlcnkoc2VsZiwgcXVlcnkp OgotICAgICAgICAjIFRPRE86IGNoZWNrIGlmIHdlIG5lZWQgdG8gYXV0aGVudGljYXRlLgorICAg ICAgICBzZWxmLmF1dGhlbnRpY2F0ZSgpCiAgICAgICAgIGZ1bGxfdXJsID0gJ3t9e30nLmZvcm1h dChjb25maWcuQlVHX1NFUlZFUl9VUkwsIHF1ZXJ5KQogICAgICAgICBfbG9nLmluZm8oJ0dldHRp bmcgbGlzdCBvZiBwYXRjaGVzIG5lZWRpbmcgcmV2aWV3LCBVUkw6IHt9Jy5mb3JtYXQoZnVsbF91 cmwpKQogICAgICAgICByZXR1cm4gc2VsZi5icm93c2VyLm9wZW4oZnVsbF91cmwpCg== 371312 2019-06-04 11:37:07 -0700 2019-06-04 14:40:02 -0700 Patch bug-198415-20190604143706.patch text/plain 4017 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjA3MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA2LTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWFwcF0gQWRkIGF1dGhlbnRpY2F0aW9uIHdoaWxlIGZldGNoaW5n IGJ1Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODQxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEyOTg3MTA+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVnemlsbGEucHk6CisgICAgICAgIChCdWd6aWxsYS5fZmV0Y2hfYXR0 YWNobWVudF9qc29uKTogVXNlIGFwaV9rZXkgaWYgY29uZmlndXJlZCBpbiBlbnZpcm9ubWVudCB2 YXJpYWJsZS4KKyAgICAgICAgKEJ1Z3ppbGxhQmVhdXRpZnVsU291cC5hdXRoZW50aWNhdGUpOiBN ZXRob2QgdG8gYXV0aGVudGljYXRlLCBsb2dpYyBjb3BpZWQgZnJvbSB3ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisgICAgICAgIChCdWd6aWxsYUJlYXV0aWZ1bFNvdXAu X2xvYWRfcXVlcnkpOgorCiAyMDE5LTA2LTA0ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KIAogICAgICAgICBbbWlzY10gUmVtb3ZlIEpTQ09ubHkgQVJNdjcgVHJhZGl0aW9u YWwgYm90CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24v YnVnemlsbGEucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFw cC9ld3MvY29tbW9uL2J1Z3ppbGxhLnB5CShyZXZpc2lvbiAyNDYwNjMpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVnemlsbGEucHkJKHdvcmtpbmcgY29w eSkKQEAgLTI1LDYgKzI1LDcgQEAgaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IHJl CiBpbXBvcnQgc29ja2V0CitpbXBvcnQgdGltZQogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRl dGltZSwgdGltZWRlbHRhCiAKQEAgLTYxLDYgKzYyLDkgQEAgY2xhc3MgQnVnemlsbGEoKToKICAg ICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICAgICAgYXR0YWNobWVudF91cmwgPSAne31yZXN0 L2J1Zy9hdHRhY2htZW50L3t9Jy5mb3JtYXQoY29uZmlnLkJVR19TRVJWRVJfVVJMLCBhdHRhY2ht ZW50X2lkKQorICAgICAgICBhcGlfa2V5ID0gb3MuZ2V0ZW52KCdCVUdaSUxMQV9BUElfS0VZJywg Tm9uZSkKKyAgICAgICAgaWYgYXBpX2tleToKKyAgICAgICAgICAgIGF0dGFjaG1lbnRfdXJsICs9 ICc/YXBpX2tleT17fScuZm9ybWF0KGFwaV9rZXkpCiAgICAgICAgIGF0dGFjaG1lbnQgPSB1dGls LmZldGNoX2RhdGFfZnJvbV91cmwoYXR0YWNobWVudF91cmwpCiAgICAgICAgIGlmIG5vdCBhdHRh Y2htZW50OgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKQEAgLTEwMSw2ICsxMDUsMzggQEAgY2xh c3MgQnVnemlsbGFCZWF1dGlmdWxTb3VwKCk6CiAKICAgICBicm93c2VyID0gcHJvcGVydHkoX2dl dF9icm93c2VyLCBfc2V0X2Jyb3dzZXIpCiAKKyAgICBkZWYgYXV0aGVudGljYXRlKHNlbGYpOgor ICAgICAgICB1c2VybmFtZSA9IG9zLmdldGVudignQlVHWklMTEFfVVNFUk5BTUUnLCBOb25lKQor ICAgICAgICBwYXNzd29yZCA9IG9zLmdldGVudignQlVHWklMTEFfUEFTU1dPUkQnLCBOb25lKQor ICAgICAgICBpZiBub3QgdXNlcm5hbWUgb3Igbm90IHBhc3N3b3JkOgorICAgICAgICAgICAgX2xv Zy53YXJuKCdCdWd6aWxsYSB1c2VybmFtZS9wYXNzd29yZCBub3QgY29uZmlndXJlZCBpbiBlbnZp cm9ubWVudCB2YXJpYWJsZXMuIFNraXBwaW5nIGF1dGhlbnRpY2F0aW9uLicpCisgICAgICAgICAg ICByZXR1cm4KKworICAgICAgICBhdXRoZW50aWNhdGVkID0gRmFsc2UKKyAgICAgICAgYXR0ZW1w dHMgPSAwCisgICAgICAgIHdoaWxlIG5vdCBhdXRoZW50aWNhdGVkOgorICAgICAgICAgICAgYXR0 ZW1wdHMgKz0gMQorICAgICAgICAgICAgX2xvZy5pbmZvKCdMb2dnaW5nIGluIGFzIHt9Li4uJy5m b3JtYXQodXNlcm5hbWUpKQorICAgICAgICAgICAgc2VsZi5icm93c2VyLm9wZW4oY29uZmlnLkJV R19TRVJWRVJfVVJMICsgJ2luZGV4LmNnaT9Hb0FoZWFkQW5kTG9nSW49MScpCisgICAgICAgICAg ICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0ibG9naW4iKQorICAgICAgICAgICAgc2Vs Zi5icm93c2VyWydCdWd6aWxsYV9sb2dpbiddID0gdXNlcm5hbWUKKyAgICAgICAgICAgIHNlbGYu YnJvd3NlclsnQnVnemlsbGFfcGFzc3dvcmQnXSA9IHBhc3N3b3JkCisgICAgICAgICAgICBzZWxm LmJyb3dzZXIuZmluZF9jb250cm9sKCJCdWd6aWxsYV9yZXN0cmljdGxvZ2luIikuaXRlbXNbMF0u c2VsZWN0ZWQgPSBGYWxzZQorICAgICAgICAgICAgcmVzcG9uc2UgPSBzZWxmLmJyb3dzZXIuc3Vi bWl0KCkKKworICAgICAgICAgICAgbWF0Y2ggPSByZS5zZWFyY2goIjx0aXRsZT4oLis/KTwvdGl0 bGU+IiwgcmVzcG9uc2UucmVhZCgpKQorICAgICAgICAgICAgIyBJZiB0aGUgcmVzdWx0aW5nIHBh Z2UgaGFzIGEgdGl0bGUsIGFuZCBpdCBjb250YWlucyB0aGUgd29yZAorICAgICAgICAgICAgIyAi aW52YWxpZCIgYXNzdW1lIGl0J3MgdGhlIGxvZ2luIGZhaWx1cmUgcGFnZS4KKyAgICAgICAgICAg IGlmIG1hdGNoIGFuZCByZS5zZWFyY2goIkludmFsaWQiLCBtYXRjaC5ncm91cCgxKSwgcmUuSUdO T1JFQ0FTRSk6CisgICAgICAgICAgICAgICAgZXJyb3JNZXNzYWdlID0gJ0J1Z3ppbGxhIGxvZ2lu IGZhaWxlZDoge30nLmZvcm1hdChtYXRjaC5ncm91cCgxKSkKKyAgICAgICAgICAgICAgICBpZiBh dHRlbXB0cyA+PSA1OgorICAgICAgICAgICAgICAgICAgICAjIHJhaXNlIGFuIGV4Y2VwdGlvbiBv bmx5IGlmIHRoaXMgd2FzIHRoZSBsYXN0IGF0dGVtcHQKKyAgICAgICAgICAgICAgICAgICAgcmFp c2UgRXhjZXB0aW9uKGVycm9yTWVzc2FnZSkKKyAgICAgICAgICAgICAgICBfbG9nLmVycm9yKGVy cm9yTWVzc2FnZSkKKyAgICAgICAgICAgICAgICB0aW1lLnNsZWVwKDUpCisgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgIGF1dGhlbnRpY2F0ZWQgPSBUcnVlCisKICAgICBkZWYgZmV0 Y2hfYXR0YWNobWVudF9pZHNfZnJvbV9yZXZpZXdfcXVldWUoc2VsZiwgc2luY2U9Tm9uZSwgb25s eV9zZWN1cml0eV9idWdzPUZhbHNlKToKICAgICAgICAgcmV2aWV3X3F1ZXVlX3VybCA9ICdyZXF1 ZXN0LmNnaT9hY3Rpb249cXVldWUmdHlwZT1yZXZpZXcmZ3JvdXA9dHlwZScKICAgICAgICAgaWYg b25seV9zZWN1cml0eV9idWdzOgpAQCAtMTA4LDcgKzE0NCw3IEBAIGNsYXNzIEJ1Z3ppbGxhQmVh dXRpZnVsU291cCgpOgogICAgICAgICByZXR1cm4gc2VsZi5fcGFyc2VfYXR0YWNobWVudF9pZHNf cmVxdWVzdF9xdWVyeShzZWxmLl9sb2FkX3F1ZXJ5KHJldmlld19xdWV1ZV91cmwpLCBzaW5jZSkK IAogICAgIGRlZiBfbG9hZF9xdWVyeShzZWxmLCBxdWVyeSk6Ci0gICAgICAgICMgVE9ETzogY2hl Y2sgaWYgd2UgbmVlZCB0byBhdXRoZW50aWNhdGUuCisgICAgICAgIHNlbGYuYXV0aGVudGljYXRl KCkKICAgICAgICAgZnVsbF91cmwgPSAne317fScuZm9ybWF0KGNvbmZpZy5CVUdfU0VSVkVSX1VS TCwgcXVlcnkpCiAgICAgICAgIF9sb2cuaW5mbygnR2V0dGluZyBsaXN0IG9mIHBhdGNoZXMgbmVl ZGluZyByZXZpZXcsIFVSTDoge30nLmZvcm1hdChmdWxsX3VybCkpCiAgICAgICAgIHJldHVybiBz ZWxmLmJyb3dzZXIub3BlbihmdWxsX3VybCkK