92532 2012-07-27 12:14:16 -0700 webkit-patch: system keyring is not used to read my password 2012-07-30 18:46:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 a.renevier a.renevier abarth dpranke ojan webkit.review.bot oldest_to_newest 680934 0 a.renevier 2012-07-27 12:14:16 -0700 Hi, I'm using ubuntu. I haven't set username and password in git options, neither in environment. when I upload a patch to bugzilla (with webkit-patch upload), I'm asked if I want to store my username and password in the system keyring. I say yes, and the credentials are stored. But those credentials are not used next time I use webkit-patch upload. 680949 1 a.renevier 2012-07-27 12:20:58 -0700 That's because in Credentials.read_credentials, we try to read password from keyring before prompting for username. Instead, if username was not read from environment, git, or keychain, we could prompt for username, and try to read password from keyring after. 680952 2 155020 a.renevier 2012-07-27 12:23:04 -0700 Created attachment 155020 patch proposal 680996 3 155020 dpranke 2012-07-27 12:52:04 -0700 Comment on attachment 155020 patch proposal Seems reasonable to me. Is it possible to write a test for this? 682099 4 a.renevier 2012-07-30 09:51:41 -0700 (In reply to comment #3) > (From update of attachment 155020 [details]) > Seems reasonable to me. Is it possible to write a test for this? I don't really known how to write a test for that: if we want to create unittest, at some point, the User.prompt() method will block them. Is there a way to override User.prompt() with a mock object ? 682104 5 abarth 2012-07-30 09:59:56 -0700 Yes. If you use a MockHost object, the User object will be mocked out for you by default. 682108 6 abarth 2012-07-30 10:01:10 -0700 You can grep for "MockUser" to see how it gets used. Many existing tests use it. 682280 7 155337 a.renevier 2012-07-30 12:21:17 -0700 Created attachment 155337 updated patch with test 682283 8 155337 dpranke 2012-07-30 12:27:42 -0700 Comment on attachment 155337 updated patch with test View in context: https://bugs.webkit.org/attachment.cgi?id=155337&action=review > Tools/Scripts/webkitpy/common/net/credentials.py:136 > + def read_credentials(self, User=User): the host has a user field, so you should be able to just say self.host.user.prompt(), and then down in your test you can create a credentials object, pass it a mock host, and override the prompt method. That should cut down on the scaffolding a fair amount. 682296 9 a.renevier 2012-07-30 12:44:22 -0700 (In reply to comment #8) > (From update of attachment 155337 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155337&action=review > > > Tools/Scripts/webkitpy/common/net/credentials.py:136 > > + def read_credentials(self, User=User): > > the host has a user field, so you should be able to just say self.host.user.prompt(), and then down in your test you can create a credentials object, pass it a mock host, and override the prompt method. That should cut down on the scaffolding a fair amount. In Credentials, host is just a string 682306 10 155337 dpranke 2012-07-30 12:58:57 -0700 Comment on attachment 155337 updated patch with test View in context: https://bugs.webkit.org/attachment.cgi?id=155337&action=review >>> Tools/Scripts/webkitpy/common/net/credentials.py:136 >>> + def read_credentials(self, User=User): >> >> the host has a user field, so you should be able to just say self.host.user.prompt(), and then down in your test you can create a credentials object, pass it a mock host, and override the prompt method. That should cut down on the scaffolding a fair amount. > > In Credentials, host is just a string ugh, you're right. Okay, your approach is fine for now until we can clean that up. this object shouldn't be creating executives and users directly. one nit: parameters should be lowercased, so user=User. 682467 11 155383 a.renevier 2012-07-30 15:31:16 -0700 Created attachment 155383 same patch; typo fixed 682483 12 155383 dpranke 2012-07-30 15:54:51 -0700 Comment on attachment 155383 same patch; typo fixed thanks! 682607 13 155383 webkit.review.bot 2012-07-30 18:46:00 -0700 Comment on attachment 155383 same patch; typo fixed Clearing flags on attachment: 155383 Committed r124140: <http://trac.webkit.org/changeset/124140> 682608 14 webkit.review.bot 2012-07-30 18:46:04 -0700 All reviewed patches have been landed. Closing bug. 155020 2012-07-27 12:23:04 -0700 2012-07-30 12:21:15 -0700 patch proposal bug-92532-20120727122251.patch text/plain 1870 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWI0NDY5ZDVlOTU3NTk3ZGIyZmNkOTk5ODhkYzcwNjBi NWQ3NjEzYy4uYTE5YTQ1ZmMxMmE5NDc3ZWY5OWMzNDI3Y2NhNjJlNDZiZWVmNWQ1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTA3LTI3ICBBcm5hdWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgd2Via2l0LXBhdGNoOiBzeXN0ZW0ga2V5cmluZyBpcyBub3QgdXNl ZCB0byByZWFkIG15IHBhc3N3b3JkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MjUzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEluIGNhc2Ugbm8gdXNlcm5hbWUgY2FuIGJlIGZldGNoZWQgZnJvbSBlbnZp cm9ubWVudCwgZ2l0IG9yIGtleWNoYWluLAorICAgICAgICBwcm9tcHQgZm9yIHVzZXJuYW1lLCBh bmQgdHJ5IHRvIGdldCBwYXNzd29yZCBmcm9tIGtleXJpbmcgYXNzb2NpYXRlZAorICAgICAgICB3 aXRoIHRoYXQgdXNlcm5hbWUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvY3JlZGVudGlhbHMucHk6CisgICAgICAgIChDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxz KToKKwogMjAxMi0wNy0yNSAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4K IAogICAgICAgICBNZWRpYVN0cmVhbSBBUEk6IFVwZGF0ZSBNZWRpYVN0cmVhbVRyYWNrIHRvIG1h dGNoIHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvY3JlZGVudGlhbHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvY3JlZGVudGlhbHMucHkKaW5kZXggZDc2NDA1YjM5NmM5YzM1OWNiMTE1NTMwNGIzMGYz YjA1NTEwYmE3NC4uZDRlNDc0M2I1NTBlODZjODE0YmEyNzcwNWQ1MjYwZWU4MDA5N2JkZSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFscy5weQpA QCAtMTQyLDExICsxNDIsMTIgQEAgY2xhc3MgQ3JlZGVudGlhbHMob2JqZWN0KToKICAgICAgICAg aWYgbm90IHVzZXJuYW1lIG9yIG5vdCBwYXNzd29yZDoKICAgICAgICAgICAgIHVzZXJuYW1lLCBw YXNzd29yZCA9IHNlbGYuX2NyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4odXNlcm5hbWUpCiAKKyAg ICAgICAgaWYgbm90IHVzZXJuYW1lOgorICAgICAgICAgICAgdXNlcm5hbWUgPSBVc2VyLnByb21w dCgiJXMgbG9naW46ICIgJSBzZWxmLmhvc3QpCisKICAgICAgICAgaWYgdXNlcm5hbWUgYW5kIG5v dCBwYXNzd29yZCBhbmQgc2VsZi5fa2V5cmluZzoKICAgICAgICAgICAgIHBhc3N3b3JkID0gc2Vs Zi5fa2V5cmluZy5nZXRfcGFzc3dvcmQoc2VsZi5ob3N0LCB1c2VybmFtZSkKIAotICAgICAgICBp ZiBub3QgdXNlcm5hbWU6Ci0gICAgICAgICAgICB1c2VybmFtZSA9IFVzZXIucHJvbXB0KCIlcyBs b2dpbjogIiAlIHNlbGYuaG9zdCkKICAgICAgICAgaWYgbm90IHBhc3N3b3JkOgogICAgICAgICAg ICAgcGFzc3dvcmQgPSBVc2VyLnByb21wdF9wYXNzd29yZCgiJXMgcGFzc3dvcmQgZm9yICVzOiAi ICUgKHNlbGYuaG9zdCwgdXNlcm5hbWUpKQogICAgICAgICAgICAgc2VsZi5fb2ZmZXJfdG9fc3Rv cmVfY3JlZGVudGlhbHNfaW5fa2V5cmluZyh1c2VybmFtZSwgcGFzc3dvcmQpCg== 155337 2012-07-30 12:21:17 -0700 2012-07-30 15:31:14 -0700 updated patch with test bug-92532-20120730122101.patch text/plain 5331 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzOTExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGU4ZDZiNTZhYjBjMmZlZjA5NmYxZTllNzEyNGVhNmYx NzJiMmZlNC4uNGEzMjMxYjAzNWYxZmE2MjE2OTU2YmMxNzQ4Mzg3MmQ0NTU3NmI3MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA3LTMwICBBcm5hdWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgd2Via2l0LXBhdGNoOiBzeXN0ZW0ga2V5cmluZyBpcyBub3QgdXNl ZCB0byByZWFkIG15IHBhc3N3b3JkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MjUzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEluIGNhc2Ugbm8gdXNlcm5hbWUgY2FuIGJlIGZldGNoZWQgZnJvbSBlbnZp cm9ubWVudCwgZ2l0IG9yIGtleWNoYWluLAorICAgICAgICBwcm9tcHQgZm9yIHVzZXJuYW1lLCBh bmQgdHJ5IHRvIGdldCBwYXNzd29yZCBmcm9tIGtleXJpbmcgYXNzb2NpYXRlZAorICAgICAgICB3 aXRoIHRoYXQgdXNlcm5hbWUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvY3JlZGVudGlhbHMucHk6CisgICAgICAgIChDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxz KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5p dHRlc3QucHk6CisgICAgICAgICh0ZXN0X2tleXJpbmdfd2l0aG91dF9naXRfcmVwb19ub3Jfa2V5 Y2hhaW4pOgorICAgICAgICAodGVzdF9rZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNo YWluLk1vY2tLZXlyaW5nKToKKyAgICAgICAgKHRlc3Rfa2V5cmluZ193aXRob3V0X2dpdF9yZXBv X25vcl9rZXljaGFpbi5Nb2NrS2V5cmluZy5nZXRfcGFzc3dvcmQpOgorICAgICAgICAodGVzdF9r ZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VDcmVkZW50aWFscyk6Cisg ICAgICAgICh0ZXN0X2tleXJpbmdfd2l0aG91dF9naXRfcmVwb19ub3Jfa2V5Y2hhaW4uRmFrZUNy ZWRlbnRpYWxzLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKToKKyAgICAgICAgKHRlc3Rfa2V5 cmluZ193aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbi5GYWtlQ3JlZGVudGlhbHMuX2NyZWRl bnRpYWxzX2Zyb21fZW52aXJvbm1lbnQpOgorICAgICAgICAodGVzdF9rZXlyaW5nX3dpdGhvdXRf Z2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VVc2VyKToKKyAgICAgICAgKHRlc3Rfa2V5cmluZ193 aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbi5GYWtlVXNlci5wcm9tcHQpOgorICAgICAgICAo dGVzdF9rZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VVc2VyLnByb21w dF9wYXNzd29yZCk6CisKIDIwMTItMDctMjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhl LmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbV0syXVtXVFJdIExheW91dFRlc3RDb250cm9s bGVyLmRlbGl2ZXJXZWJJbnRlbnQoKSBuZWVkcyB0byBiZSBpbXBsZW1lbnRlZApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IGQ3NjQw NWIzOTZjOWMzNTljYjExNTUzMDRiMzBmM2IwNTUxMGJhNzQuLmMxN2RiMWE1M2U3ODU3OWE5OTg1 YTBmYTYzY2YyNjkwMjA4YzE5MzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9jcmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvY3JlZGVudGlhbHMucHkKQEAgLTEzMyw3ICsxMzMsNyBAQCBjbGFzcyBDcmVkZW50 aWFscyhvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIHNlbGYuX2tleXJpbmcu c2V0X3Bhc3N3b3JkKHNlbGYuaG9zdCwgdXNlcm5hbWUsIHBhc3N3b3JkKQogCi0gICAgZGVmIHJl YWRfY3JlZGVudGlhbHMoc2VsZik6CisgICAgZGVmIHJlYWRfY3JlZGVudGlhbHMoc2VsZiwgVXNl cj1Vc2VyKToKICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNf ZnJvbV9lbnZpcm9ubWVudCgpCiAgICAgICAgICMgRklYTUU6IFdlIGRvbid0IGN1cnJlbnRseSBz dXBwb3J0IHB1bGxpbmcgdGhlIHVzZXJuYW1lIGZyb20gb25lCiAgICAgICAgICMgc291cmNlIGFu ZCB0aGUgcGFzc3dvcmQgZnJvbSBhIHNlcGFyYXRlIHNvdXJjZS4KQEAgLTE0MiwxMSArMTQyLDEy IEBAIGNsYXNzIENyZWRlbnRpYWxzKG9iamVjdCk6CiAgICAgICAgIGlmIG5vdCB1c2VybmFtZSBv ciBub3QgcGFzc3dvcmQ6CiAgICAgICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9j cmVkZW50aWFsc19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQogCisgICAgICAgIGlmIG5vdCB1c2Vy bmFtZToKKyAgICAgICAgICAgIHVzZXJuYW1lID0gVXNlci5wcm9tcHQoIiVzIGxvZ2luOiAiICUg c2VsZi5ob3N0KQorCiAgICAgICAgIGlmIHVzZXJuYW1lIGFuZCBub3QgcGFzc3dvcmQgYW5kIHNl bGYuX2tleXJpbmc6CiAgICAgICAgICAgICBwYXNzd29yZCA9IHNlbGYuX2tleXJpbmcuZ2V0X3Bh c3N3b3JkKHNlbGYuaG9zdCwgdXNlcm5hbWUpCiAKLSAgICAgICAgaWYgbm90IHVzZXJuYW1lOgot ICAgICAgICAgICAgdXNlcm5hbWUgPSBVc2VyLnByb21wdCgiJXMgbG9naW46ICIgJSBzZWxmLmhv c3QpCiAgICAgICAgIGlmIG5vdCBwYXNzd29yZDoKICAgICAgICAgICAgIHBhc3N3b3JkID0gVXNl ci5wcm9tcHRfcGFzc3dvcmQoIiVzIHBhc3N3b3JkIGZvciAlczogIiAlIChzZWxmLmhvc3QsIHVz ZXJuYW1lKSkKICAgICAgICAgICAgIHNlbGYuX29mZmVyX3RvX3N0b3JlX2NyZWRlbnRpYWxzX2lu X2tleXJpbmcodXNlcm5hbWUsIHBhc3N3b3JkKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5CmluZGV4IDJhYjE2 MGM4ODdjMjg5YTVjYzU5MDRkMDQ4Mjg5MTk2ZjJmNTE0Y2MuLmE3OTdlM2QxYjczYzNkMjQyMzFl YTA2YTZhYzBhNWJiMWM4MDZkYzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL25ldC9jcmVkZW50aWFsc191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkKQEAgLTMyLDYgKzMyLDcg QEAgaW1wb3J0IHVuaXR0ZXN0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQuY3JlZGVudGlhbHMg aW1wb3J0IENyZWRlbnRpYWxzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZl IGltcG9ydCBFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0 dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0udXNl cl9tb2NrIGltcG9ydCBNb2NrVXNlcgogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm1vY2sgaW1w b3J0IE1vY2sKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMK IGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4 ZWN1dGl2ZQpAQCAtMTc5LDYgKzE4MCwzMyBAQCBwYXNzd29yZDogIlNFQ1JFVFNBVUNFIgogICAg ICAgICAgICAgIyBjcmVkZW50aWFsIHNvdXJjZSBjb3VsZCBiZSBhZmZlY3RlZCBieSB0aGUgdXNl cidzIGVudmlyb25tZW50LgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjcmVkZW50aWFs cy5yZWFkX2NyZWRlbnRpYWxzKCksICgidGVzdEB3ZWJraXQub3JnIiwgIk5PTU5PTU5PTSIpKQog CisgICAgZGVmIHRlc3Rfa2V5cmluZ193aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbihzZWxm KToKKyAgICAgICAgY2xhc3MgTW9ja0tleXJpbmcob2JqZWN0KToKKyAgICAgICAgICAgIGRlZiBn ZXRfcGFzc3dvcmQoc2VsZiwgaG9zdCwgdXNlcm5hbWUpOgorICAgICAgICAgICAgICAgIHJldHVy biAiTk9NTk9NTk9NIgorCisgICAgICAgIGNsYXNzIEZha2VDcmVkZW50aWFscyhNb2NrZWRDcmVk ZW50aWFscyk6CisgICAgICAgICAgICBkZWYgX2NyZWRlbnRpYWxzX2Zyb21fa2V5Y2hhaW4oc2Vs ZiwgdXNlcm5hbWUpOgorICAgICAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKKworICAg ICAgICAgICAgZGVmIF9jcmVkZW50aWFsc19mcm9tX2Vudmlyb25tZW50KHNlbGYpOgorICAgICAg ICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKKworICAgICAgICBjbGFzcyBGYWtlVXNlcihN b2NrVXNlcik6CisgICAgICAgICAgICBAY2xhc3NtZXRob2QKKyAgICAgICAgICAgIGRlZiBwcm9t cHQoY2xzLCBtZXNzYWdlLCByZXBlYXQ9MSwgcmF3X2lucHV0PXJhd19pbnB1dCk6CisgICAgICAg ICAgICAgICAgcmV0dXJuICJ0ZXN0QHdlYmtpdC5vcmciCisKKyAgICAgICAgICAgIEBjbGFzc21l dGhvZAorICAgICAgICAgICAgZGVmIHByb21wdF9wYXNzd29yZChjbHMsIG1lc3NhZ2UsIHJlcGVh dD0xLCByYXdfaW5wdXQ9cmF3X2lucHV0KToKKyAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRp b25FcnJvcigic2hvdWxkIG5vdCBwcm9tcHQgZm9yIHBhc3N3b3JkIikKKworICAgICAgICB3aXRo IF9UZW1wb3JhcnlEaXJlY3Rvcnkoc3VmZml4PSJub3RfYV9naXRfcmVwbyIpIGFzIHRlbXBfZGly X3BhdGg6CisgICAgICAgICAgICBjcmVkZW50aWFscyA9IEZha2VDcmVkZW50aWFscygiZmFrZS5o b3N0bmFtZSIsIGN3ZD10ZW1wX2Rpcl9wYXRoLCBrZXlyaW5nPU1vY2tLZXlyaW5nKCkpCisgICAg ICAgICAgICAjIEZJWE1FOiBVc2luZyByZWFkX2NyZWRlbnRpYWxzIGhlcmUgc2VlbXMgdG9vIGJy b2FkIGFzIGhpZ2hlci1wcmlvcml0eQorICAgICAgICAgICAgIyBjcmVkZW50aWFsIHNvdXJjZSBj b3VsZCBiZSBhZmZlY3RlZCBieSB0aGUgdXNlcidzIGVudmlyb25tZW50LgorICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKEZha2VVc2VyKSwg KCJ0ZXN0QHdlYmtpdC5vcmciLCAiTk9NTk9NTk9NIikpCisKIAogaWYgX19uYW1lX18gPT0gJ19f bWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkK 155383 2012-07-30 15:31:16 -0700 2012-07-30 18:46:00 -0700 same patch; typo fixed bug-92532-20120730153058.patch text/plain 5457 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MDg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTdjZGRiNjI0YWFmMGRjMjdjNTA3ZjMyN2QxOGQ2MDkw MDhjNGMyMy4uOGQ3NjYwZDg5ZTBlNzBiNmNiZTVkNjcxNGM5OWExMzY0YWEwM2JkNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA3LTMwICBBcm5hdWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgd2Via2l0LXBhdGNoOiBzeXN0ZW0ga2V5cmluZyBpcyBub3QgdXNl ZCB0byByZWFkIG15IHBhc3N3b3JkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MjUzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEluIGNhc2Ugbm8gdXNlcm5hbWUgY2FuIGJlIGZldGNoZWQgZnJvbSBlbnZp cm9ubWVudCwgZ2l0IG9yIGtleWNoYWluLAorICAgICAgICBwcm9tcHQgZm9yIHVzZXJuYW1lLCBh bmQgdHJ5IHRvIGdldCBwYXNzd29yZCBmcm9tIGtleXJpbmcgYXNzb2NpYXRlZAorICAgICAgICB3 aXRoIHRoYXQgdXNlcm5hbWUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvY3JlZGVudGlhbHMucHk6CisgICAgICAgIChDcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxz KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5p dHRlc3QucHk6CisgICAgICAgICh0ZXN0X2tleXJpbmdfd2l0aG91dF9naXRfcmVwb19ub3Jfa2V5 Y2hhaW4pOgorICAgICAgICAodGVzdF9rZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNo YWluLk1vY2tLZXlyaW5nKToKKyAgICAgICAgKHRlc3Rfa2V5cmluZ193aXRob3V0X2dpdF9yZXBv X25vcl9rZXljaGFpbi5Nb2NrS2V5cmluZy5nZXRfcGFzc3dvcmQpOgorICAgICAgICAodGVzdF9r ZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VDcmVkZW50aWFscyk6Cisg ICAgICAgICh0ZXN0X2tleXJpbmdfd2l0aG91dF9naXRfcmVwb19ub3Jfa2V5Y2hhaW4uRmFrZUNy ZWRlbnRpYWxzLl9jcmVkZW50aWFsc19mcm9tX2tleWNoYWluKToKKyAgICAgICAgKHRlc3Rfa2V5 cmluZ193aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbi5GYWtlQ3JlZGVudGlhbHMuX2NyZWRl bnRpYWxzX2Zyb21fZW52aXJvbm1lbnQpOgorICAgICAgICAodGVzdF9rZXlyaW5nX3dpdGhvdXRf Z2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VVc2VyKToKKyAgICAgICAgKHRlc3Rfa2V5cmluZ193 aXRob3V0X2dpdF9yZXBvX25vcl9rZXljaGFpbi5GYWtlVXNlci5wcm9tcHQpOgorICAgICAgICAo dGVzdF9rZXlyaW5nX3dpdGhvdXRfZ2l0X3JlcG9fbm9yX2tleWNoYWluLkZha2VVc2VyLnByb21w dF9wYXNzd29yZCk6CisKIDIwMTItMDctMzAgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgQWZ0ZXIgcjEyMzg5NSwgbmV3LXJ1bi13ZWJraXQtdGVzdHMgY2Fu IGZhaWwgd2l0aCBUeXBlRXJyb3Igd2hlbiBhIHRlc3QgY3Jhc2hlcwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CmluZGV4IGQ3NjQwNWIzOTZj OWMzNTljYjExNTUzMDRiMzBmM2IwNTUxMGJhNzQuLjExYjdhYzc1ZDg2ZmY2ZDIzNzhlZjMwZjAz YzI4ZDhmM2RlOTBlYzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9jcmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvY3JlZGVudGlhbHMucHkKQEAgLTEzMyw3ICsxMzMsNyBAQCBjbGFzcyBDcmVkZW50aWFscyhv YmplY3QpOgogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIHNlbGYuX2tleXJpbmcuc2V0X3Bh c3N3b3JkKHNlbGYuaG9zdCwgdXNlcm5hbWUsIHBhc3N3b3JkKQogCi0gICAgZGVmIHJlYWRfY3Jl ZGVudGlhbHMoc2VsZik6CisgICAgZGVmIHJlYWRfY3JlZGVudGlhbHMoc2VsZiwgdXNlcj1Vc2Vy KToKICAgICAgICAgdXNlcm5hbWUsIHBhc3N3b3JkID0gc2VsZi5fY3JlZGVudGlhbHNfZnJvbV9l bnZpcm9ubWVudCgpCiAgICAgICAgICMgRklYTUU6IFdlIGRvbid0IGN1cnJlbnRseSBzdXBwb3J0 IHB1bGxpbmcgdGhlIHVzZXJuYW1lIGZyb20gb25lCiAgICAgICAgICMgc291cmNlIGFuZCB0aGUg cGFzc3dvcmQgZnJvbSBhIHNlcGFyYXRlIHNvdXJjZS4KQEAgLTE0MiwxMyArMTQyLDE0IEBAIGNs YXNzIENyZWRlbnRpYWxzKG9iamVjdCk6CiAgICAgICAgIGlmIG5vdCB1c2VybmFtZSBvciBub3Qg cGFzc3dvcmQ6CiAgICAgICAgICAgICB1c2VybmFtZSwgcGFzc3dvcmQgPSBzZWxmLl9jcmVkZW50 aWFsc19mcm9tX2tleWNoYWluKHVzZXJuYW1lKQogCisgICAgICAgIGlmIG5vdCB1c2VybmFtZToK KyAgICAgICAgICAgIHVzZXJuYW1lID0gdXNlci5wcm9tcHQoIiVzIGxvZ2luOiAiICUgc2VsZi5o b3N0KQorCiAgICAgICAgIGlmIHVzZXJuYW1lIGFuZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tl eXJpbmc6CiAgICAgICAgICAgICBwYXNzd29yZCA9IHNlbGYuX2tleXJpbmcuZ2V0X3Bhc3N3b3Jk KHNlbGYuaG9zdCwgdXNlcm5hbWUpCiAKLSAgICAgICAgaWYgbm90IHVzZXJuYW1lOgotICAgICAg ICAgICAgdXNlcm5hbWUgPSBVc2VyLnByb21wdCgiJXMgbG9naW46ICIgJSBzZWxmLmhvc3QpCiAg ICAgICAgIGlmIG5vdCBwYXNzd29yZDoKLSAgICAgICAgICAgIHBhc3N3b3JkID0gVXNlci5wcm9t cHRfcGFzc3dvcmQoIiVzIHBhc3N3b3JkIGZvciAlczogIiAlIChzZWxmLmhvc3QsIHVzZXJuYW1l KSkKKyAgICAgICAgICAgIHBhc3N3b3JkID0gdXNlci5wcm9tcHRfcGFzc3dvcmQoIiVzIHBhc3N3 b3JkIGZvciAlczogIiAlIChzZWxmLmhvc3QsIHVzZXJuYW1lKSkKICAgICAgICAgICAgIHNlbGYu X29mZmVyX3RvX3N0b3JlX2NyZWRlbnRpYWxzX2luX2tleXJpbmcodXNlcm5hbWUsIHBhc3N3b3Jk KQogCiAgICAgICAgIHJldHVybiAodXNlcm5hbWUsIHBhc3N3b3JkKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2NyZWRlbnRpYWxzX3VuaXR0ZXN0LnB5 CmluZGV4IDJhYjE2MGM4ODdjMjg5YTVjYzU5MDRkMDQ4Mjg5MTk2ZjJmNTE0Y2MuLmE3OTdlM2Qx YjczYzNkMjQyMzFlYTA2YTZhYzBhNWJiMWM4MDZkYzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFsc191bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvY3JlZGVudGlhbHNfdW5pdHRlc3QucHkKQEAg LTMyLDYgKzMyLDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQu Y3JlZGVudGlhbHMgaW1wb3J0IENyZWRlbnRpYWxzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0 ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3Rl bS5vdXRwdXRjYXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0udXNlcl9tb2NrIGltcG9ydCBNb2NrVXNlcgogZnJvbSB3ZWJraXRweS50aGlyZHBh cnR5Lm1vY2sgaW1wb3J0IE1vY2sKIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQg TW9ja09wdGlvbnMKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBp bXBvcnQgTW9ja0V4ZWN1dGl2ZQpAQCAtMTc5LDYgKzE4MCwzMyBAQCBwYXNzd29yZDogIlNFQ1JF VFNBVUNFIgogICAgICAgICAgICAgIyBjcmVkZW50aWFsIHNvdXJjZSBjb3VsZCBiZSBhZmZlY3Rl ZCBieSB0aGUgdXNlcidzIGVudmlyb25tZW50LgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChjcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxzKCksICgidGVzdEB3ZWJraXQub3JnIiwgIk5P TU5PTU5PTSIpKQogCisgICAgZGVmIHRlc3Rfa2V5cmluZ193aXRob3V0X2dpdF9yZXBvX25vcl9r ZXljaGFpbihzZWxmKToKKyAgICAgICAgY2xhc3MgTW9ja0tleXJpbmcob2JqZWN0KToKKyAgICAg ICAgICAgIGRlZiBnZXRfcGFzc3dvcmQoc2VsZiwgaG9zdCwgdXNlcm5hbWUpOgorICAgICAgICAg ICAgICAgIHJldHVybiAiTk9NTk9NTk9NIgorCisgICAgICAgIGNsYXNzIEZha2VDcmVkZW50aWFs cyhNb2NrZWRDcmVkZW50aWFscyk6CisgICAgICAgICAgICBkZWYgX2NyZWRlbnRpYWxzX2Zyb21f a2V5Y2hhaW4oc2VsZiwgdXNlcm5hbWUpOgorICAgICAgICAgICAgICAgIHJldHVybiAoTm9uZSwg Tm9uZSkKKworICAgICAgICAgICAgZGVmIF9jcmVkZW50aWFsc19mcm9tX2Vudmlyb25tZW50KHNl bGYpOgorICAgICAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKKworICAgICAgICBjbGFz cyBGYWtlVXNlcihNb2NrVXNlcik6CisgICAgICAgICAgICBAY2xhc3NtZXRob2QKKyAgICAgICAg ICAgIGRlZiBwcm9tcHQoY2xzLCBtZXNzYWdlLCByZXBlYXQ9MSwgcmF3X2lucHV0PXJhd19pbnB1 dCk6CisgICAgICAgICAgICAgICAgcmV0dXJuICJ0ZXN0QHdlYmtpdC5vcmciCisKKyAgICAgICAg ICAgIEBjbGFzc21ldGhvZAorICAgICAgICAgICAgZGVmIHByb21wdF9wYXNzd29yZChjbHMsIG1l c3NhZ2UsIHJlcGVhdD0xLCByYXdfaW5wdXQ9cmF3X2lucHV0KToKKyAgICAgICAgICAgICAgICBy YWlzZSBBc3NlcnRpb25FcnJvcigic2hvdWxkIG5vdCBwcm9tcHQgZm9yIHBhc3N3b3JkIikKKwor ICAgICAgICB3aXRoIF9UZW1wb3JhcnlEaXJlY3Rvcnkoc3VmZml4PSJub3RfYV9naXRfcmVwbyIp IGFzIHRlbXBfZGlyX3BhdGg6CisgICAgICAgICAgICBjcmVkZW50aWFscyA9IEZha2VDcmVkZW50 aWFscygiZmFrZS5ob3N0bmFtZSIsIGN3ZD10ZW1wX2Rpcl9wYXRoLCBrZXlyaW5nPU1vY2tLZXly aW5nKCkpCisgICAgICAgICAgICAjIEZJWE1FOiBVc2luZyByZWFkX2NyZWRlbnRpYWxzIGhlcmUg c2VlbXMgdG9vIGJyb2FkIGFzIGhpZ2hlci1wcmlvcml0eQorICAgICAgICAgICAgIyBjcmVkZW50 aWFsIHNvdXJjZSBjb3VsZCBiZSBhZmZlY3RlZCBieSB0aGUgdXNlcidzIGVudmlyb25tZW50Lgor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjcmVkZW50aWFscy5yZWFkX2NyZWRlbnRpYWxz KEZha2VVc2VyKSwgKCJ0ZXN0QHdlYmtpdC5vcmciLCAiTk9NTk9NTk9NIikpCisKIAogaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1bml0dGVzdC5tYWluKCkK