32531 2009-12-14 15:43:08 -0800 Move Credential handling out into a separate module 2009-12-14 22:01:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth commit-queue webkit.review.bot oldest_to_newest 171607 0 eric 2009-12-14 15:43:08 -0800 Move Credential handling out into a separate module bugzilla.py does too much. Lets start by moving credential handling out into its own module. It was already some static functions (which made it harder to test too). 171609 1 44826 eric 2009-12-14 15:46:57 -0800 Created attachment 44826 Patch 171677 2 webkit.review.bot 2009-12-14 21:04:55 -0800 style-queue ran check-webkit-style on attachment 44826 without any errors. 171708 3 44826 abarth 2009-12-14 21:46:36 -0800 Comment on attachment 44826 Patch This looks great. Love the tests. However, we should normalize to using _ before private member variable names. :) 171711 4 44826 commit-queue 2009-12-14 22:01:02 -0800 Comment on attachment 44826 Patch Clearing flags on attachment: 44826 Committed r52135: <http://trac.webkit.org/changeset/52135> 171712 5 commit-queue 2009-12-14 22:01:08 -0800 All reviewed patches have been landed. Closing bug. 44826 2009-12-14 15:46:57 -0800 2009-12-14 22:01:02 -0800 Patch bug-32531-20091214154656.patch text/plain 14234 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5M2NjNGZhLi5jZmYzNGM4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMTIt MTQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgQ3JlZGVudGlhbCBoYW5kbGluZyBvdXQg aW50byBhIHNlcGFyYXRlIG1vZHVsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI1MzEKKworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWd6aWxs YS5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY3JlZGVudGlhbHMucHk6IEFkZGVkLgor ICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jcmVkZW50aWFsc191bml0dGVzdC5weTogQWRkZWQu CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXVuaXR0ZXN0czoKKwogMjAwOS0xMi0xNCAg U2ltb24gSGF1c21hbm4gIDxoYXVzbWFubkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEhvbGdlciBGcmV5dGhlci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5w eQppbmRleCBiZTc4NTQ0Li5hNTY3M2FhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1 Z3ppbGxhLnB5CkBAIC0yOSw4ICsyOSw2IEBACiAjCiAjIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUg Zm9yIGludGVyYWN0aW5nIHdpdGggQnVnemlsbGEKIAotaW1wb3J0IGdldHBhc3MKLWltcG9ydCBw bGF0Zm9ybQogaW1wb3J0IHJlCiBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHVybGxpYjIKQEAg LTQwLDYgKzM4LDcgQEAgZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUgIyB1c2VkIGluIHRp bWVzdGFtcCgpCiAjIEltcG9ydCBXZWJLaXQtc3BlY2lmaWMgbW9kdWxlcy4KIGZyb20gbW9kdWxl cy5sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nCiBmcm9tIG1vZHVsZXMuY29tbWl0dGVycyBpbXBv cnQgQ29tbWl0dGVyTGlzdAorZnJvbSBtb2R1bGVzLmNyZWRlbnRpYWxzIGltcG9ydCBDcmVkZW50 aWFscwogCiAjIFdlYktpdCBpbmNsdWRlcyBhIGJ1aWx0IGNvcHkgb2YgQmVhdXRpZnVsU291cCBp biBTY3JpcHRzL21vZHVsZXMKICMgc28gdGhpcyBpbXBvcnQgc2hvdWxkIGFsd2F5cyBzdWNjZWVk LgpAQCAtNTksMzkgKzU4LDYgQEAgaHR0cDovL3d3d3NlYXJjaC5zb3VyY2Vmb3JnZS5uZXQvbWVj aGFuaXplLwogIiIiCiAgICAgZXhpdCgxKQogCi1kZWYgY3JlZGVudGlhbHNfZnJvbV9naXQoKToK LSAgICByZXR1cm4gW3JlYWRfY29uZmlnKCJ1c2VybmFtZSIpLCByZWFkX2NvbmZpZygicGFzc3dv cmQiKV0KLQotZGVmIGNyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4odXNlcm5hbWU9Tm9uZSk6Ci0g ICAgaWYgbm90IGlzX21hY19vc194KCk6Ci0gICAgICAgIHJldHVybiBbdXNlcm5hbWUsIE5vbmVd Ci0KLSAgICBjb21tYW5kID0gIi91c3IvYmluL3NlY3VyaXR5ICVzIC1nIC1zICVzIiAlICgiZmlu ZC1pbnRlcm5ldC1wYXNzd29yZCIsIEJ1Z3ppbGxhLmJ1Z19zZXJ2ZXJfaG9zdCkKLSAgICBpZiB1 c2VybmFtZToKLSAgICAgICAgY29tbWFuZCArPSAiIC1hICVzIiAlIHVzZXJuYW1lCi0KLSAgICBs b2coJ1JlYWRpbmcgS2V5Y2hhaW4gZm9yICVzIGFjY291bnQgYW5kIHBhc3N3b3JkLiAgQ2xpY2sg IkFsbG93IiB0byBjb250aW51ZS4uLicgJSBCdWd6aWxsYS5idWdfc2VydmVyX2hvc3QpCi0gICAg a2V5Y2hhaW5fcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oY29tbWFuZCwgc3Rkb3V0PXN1YnBy b2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VULCBzaGVsbD1UcnVlKQotICAgIHZh bHVlID0ga2V5Y2hhaW5fcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCi0gICAgZXhpdF9jb2RlID0g a2V5Y2hhaW5fcHJvY2Vzcy53YWl0KCkKLQotICAgIGlmIGV4aXRfY29kZToKLSAgICAgICAgcmV0 dXJuIFt1c2VybmFtZSwgTm9uZV0KLQotICAgIG1hdGNoID0gcmUuc2VhcmNoKCdeXHMqImFjY3Qi PGJsb2I+PSIoP1A8dXNlcm5hbWU+LispIicsIHZhbHVlLCByZS5NVUxUSUxJTkUpCi0gICAgaWYg bWF0Y2g6Ci0gICAgICAgIHVzZXJuYW1lID0gbWF0Y2guZ3JvdXAoJ3VzZXJuYW1lJykKLQotICAg IHBhc3N3b3JkID0gTm9uZQotICAgIG1hdGNoID0gcmUuc2VhcmNoKCdecGFzc3dvcmQ6ICIoP1A8 cGFzc3dvcmQ+LispIicsIHZhbHVlLCByZS5NVUxUSUxJTkUpCi0gICAgaWYgbWF0Y2g6Ci0gICAg ICAgIHBhc3N3b3JkID0gbWF0Y2guZ3JvdXAoJ3Bhc3N3b3JkJykKLQotICAgIHJldHVybiBbdXNl cm5hbWUsIHBhc3N3b3JkXQotCi1kZWYgaXNfbWFjX29zX3goKToKLSAgICByZXR1cm4gcGxhdGZv cm0ubWFjX3ZlcigpWzBdCi0KIGRlZiBwYXJzZV9idWdfaWQobWVzc2FnZSk6CiAgICAgbWF0Y2gg PSByZS5zZWFyY2goImh0dHBcOi8vd2Via2l0XC5vcmcvYi8oP1A8YnVnX2lkPlxkKykiLCBtZXNz YWdlKQogICAgIGlmIG1hdGNoOgpAQCAtMTAxLDI5ICs2Nyw2IEBAIGRlZiBwYXJzZV9idWdfaWQo bWVzc2FnZSk6CiAgICAgICAgIHJldHVybiBpbnQobWF0Y2guZ3JvdXAoJ2J1Z19pZCcpKQogICAg IHJldHVybiBOb25lCiAKLSMgRklYTUU6IFRoaXMgc2hvdWxkIG5vdCBkZXBlbmQgb24gZ2l0IGZv ciBjb25maWcgc3RvcmFnZQotZGVmIHJlYWRfY29uZmlnKGtleSk6Ci0gICAgIyBOZWVkIGEgd2F5 IHRvIHJlYWQgZnJvbSBzdm4gdG9vCi0gICAgY29uZmlnX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBv cGVuKCJnaXQgY29uZmlnIC0tZ2V0IGJ1Z3ppbGxhLiVzIiAlIGtleSwgc3Rkb3V0PXN1YnByb2Nl c3MuUElQRSwgc2hlbGw9VHJ1ZSkKLSAgICB2YWx1ZSA9IGNvbmZpZ19wcm9jZXNzLmNvbW11bmlj YXRlKClbMF0KLSAgICByZXR1cm5fY29kZSA9IGNvbmZpZ19wcm9jZXNzLndhaXQoKQotCi0gICAg aWYgcmV0dXJuX2NvZGU6Ci0gICAgICAgIHJldHVybiBOb25lCi0gICAgcmV0dXJuIHZhbHVlLnJz dHJpcCgnXG4nKQotCi1kZWYgcmVhZF9jcmVkZW50aWFscygpOgotICAgICh1c2VybmFtZSwgcGFz c3dvcmQpID0gY3JlZGVudGlhbHNfZnJvbV9naXQoKQotCi0gICAgaWYgbm90IHVzZXJuYW1lIG9y IG5vdCBwYXNzd29yZDoKLSAgICAgICAgKHVzZXJuYW1lLCBwYXNzd29yZCkgPSBjcmVkZW50aWFs c19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQotCi0gICAgaWYgbm90IHVzZXJuYW1lOgotICAgICAg ICB1c2VybmFtZSA9IHJhd19pbnB1dCgiQnVnemlsbGEgbG9naW46ICIpCi0gICAgaWYgbm90IHBh c3N3b3JkOgotICAgICAgICBwYXNzd29yZCA9IGdldHBhc3MuZ2V0cGFzcygiQnVnemlsbGEgcGFz c3dvcmQgZm9yICVzOiAiICUgdXNlcm5hbWUpCi0KLSAgICByZXR1cm4gW3VzZXJuYW1lLCBwYXNz d29yZF0KIAogZGVmIHRpbWVzdGFtcCgpOgogICAgIHJldHVybiBkYXRldGltZS5ub3coKS5zdHJm dGltZSgiJVklbSVkJUglTSVTIikKQEAgLTEzMyw3ICs3Niw3IEBAIGNsYXNzIEJ1Z3ppbGxhRXJy b3IoRXhjZXB0aW9uKToKICAgICBwYXNzCiAKIAotY2xhc3MgQnVnemlsbGE6CitjbGFzcyBCdWd6 aWxsYShvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkcnlydW49RmFsc2UsIGNvbW1p dHRlcnM9Q29tbWl0dGVyTGlzdCgpKToKICAgICAgICAgc2VsZi5kcnlydW4gPSBkcnlydW4KICAg ICAgICAgc2VsZi5hdXRoZW50aWNhdGVkID0gRmFsc2UKQEAgLTM3MCw3ICszMTMsNyBAQCBjbGFz cyBCdWd6aWxsYToKICAgICAgICAgICAgIHNlbGYuYXV0aGVudGljYXRlZCA9IFRydWUKICAgICAg ICAgICAgIHJldHVybgogCi0gICAgICAgICh1c2VybmFtZSwgcGFzc3dvcmQpID0gcmVhZF9jcmVk ZW50aWFscygpCisgICAgICAgICh1c2VybmFtZSwgcGFzc3dvcmQpID0gQ3JlZGVudGlhbHMoc2Vs Zi5idWdfc2VydmVyX2hvc3QsIGdpdF9wcmVmaXg9ImJ1Z3ppbGxhIikucmVhZF9jcmVkZW50aWFs cygpCiAKICAgICAgICAgbG9nKCJMb2dnaW5nIGluIGFzICVzLi4uIiAlIHVzZXJuYW1lKQogICAg ICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLmJ1Z19zZXJ2ZXJfdXJsICsgImluZGV4LmNnaT9H b0FoZWFkQW5kTG9nSW49MSIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY3JlZGVudGlhbHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3JlZGVudGlh bHMucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjIyNjIyOAotLS0gL2Rl di9udWxsCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcmVkZW50aWFscy5weQpA QCAtMCwwICsxLDkxIEBACisjIENvcHlyaWdodCAoYykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKGMpIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorIyAKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIyAK KyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhl IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQor IyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4g bm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9y c2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRo b3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMgCisjIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMK KyMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENP TlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LAorIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VAorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyMKKyMgUHl0aG9uIG1vZHVsZSBmb3Ig cmVhZGluZyBzdG9yZWQgd2ViIGNyZWRlbnRpYWxzIGZyb20gdGhlIE9TLgorCitpbXBvcnQgZ2V0 cGFzcworaW1wb3J0IHBsYXRmb3JtCitpbXBvcnQgcmUKKworZnJvbSBtb2R1bGVzLmV4ZWN1dGl2 ZSBpbXBvcnQgRXhlY3V0aXZlCitmcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQgbG9nCisKK2Ns YXNzIENyZWRlbnRpYWxzKG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIGdp dF9wcmVmaXg9Tm9uZSwgZXhlY3V0aXZlPU5vbmUpOgorICAgICAgICBzZWxmLmhvc3QgPSBob3N0 CisgICAgICAgIHNlbGYuZ2l0X3ByZWZpeCA9IGdpdF9wcmVmaXgKKyAgICAgICAgc2VsZi5leGVj dXRpdmUgPSBleGVjdXRpdmUgb3IgRXhlY3V0aXZlKCkKKworICAgIGRlZiBfY3JlZGVudGlhbHNf ZnJvbV9naXQoc2VsZik6CisgICAgICAgIHJldHVybiBbc2VsZi5fcmVhZF9naXRfY29uZmlnKCJ1 c2VybmFtZSIpLCBzZWxmLl9yZWFkX2dpdF9jb25maWcoInBhc3N3b3JkIildCisKKyAgICBkZWYg X3JlYWRfZ2l0X2NvbmZpZyhzZWxmLCBrZXkpOgorICAgICAgICBjb25maWdfa2V5ID0gIiVzLiVz IiAlIChzZWxmLmdpdF9wcmVmaXgsIGtleSkgaWYgc2VsZi5naXRfcHJlZml4IGVsc2Uga2V5Cisg ICAgICAgIHJldHVybiBzZWxmLmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbImdpdCIsICJjb25maWci LCAiLS1nZXQiLCBjb25maWdfa2V5XSwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3JlX2Vy cm9yKS5yc3RyaXAoJ1xuJykKKworICAgIGRlZiBfa2V5Y2hhaW5fdmFsdWVfd2l0aF9sYWJlbChz ZWxmLCBsYWJlbCwgc291cmNlX3RleHQpOgorICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiJXNc Iig/UDx2YWx1ZT4uKylcIiIgJSBsYWJlbCwgc291cmNlX3RleHQsIHJlLk1VTFRJTElORSkKKyAg ICAgICAgaWYgbWF0Y2g6CisgICAgICAgICAgICByZXR1cm4gbWF0Y2guZ3JvdXAoJ3ZhbHVlJykK KworICAgIGRlZiBfaXNfbWFjX29zX3goc2VsZik6CisgICAgICAgIHJldHVybiBwbGF0Zm9ybS5t YWNfdmVyKClbMF0KKworICAgIGRlZiBfcGFyc2Vfc2VjdXJpdHlfdG9vbF9vdXRwdXQoc2VsZiwg c2VjdXJpdHlfb3V0cHV0KToKKyAgICAgICAgdXNlcm5hbWUgPSBzZWxmLl9rZXljaGFpbl92YWx1 ZV93aXRoX2xhYmVsKCJeXHMqXCJhY2N0XCI8YmxvYj49Iiwgc2VjdXJpdHlfb3V0cHV0KQorICAg ICAgICBwYXNzd29yZCA9IHNlbGYuX2tleWNoYWluX3ZhbHVlX3dpdGhfbGFiZWwoIl5wYXNzd29y ZDogIiwgc2VjdXJpdHlfb3V0cHV0KQorICAgICAgICByZXR1cm4gW3VzZXJuYW1lLCBwYXNzd29y ZF0KKworICAgIGRlZiBfcnVuX3NlY3VyaXR5X3Rvb2woc2VsZiwgdXNlcm5hbWU9Tm9uZSk6Cisg ICAgICAgIHNlY3VyaXR5X2NvbW1hbmQgPSBbIi91c3IvYmluL3NlY3VyaXR5IiwgImZpbmQtaW50 ZXJuZXQtcGFzc3dvcmQiLCAiLWciLCAiLXMiLCBzZWxmLmhvc3RdCisgICAgICAgIGlmIHVzZXJu YW1lOgorICAgICAgICAgICAgc2VjdXJpdHlfY29tbWFuZCArPSBbIi1hIiwgdXNlcm5hbWVdCisK KyAgICAgICAgbG9nKCJSZWFkaW5nIEtleWNoYWluIGZvciAlcyBhY2NvdW50IGFuZCBwYXNzd29y ZC4gIENsaWNrIFwiQWxsb3dcIiB0byBjb250aW51ZS4uLiIgJSBzZWxmLmhvc3QpCisgICAgICAg IHJldHVybiBzZWxmLmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChzZWN1cml0eV9jb21tYW5kKQorCisg ICAgZGVmIF9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKHNlbGYsIHVzZXJuYW1lPU5vbmUpOgor ICAgICAgICBpZiBub3Qgc2VsZi5faXNfbWFjX29zX3goKToKKyAgICAgICAgICAgIHJldHVybiBb dXNlcm5hbWUsIE5vbmVdCisKKyAgICAgICAgc2VjdXJpdHlfb3V0cHV0ID0gc2VsZi5fcnVuX3Nl Y3VyaXR5X3Rvb2wodXNlcm5hbWUpCisgICAgICAgIHJldHVybiBzZWxmLl9wYXJzZV9zZWN1cml0 eV90b29sX291dHB1dChzZWN1cml0eV9vdXRwdXQpCisKKyAgICBkZWYgcmVhZF9jcmVkZW50aWFs cyhzZWxmKToKKyAgICAgICAgKHVzZXJuYW1lLCBwYXNzd29yZCkgPSBzZWxmLl9jcmVkZW50aWFs c19mcm9tX2dpdCgpCisKKyAgICAgICAgaWYgbm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29yZDoK KyAgICAgICAgICAgICh1c2VybmFtZSwgcGFzc3dvcmQpID0gc2VsZi5fY3JlZGVudGlhbHNfZnJv bV9rZXljaGFpbih1c2VybmFtZSkKKworICAgICAgICBpZiBub3QgdXNlcm5hbWU6CisgICAgICAg ICAgICB1c2VybmFtZSA9IHJhd19pbnB1dCgiJXMgbG9naW46ICIgJSBzZWxmLmhvc3QpCisgICAg ICAgIGlmIG5vdCBwYXNzd29yZDoKKyAgICAgICAgICAgIHBhc3N3b3JkID0gZ2V0cGFzcy5nZXRw YXNzKCIlcyBwYXNzd29yZCBmb3IgJXM6ICIgJSAoc2VsZi5ob3N0LCB1c2VybmFtZSkpCisKKyAg ICAgICAgcmV0dXJuIFt1c2VybmFtZSwgcGFzc3dvcmRdCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMjBkNWJmMwotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvbW9kdWxlcy9jcmVkZW50aWFsc191bml0dGVzdC5weQpAQCAtMCwwICsxLDEwNiBA QAorIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAqIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24u CisjICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9m IGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHBy b2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJp b3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJ TUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBM SU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF CisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCB1bml0dGVzdAorZnJvbSBtb2R1bGVzLmNyZWRlbnRp YWxzIGltcG9ydCBDcmVkZW50aWFscworZnJvbSBtb2R1bGVzLmV4ZWN1dGl2ZSBpbXBvcnQgRXhl Y3V0aXZlCitmcm9tIG1vZHVsZXMub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQor ZnJvbSBtb2R1bGVzLm1vY2sgaW1wb3J0IE1vY2sKKworY2xhc3MgQ3JlZGVudGlhbHNUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKKyAgICBleGFtcGxlX3NlY3VyaXR5X291dHB1dCA9ICIiImtleWNo YWluOiAiL1VzZXJzL3Rlc3QvTGlicmFyeS9LZXljaGFpbnMvbG9naW4ua2V5Y2hhaW4iCitjbGFz czogImluZXQiCithdHRyaWJ1dGVzOgorICAgIDB4MDAwMDAwMDcgPGJsb2I+PSJidWdzLndlYmtp dC5vcmcgKHRlc3RAd2Via2l0Lm9yZykiCisgICAgMHgwMDAwMDAwOCA8YmxvYj49PE5VTEw+Cisg ICAgImFjY3QiPGJsb2I+PSJ0ZXN0QHdlYmtpdC5vcmciCisgICAgImF0eXAiPGJsb2I+PSJmb3Jt IgorICAgICJjZGF0Ijx0aW1lZGF0ZT49MHgzMjMwMzAzOTMwMzgzMjM1MzIzMzM1MzIzMTM2NUEw MCAgIjIwMDkwODI1MjM1MjE2WlwwMDAiCisgICAgImNydHIiPHVpbnQzMj49PE5VTEw+CisgICAg ImN1c2kiPHNpbnQzMj49PE5VTEw+CisgICAgImRlc2MiPGJsb2I+PSJXZWIgZm9ybSBwYXNzd29y ZCIKKyAgICAiaWNtdCI8YmxvYj49ImRlZmF1bHQiCisgICAgImludmkiPHNpbnQzMj49PE5VTEw+ CisgICAgIm1kYXQiPHRpbWVkYXRlPj0weDMyMzAzMDM5MzAzOTMwMzkzMTM3MzIzNjM1MzE1QTAw ICAiMjAwOTA5MDkxNzI2NTFaXDAwMCIKKyAgICAibmVnYSI8c2ludDMyPj08TlVMTD4KKyAgICAi cGF0aCI8YmxvYj49PE5VTEw+CisgICAgInBvcnQiPHVpbnQzMj49MHgwMDAwMDAwMCAKKyAgICAi cHJvdCI8YmxvYj49PE5VTEw+CisgICAgInB0Y2wiPHVpbnQzMj49Imh0cHMiCisgICAgInNjcnAi PHNpbnQzMj49PE5VTEw+CisgICAgInNkbW4iPGJsb2I+PTxOVUxMPgorICAgICJzcnZyIjxibG9i Pj0iYnVncy53ZWJraXQub3JnIgorICAgICJ0eXBlIjx1aW50MzI+PTxOVUxMPgorcGFzc3dvcmQ6 ICJTRUNSRVRTQVVDRSIKKyIiIgorCisgICAgZGVmIHRlc3Rfa2V5Y2hhaW5fbG9va3VwX29uX25v bl9tYWMoc2VsZik6CisgICAgICAgIGNsYXNzIEZha2VDcmVkZW50aWFscyhDcmVkZW50aWFscyk6 CisgICAgICAgICAgICBkZWYgX2lzX21hY19vc194KHNlbGYpOgorICAgICAgICAgICAgICAgIHJl dHVybiBGYWxzZQorICAgICAgICBjcmVkZW50aWFscyA9IEZha2VDcmVkZW50aWFscygiYnVncy53 ZWJraXQub3JnIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjcmVkZW50aWFscy5faXNfbWFj X29zX3goKSwgRmFsc2UpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY3JlZGVudGlhbHMuX2Ny ZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4oImZvbyIpLCBbImZvbyIsIE5vbmVdKQorCisgICAgZGVm IHRlc3Rfc2VjdXJpdHlfb3V0cHV0X3BhcnNlKHNlbGYpOgorICAgICAgICBjcmVkZW50aWFscyA9 IENyZWRlbnRpYWxzKCJidWdzLndlYmtpdC5vcmciKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNyZWRlbnRpYWxzLl9wYXJzZV9zZWN1cml0eV90b29sX291dHB1dChzZWxmLmV4YW1wbGVfc2Vj dXJpdHlfb3V0cHV0KSwgWyJ0ZXN0QHdlYmtpdC5vcmciLCAiU0VDUkVUU0FVQ0UiXSkKKworICAg IGRlZiBfYXNzZXJ0X3NlY3VyaXR5X2NhbGwoc2VsZiwgdXNlcm5hbWU9Tm9uZSk6CisgICAgICAg IGV4ZWN1dGl2ZV9tb2NrID0gTW9jaygpCisgICAgICAgIGNyZWRlbnRpYWxzID0gQ3JlZGVudGlh bHMoImV4YW1wbGUuY29tIiwgZXhlY3V0aXZlPWV4ZWN1dGl2ZV9tb2NrKQorCisgICAgICAgIG91 dHB1dCA9IE91dHB1dENhcHR1cmUoKQorICAgICAgICBvdXRwdXQuY2FwdHVyZV9vdXRwdXQoKQor ICAgICAgICBjcmVkZW50aWFscy5fcnVuX3NlY3VyaXR5X3Rvb2wodXNlcm5hbWUpCisgICAgICAg IChzdGRvdXRfb3V0cHV0LCBzdGRlcnJfb3V0cHV0KSA9IG91dHB1dC5yZXN0b3JlX291dHB1dCgp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Rkb3V0X291dHB1dCwgIiIpCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoc3RkZXJyX291dHB1dCwgIlJlYWRpbmcgS2V5Y2hhaW4gZm9yIGV4YW1w bGUuY29tIGFjY291bnQgYW5kIHBhc3N3b3JkLiAgQ2xpY2sgXCJBbGxvd1wiIHRvIGNvbnRpbnVl Li4uXG4iKQorCisgICAgICAgIHNlY3VyaXR5X2FyZ3MgPSBbIi91c3IvYmluL3NlY3VyaXR5Iiwg ImZpbmQtaW50ZXJuZXQtcGFzc3dvcmQiLCAiLWciLCAiLXMiLCAiZXhhbXBsZS5jb20iXQorICAg ICAgICBpZiB1c2VybmFtZToKKyAgICAgICAgICAgIHNlY3VyaXR5X2FyZ3MgKz0gWyItYSIsIHVz ZXJuYW1lXQorICAgICAgICBleGVjdXRpdmVfbW9jay5ydW5fY29tbWFuZC5hc3NlcnRfY2FsbGVk X3dpdGgoc2VjdXJpdHlfYXJncykKKworICAgIGRlZiB0ZXN0X3NlY3VyaXR5X2NhbGxzKHNlbGYp OgorICAgICAgICBzZWxmLl9hc3NlcnRfc2VjdXJpdHlfY2FsbCgpCisgICAgICAgIHNlbGYuX2Fz c2VydF9zZWN1cml0eV9jYWxsKHVzZXJuYW1lPSJmb28iKQorCisgICAgZGVmIHRlc3RfZ2l0X2Nv bmZpZ19jYWxscyhzZWxmKToKKyAgICAgICAgZXhlY3V0aXZlX21vY2sgPSBNb2NrKCkKKyAgICAg ICAgY3JlZGVudGlhbHMgPSBDcmVkZW50aWFscygiZXhhbXBsZS5jb20iLCBleGVjdXRpdmU9ZXhl Y3V0aXZlX21vY2spCisgICAgICAgIGNyZWRlbnRpYWxzLl9yZWFkX2dpdF9jb25maWcoImZvbyIp CisgICAgICAgIGV4ZWN1dGl2ZV9tb2NrLnJ1bl9jb21tYW5kLmFzc2VydF9jYWxsZWRfd2l0aChb ImdpdCIsICJjb25maWciLCAiLS1nZXQiLCAiZm9vIl0sIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZl Lmlnbm9yZV9lcnJvcikKKworICAgICAgICBjcmVkZW50aWFscyA9IENyZWRlbnRpYWxzKCJleGFt cGxlLmNvbSIsIGdpdF9wcmVmaXg9InRlc3RfcHJlZml4IiwgZXhlY3V0aXZlPWV4ZWN1dGl2ZV9t b2NrKQorICAgICAgICBjcmVkZW50aWFscy5fcmVhZF9naXRfY29uZmlnKCJmb28iKQorICAgICAg ICBleGVjdXRpdmVfbW9jay5ydW5fY29tbWFuZC5hc3NlcnRfY2FsbGVkX3dpdGgoWyJnaXQiLCAi Y29uZmlnIiwgIi0tZ2V0IiwgInRlc3RfcHJlZml4LmZvbyJdLCBlcnJvcl9oYW5kbGVyPUV4ZWN1 dGl2ZS5pZ25vcmVfZXJyb3IpCisKKworaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKKyAgICB1 bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtp dC11bml0dGVzdHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdW5pdHRlc3RzCmlu ZGV4IDM0ODcyOTkuLjU0NTkxNjggMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVu LXdlYmtpdC11bml0dGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXVu aXR0ZXN0cwpAQCAtMzcsNiArMzcsNyBAQCBmcm9tIG1vZHVsZXMuY29tbWFuZHMudXBsb2FkX3Vu aXR0ZXN0IGltcG9ydCAqCiBmcm9tIG1vZHVsZXMuY29tbWFuZHMucXVlcmllc191bml0dGVzdCBp bXBvcnQgKgogZnJvbSBtb2R1bGVzLmNvbW1hbmRzLnF1ZXVlc191bml0dGVzdCBpbXBvcnQgKgog ZnJvbSBtb2R1bGVzLmNvbW1pdHRlcnNfdW5pdHRlc3QgaW1wb3J0ICoKK2Zyb20gbW9kdWxlcy5j cmVkZW50aWFsc191bml0dGVzdCBpbXBvcnQgKgogZnJvbSBtb2R1bGVzLmNwcF9zdHlsZV91bml0 dGVzdCBpbXBvcnQgKgogZnJvbSBtb2R1bGVzLmRpZmZfcGFyc2VyX3VuaXR0ZXN0IGltcG9ydCAq CiBmcm9tIG1vZHVsZXMubG9nZ2luZ191bml0dGVzdCBpbXBvcnQgKgo=