204251 2019-11-15 14:27:13 -0800 Improve WebAuthn NFC tests after r252297 2019-11-19 17:36:16 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=204024 InRadar P2 Normal --- 1 tsavell jiewen_tan alex.gaynor bfulgham commit-queue jiewen_tan keith_miller webkit-bot-watchers-bugzilla webkit-bug-importer ysuzuki oldest_to_newest 1590664 0 tsavell 2019-11-15 14:27:13 -0800 http/wpt/webauthn/public-key-credential-create-success-nfc.https.html This test has been Failing on Catalina Reason: This test began failing on Catalina sense https://trac.webkit.org/changeset/252298/webkit History shows this began failing at that revision History: https://results.webkit.org/?suite=layout-tests&test=http%2Fwpt%2Fwebauthn%2Fpublic-key-credential-create-success-nfc.https.html Diff: --- /Volumes/Data/slave/catalina-debug-tests-wk2/build/layout-test-results/http/wpt/webauthn/public-key-credential-create-success-nfc.https-expected.txt +++ /Volumes/Data/slave/catalina-debug-tests-wk2/build/layout-test-results/http/wpt/webauthn/public-key-credential-create-success-nfc.https-actual.txt @@ -1,8 +1,10 @@ + +Harness Error (TIMEOUT), message = null PASS PublicKeyCredential's [[create]] with minimum options in a mock nfc authenticator. PASS PublicKeyCredential's [[create]] with authenticatorSelection { 'cross-platform' } in a mock nfc authenticator. PASS PublicKeyCredential's [[create]] with multiple tags in a mock nfc authenticator. PASS PublicKeyCredential's [[create]] with U2F in a mock nfc authenticator. PASS PublicKeyCredential's [[create]] with multiple physical tags in a mock nfc authenticator. -PASS PublicKeyCredential's [[create]] with service restart in a mock nfc authenticator. +TIMEOUT PublicKeyCredential's [[create]] with service restart in a mock nfc authenticator. Test timed out 1590669 1 ysuzuki 2019-11-15 14:32:05 -0800 I think this is related to r252297. 1590680 2 tsavell 2019-11-15 15:03:22 -0800 (In reply to Yusuke Suzuki from comment #1) > I think this is related to r252297. I agree with that. history did not have results for that commit so I didn't look at it. 1590748 3 383665 jiewen_tan 2019-11-15 16:42:03 -0800 Created attachment 383665 Patch 1590751 4 383666 jiewen_tan 2019-11-15 16:53:33 -0800 Created attachment 383666 Patch 1591761 5 383666 ap 2019-11-19 16:40:04 -0800 Comment on attachment 383666 Patch rs=me 1591769 6 383666 jiewen_tan 2019-11-19 16:50:23 -0800 Comment on attachment 383666 Patch Thanks Alexey for r+ this patch. 1591799 7 383666 commit-queue 2019-11-19 17:35:27 -0800 Comment on attachment 383666 Patch Clearing flags on attachment: 383666 Committed r252668: <https://trac.webkit.org/changeset/252668> 1591800 8 commit-queue 2019-11-19 17:35:28 -0800 All reviewed patches have been landed. Closing bug. 1591802 9 webkit-bug-importer 2019-11-19 17:36:16 -0800 <rdar://problem/57344037> 383665 2019-11-15 16:42:03 -0800 2019-11-15 16:53:31 -0800 Patch bug-204251-20191115164202.patch text/plain 6990 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNTExCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWYwM2FjYWY1NzVmNzhhMjQ4NzUw ZGFmYjRmMWU5ZWFhZjBjMmUwOC4uY2QwMDYwZmIwNzlkYzE0YWM0NzU3ZWZjZTliNmE5MmQ5MmZj ZTQ3NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTE1ICBKaWV3ZW4gVGFuICA8amll d2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBodHRwL3dwdC93ZWJhdXRobi9w dWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtbmZjLmh0dHBzLmh0bWwgYWZ0ZXIg cjI1MjI5NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA0MjUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VGhpcyBwYXRjaCBmaXhlcyBhIHRlc3QgZmFpbHVyZSBhZnRlciByMjUyMjk3IGFuZCBhZGRzIG5l dyB0ZXN0IGNvbnRlbnRzIGZvciByMjUyMjk3LgorCisgICAgICAgICogaHR0cC93cHQvd2ViYXV0 aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFs LWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvd3B0L3dlYmF1 dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0cHMtZXhwZWN0 ZWQudHh0OgorICAgICAgICAqIGh0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlh bC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0cHMuaHRtbDoKKwogMjAxOS0xMS0xNSAgUGVyIEFybmUg Vm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IHRlc3QgYW5pbWF0 aW9ucy9uby1zdHlsZS1yZWNhbGMtZHVyaW5nLWFjY2VsZXJhdGVkLWFuaW1hdGlvbi5odG1sIGlz IGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1Ymxp Yy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1uZmMuaHR0cHMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0 ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50eHQKaW5kZXggZTcyNTA5OGFmNzM1MjAxYTFh Nzg3MjYxZTAwOWIxZWJlZWVmYzcyZS4uODE3YjU4NGEyMDNmN2NmNjljMWMxMTAxOTI4MDA2OGRl YjEwNzdjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGlj LWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNy ZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50eHQKQEAgLTUsNCArNSw1IEBAIFBBU1Mg UHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCB3cm9uZyB0YWcgdHlwZSBpbiBh IG1vY2sgbmZjIGF1dGhlbnRpCiBQQVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1d IHdpdGggbm8gY29ubmVjdGlvbnMgaW4gYSBtb2NrIG5mYyBhdXRoZW50aWNhdG9yLiAKIFBBU1Mg UHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCBudWxsIHZlcnNpb24gaW4gYSBt b2NrIG5mYyBhdXRoZW50aWNhdG9yLiAKIFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3Jl YXRlXV0gd2l0aCB3cm9uZyB2ZXJzaW9uIGluIGEgbW9jayBuZmMgYXV0aGVudGljYXRvci4gCitQ QVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggd3JvbmcgdmVyc2lvbiBp biBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuMiAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5m Yy5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1j cmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy5odG1sCmluZGV4IDI1MzUzZjA5MjY4 YWE1NzFiODdmZDJiMTE1M2VjODZkODYyZjE0NWIuLjIzODk1NzA0ZWU3ZGFmYjBjYTgxYjJjNWNl NWVmZTA4ZjBjNDllNTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhu L3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1uZmMuaHR0cHMuaHRtbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jl YXRlLWZhaWx1cmUtbmZjLmh0dHBzLmh0bWwKQEAgLTEzNyw0ICsxMzcsMjYgQEAKICAgICAgICAg cmV0dXJuIHByb21pc2VSZWplY3RzKHQsICJOb3RBbGxvd2VkRXJyb3IiLCBuYXZpZ2F0b3IuY3Jl ZGVudGlhbHMuY3JlYXRlKG9wdGlvbnMpLCAiT3BlcmF0aW9uIHRpbWVkIG91dC4iKTsKICAgICB9 LCAiUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCB3cm9uZyB2ZXJzaW9uIGlu IGEgbW9jayBuZmMgYXV0aGVudGljYXRvci4iKTsKIAorICAgIHByb21pc2VfdGVzdChmdW5jdGlv bih0KSB7CisgICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7CisgICAgICAgICAgICBwdWJsaWNLZXk6 IHsKKyAgICAgICAgICAgICAgICBycDogeworICAgICAgICAgICAgICAgICAgICBuYW1lOiAiZXhh bXBsZS5jb20iCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB1c2VyOiB7Cisg ICAgICAgICAgICAgICAgICAgIG5hbWU6ICJKb2huIEFwcGxlc2VlZCIsCisgICAgICAgICAgICAg ICAgICAgIGlkOiBhc2NpaVRvVWludDhBcnJheSgiMTIzNDU2IiksCisgICAgICAgICAgICAgICAg ICAgIGRpc3BsYXlOYW1lOiAiSm9obiIsCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAg ICAgICBjaGFsbGVuZ2U6IGFzY2lpVG9VaW50OEFycmF5KCIxMjM0NTYiKSwKKyAgICAgICAgICAg ICAgICBwdWJLZXlDcmVkUGFyYW1zOiBbeyB0eXBlOiAicHVibGljLWtleSIsIGFsZzogLTcgfV0s CisgICAgICAgICAgICAgICAgdGltZW91dDogMTAKKyAgICAgICAgICAgIH0KKyAgICAgICAgfTsK KworICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgIGludGVybmFscy5z ZXRNb2NrV2ViQXV0aGVudGljYXRpb25Db25maWd1cmF0aW9uKHsgbmZjOiB7IGVycm9yOiAibWFs aWNpb3VzLXBheWxvYWQiLCBwYXlsb2FkQmFzZTY0Olt0ZXN0RHVtbXlNZXNzYWdlUGF5bG9hZEJh c2U2NCwgdGVzdER1bW15TWVzc2FnZVBheWxvYWRCYXNlNjRdIH0gfSk7CisgICAgICAgIHJldHVy biBwcm9taXNlUmVqZWN0cyh0LCAiTm90QWxsb3dlZEVycm9yIiwgbmF2aWdhdG9yLmNyZWRlbnRp YWxzLmNyZWF0ZShvcHRpb25zKSwgIk9wZXJhdGlvbiB0aW1lZCBvdXQuIik7CisgICAgfSwgIlB1 YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggd3JvbmcgdmVyc2lvbiBpbiBhIG1v Y2sgbmZjIGF1dGhlbnRpY2F0b3IuMiIpOworCiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3Vj Y2Vzcy1uZmMuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0 aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNjZXNzLW5mYy5odHRwcy1leHBlY3Rl ZC50eHQKaW5kZXggZDM3NGQ2OWNmZGUwZDk0MTE5OGJkZTZjNWZiZGM5NmI2YTA3ZDVkNC4uN2Jl ZWJlYWI2ZWEzYmViYTRmOGFmNTNlZDY1MWM1NTJkOTI4YjJlMSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNj ZXNzLW5mYy5odHRwcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2Vi YXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNjZXNzLW5mYy5odHRwcy1leHBl Y3RlZC50eHQKQEAgLTUsNCArNSw1IEBAIFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3Jl YXRlXV0gd2l0aCBtdWx0aXBsZSB0YWdzIGluIGEgbW9jayBuZmMgYXV0aGVudGljCiBQQVNTIFB1 YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggVTJGIGluIGEgbW9jayBuZmMgYXV0 aGVudGljYXRvci4gCiBQQVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGgg bXVsdGlwbGUgcGh5c2ljYWwgdGFncyBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuIAogUEFT UyBQdWJsaWNLZXlDcmVkZW50aWFsJ3MgW1tjcmVhdGVdXSB3aXRoIHNlcnZpY2UgcmVzdGFydCBp biBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuIAorUEFTUyBQdWJsaWNLZXlDcmVkZW50aWFsJ3Mg W1tjcmVhdGVdXSB3aXRoIGxlZ2FjeSBVMkYga2V5cyBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0 b3IuIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMt a2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtbmZjLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0 cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3Mt bmZjLmh0dHBzLmh0bWwKaW5kZXggMGI5NjIyYTY2YjJlOTJhNGIwMTMxNjBiMjQxYTZmMmFiZjE3 NjQ2MS4uMGRjMDM0OTZkMjAwM2M2Y2IxNjU3Zjg0MzYzYWUyMjBkNTMyY2ZkOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNy ZWF0ZS1zdWNjZXNzLW5mYy5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dl YmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0cHMuaHRt bApAQCAtMTM4LDkgKzEzOCwzMiBAQAogICAgICAgICB9OwogCiAgICAgICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKQotICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tXZWJBdXRoZW50aWNhdGlv bkNvbmZpZ3VyYXRpb24oeyBzaWxlbnRGYWlsdXJlOiB0cnVlLCBuZmM6IHsgZXJyb3I6ICJtYWxp Y2lvdXMtcGF5bG9hZCIsIHBheWxvYWRCYXNlNjQ6IFt0ZXN0RHVtbXlNZXNzYWdlUGF5bG9hZEJh c2U2NCwgdGVzdE5mY0N0YXBWZXJzaW9uQmFzZTY0LCB0ZXN0R2V0SW5mb1Jlc3BvbnNlQXBkdUJh c2U2NCwgdGVzdENyZWF0aW9uTWVzc2FnZUFwZHVCYXNlNjRdIH0gfSk7CisgICAgICAgICAgICBp bnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IHNpbGVudEZh aWx1cmU6IHRydWUsIG5mYzogeyBlcnJvcjogIm1hbGljaW91cy1wYXlsb2FkIiwgcGF5bG9hZEJh c2U2NDogW3Rlc3REdW1teU1lc3NhZ2VQYXlsb2FkQmFzZTY0LCB0ZXN0RHVtbXlNZXNzYWdlUGF5 bG9hZEJhc2U2NCwgdGVzdE5mY0N0YXBWZXJzaW9uQmFzZTY0LCB0ZXN0R2V0SW5mb1Jlc3BvbnNl QXBkdUJhc2U2NCwgdGVzdENyZWF0aW9uTWVzc2FnZUFwZHVCYXNlNjRdIH0gfSk7CiAgICAgICAg IHJldHVybiBuYXZpZ2F0b3IuY3JlZGVudGlhbHMuY3JlYXRlKG9wdGlvbnMpLnRoZW4oY3JlZGVu dGlhbCA9PiB7CiAgICAgICAgICAgICBjaGVja0N0YXBNYWtlQ3JlZGVudGlhbFJlc3VsdChjcmVk ZW50aWFsKTsKICAgICAgICAgfSk7CiAgICAgfSwgIlB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2Ny ZWF0ZV1dIHdpdGggc2VydmljZSByZXN0YXJ0IGluIGEgbW9jayBuZmMgYXV0aGVudGljYXRvci4i KTsKKworICAgIHByb21pc2VfdGVzdCh0ID0+IHsKKyAgICAgICAgY29uc3Qgb3B0aW9ucyA9IHsK KyAgICAgICAgICAgIHB1YmxpY0tleTogeworICAgICAgICAgICAgICAgIHJwOiB7CisgICAgICAg ICAgICAgICAgICAgIG5hbWU6ICJsb2NhbGhvc3QiLAorICAgICAgICAgICAgICAgIH0sCisgICAg ICAgICAgICAgICAgdXNlcjogeworICAgICAgICAgICAgICAgICAgICBuYW1lOiAiSm9obiBBcHBs ZXNlZWQiLAorICAgICAgICAgICAgICAgICAgICBpZDogQmFzZTY0VVJMLnBhcnNlKHRlc3RVc2Vy aGFuZGxlQmFzZTY0KSwKKyAgICAgICAgICAgICAgICAgICAgZGlzcGxheU5hbWU6ICJBcHBsZXNl ZWQiLAorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgY2hhbGxlbmdlOiBCYXNl NjRVUkwucGFyc2UoIk1USXpORFUyIiksCisgICAgICAgICAgICAgICAgcHViS2V5Q3JlZFBhcmFt czogW3sgdHlwZTogInB1YmxpYy1rZXkiLCBhbGc6IC03IH1dCisgICAgICAgICAgICB9CisgICAg ICAgIH07CisKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgICAgICBpbnRl cm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IHNpbGVudEZhaWx1 cmU6IHRydWUsIG5mYzogeyBlcnJvcjogIm1hbGljaW91cy1wYXlsb2FkIiwgcGF5bG9hZEJhc2U2 NDogW3Rlc3REdW1teU1lc3NhZ2VQYXlsb2FkQmFzZTY0LCB0ZXN0TmZjVTJmVmVyc2lvbkJhc2U2 NCwgdGVzdEdldEluZm9SZXNwb25zZUFwZHVCYXNlNjQsIHRlc3RDcmVhdGlvbk1lc3NhZ2VBcGR1 QmFzZTY0XSB9IH0pOworICAgICAgICByZXR1cm4gbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0 ZShvcHRpb25zKS50aGVuKGNyZWRlbnRpYWwgPT4geworICAgICAgICAgICAgY2hlY2tDdGFwTWFr ZUNyZWRlbnRpYWxSZXN1bHQoY3JlZGVudGlhbCk7CisgICAgICAgIH0pOworICAgIH0sICJQdWJs aWNLZXlDcmVkZW50aWFsJ3MgW1tjcmVhdGVdXSB3aXRoIGxlZ2FjeSBVMkYga2V5cyBpbiBhIG1v Y2sgbmZjIGF1dGhlbnRpY2F0b3IuIik7CiA8L3NjcmlwdD4K 383666 2019-11-15 16:53:33 -0800 2019-11-19 17:35:27 -0800 Patch bug-204251-20191115165333.patch text/plain 6939 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNTExCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWYwM2FjYWY1NzVmNzhhMjQ4NzUw ZGFmYjRmMWU5ZWFhZjBjMmUwOC4uMGE0MTdhZmY0YTE5MWVlMmY3MTRlMjJmYWJmNmYxZTViMDc4 M2E5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTE1ICBKaWV3ZW4gVGFuICA8amll d2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW1wcm92ZSBXZWJBdXRobiBORkMgdGVzdHMg YWZ0ZXIgcjI1MjI5NworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0MjUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIHRlc3QgZmFpbHVyZSBhZnRlciByMjUyMjk3IGFuZCBh ZGRzIG5ldyB0ZXN0IGNvbnRlbnRzIGZvciByMjUyMjk3LgorCisgICAgICAgICogaHR0cC93cHQv d2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1l eHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVk ZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy5odG1sOgorICAgICAgICAqIGh0dHAvd3B0 L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0cHMt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3Jl ZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0cHMuaHRtbDoKKwogMjAxOS0xMS0xNSAgUGVy IEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IHRlc3Qg YW5pbWF0aW9ucy9uby1zdHlsZS1yZWNhbGMtZHVyaW5nLWFjY2VsZXJhdGVkLWFuaW1hdGlvbi5o dG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhu L3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1uZmMuaHR0cHMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFs LWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50eHQKaW5kZXggZTcyNTA5OGFmNzM1 MjAxYTFhNzg3MjYxZTAwOWIxZWJlZWVmYzcyZS4uODE3YjU4NGEyMDNmN2NmNjljMWMxMTAxOTI4 MDA2OGRlYjEwNzdjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4v cHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50 aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy1leHBlY3RlZC50eHQKQEAgLTUsNCArNSw1IEBA IFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCB3cm9uZyB0YWcgdHlw ZSBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpCiBQQVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2Ny ZWF0ZV1dIHdpdGggbm8gY29ubmVjdGlvbnMgaW4gYSBtb2NrIG5mYyBhdXRoZW50aWNhdG9yLiAK IFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCBudWxsIHZlcnNpb24g aW4gYSBtb2NrIG5mYyBhdXRoZW50aWNhdG9yLiAKIFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdz IFtbY3JlYXRlXV0gd2l0aCB3cm9uZyB2ZXJzaW9uIGluIGEgbW9jayBuZmMgYXV0aGVudGljYXRv ci4gCitQQVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggd3JvbmcgdmVy c2lvbiBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuMiAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWls dXJlLW5mYy5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGlj LWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLW5mYy5odHRwcy5odG1sCmluZGV4IDI1MzUz ZjA5MjY4YWE1NzFiODdmZDJiMTE1M2VjODZkODYyZjE0NWIuLjIzODk1NzA0ZWU3ZGFmYjBjYTgx YjJjNWNlNWVmZTA4ZjBjNDllNTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dl YmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1uZmMuaHR0cHMuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRp YWwtY3JlYXRlLWZhaWx1cmUtbmZjLmh0dHBzLmh0bWwKQEAgLTEzNyw0ICsxMzcsMjYgQEAKICAg ICAgICAgcmV0dXJuIHByb21pc2VSZWplY3RzKHQsICJOb3RBbGxvd2VkRXJyb3IiLCBuYXZpZ2F0 b3IuY3JlZGVudGlhbHMuY3JlYXRlKG9wdGlvbnMpLCAiT3BlcmF0aW9uIHRpbWVkIG91dC4iKTsK ICAgICB9LCAiUHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aCB3cm9uZyB2ZXJz aW9uIGluIGEgbW9jayBuZmMgYXV0aGVudGljYXRvci4iKTsKIAorICAgIHByb21pc2VfdGVzdChm dW5jdGlvbih0KSB7CisgICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7CisgICAgICAgICAgICBwdWJs aWNLZXk6IHsKKyAgICAgICAgICAgICAgICBycDogeworICAgICAgICAgICAgICAgICAgICBuYW1l OiAiZXhhbXBsZS5jb20iCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB1c2Vy OiB7CisgICAgICAgICAgICAgICAgICAgIG5hbWU6ICJKb2huIEFwcGxlc2VlZCIsCisgICAgICAg ICAgICAgICAgICAgIGlkOiBhc2NpaVRvVWludDhBcnJheSgiMTIzNDU2IiksCisgICAgICAgICAg ICAgICAgICAgIGRpc3BsYXlOYW1lOiAiSm9obiIsCisgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgICBjaGFsbGVuZ2U6IGFzY2lpVG9VaW50OEFycmF5KCIxMjM0NTYiKSwKKyAgICAg ICAgICAgICAgICBwdWJLZXlDcmVkUGFyYW1zOiBbeyB0eXBlOiAicHVibGljLWtleSIsIGFsZzog LTcgfV0sCisgICAgICAgICAgICAgICAgdGltZW91dDogMTAKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfTsKKworICAgICAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgIGludGVy bmFscy5zZXRNb2NrV2ViQXV0aGVudGljYXRpb25Db25maWd1cmF0aW9uKHsgbmZjOiB7IGVycm9y OiAibWFsaWNpb3VzLXBheWxvYWQiLCBwYXlsb2FkQmFzZTY0Olt0ZXN0RHVtbXlNZXNzYWdlUGF5 bG9hZEJhc2U2NCwgdGVzdER1bW15TWVzc2FnZVBheWxvYWRCYXNlNjRdIH0gfSk7CisgICAgICAg IHJldHVybiBwcm9taXNlUmVqZWN0cyh0LCAiTm90QWxsb3dlZEVycm9yIiwgbmF2aWdhdG9yLmNy ZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKSwgIk9wZXJhdGlvbiB0aW1lZCBvdXQuIik7CisgICAg fSwgIlB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggd3JvbmcgdmVyc2lvbiBp biBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuMiIpOworCiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVh dGUtc3VjY2Vzcy1uZmMuaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQv d2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNjZXNzLW5mYy5odHRwcy1l eHBlY3RlZC50eHQKaW5kZXggZDM3NGQ2OWNmZGUwZDk0MTE5OGJkZTZjNWZiZGM5NmI2YTA3ZDVk NC4uN2JlZWJlYWI2ZWEzYmViYTRmOGFmNTNlZDY1MWM1NTJkOTI4YjJlMSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0 ZS1zdWNjZXNzLW5mYy5odHRwcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93 cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1zdWNjZXNzLW5mYy5odHRw cy1leHBlY3RlZC50eHQKQEAgLTUsNCArNSw1IEBAIFBBU1MgUHVibGljS2V5Q3JlZGVudGlhbCdz IFtbY3JlYXRlXV0gd2l0aCBtdWx0aXBsZSB0YWdzIGluIGEgbW9jayBuZmMgYXV0aGVudGljCiBQ QVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1dIHdpdGggVTJGIGluIGEgbW9jayBu ZmMgYXV0aGVudGljYXRvci4gCiBQQVNTIFB1YmxpY0tleUNyZWRlbnRpYWwncyBbW2NyZWF0ZV1d IHdpdGggbXVsdGlwbGUgcGh5c2ljYWwgdGFncyBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3Iu IAogUEFTUyBQdWJsaWNLZXlDcmVkZW50aWFsJ3MgW1tjcmVhdGVdXSB3aXRoIHNlcnZpY2UgcmVz dGFydCBpbiBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuIAorUEFTUyBQdWJsaWNLZXlDcmVkZW50 aWFsJ3MgW1tjcmVhdGVdXSB3aXRoIGxlZ2FjeSBVMkYga2V5cyBpbiBhIG1vY2sgbmZjIGF1dGhl bnRpY2F0b3IuIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9w dWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtbmZjLmh0dHBzLmh0bWwgYi9MYXlv dXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1 Y2Nlc3MtbmZjLmh0dHBzLmh0bWwKaW5kZXggMGI5NjIyYTY2YjJlOTJhNGIwMTMxNjBiMjQxYTZm MmFiZjE3NjQ2MS4uMGRjMDM0OTZkMjAwM2M2Y2IxNjU3Zjg0MzYzYWUyMjBkNTMyY2ZkOCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50 aWFsLWNyZWF0ZS1zdWNjZXNzLW5mYy5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAv d3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1uZmMuaHR0 cHMuaHRtbApAQCAtMTM4LDkgKzEzOCwzMiBAQAogICAgICAgICB9OwogCiAgICAgICAgIGlmICh3 aW5kb3cuaW50ZXJuYWxzKQotICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tXZWJBdXRoZW50 aWNhdGlvbkNvbmZpZ3VyYXRpb24oeyBzaWxlbnRGYWlsdXJlOiB0cnVlLCBuZmM6IHsgZXJyb3I6 ICJtYWxpY2lvdXMtcGF5bG9hZCIsIHBheWxvYWRCYXNlNjQ6IFt0ZXN0RHVtbXlNZXNzYWdlUGF5 bG9hZEJhc2U2NCwgdGVzdE5mY0N0YXBWZXJzaW9uQmFzZTY0LCB0ZXN0R2V0SW5mb1Jlc3BvbnNl QXBkdUJhc2U2NCwgdGVzdENyZWF0aW9uTWVzc2FnZUFwZHVCYXNlNjRdIH0gfSk7CisgICAgICAg ICAgICBpbnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IHNp bGVudEZhaWx1cmU6IHRydWUsIG5mYzogeyBlcnJvcjogIm1hbGljaW91cy1wYXlsb2FkIiwgcGF5 bG9hZEJhc2U2NDogW3Rlc3REdW1teU1lc3NhZ2VQYXlsb2FkQmFzZTY0LCB0ZXN0RHVtbXlNZXNz YWdlUGF5bG9hZEJhc2U2NCwgdGVzdE5mY0N0YXBWZXJzaW9uQmFzZTY0LCB0ZXN0R2V0SW5mb1Jl c3BvbnNlQXBkdUJhc2U2NCwgdGVzdENyZWF0aW9uTWVzc2FnZUFwZHVCYXNlNjRdIH0gfSk7CiAg ICAgICAgIHJldHVybiBuYXZpZ2F0b3IuY3JlZGVudGlhbHMuY3JlYXRlKG9wdGlvbnMpLnRoZW4o Y3JlZGVudGlhbCA9PiB7CiAgICAgICAgICAgICBjaGVja0N0YXBNYWtlQ3JlZGVudGlhbFJlc3Vs dChjcmVkZW50aWFsKTsKICAgICAgICAgfSk7CiAgICAgfSwgIlB1YmxpY0tleUNyZWRlbnRpYWwn cyBbW2NyZWF0ZV1dIHdpdGggc2VydmljZSByZXN0YXJ0IGluIGEgbW9jayBuZmMgYXV0aGVudGlj YXRvci4iKTsKKworICAgIHByb21pc2VfdGVzdCh0ID0+IHsKKyAgICAgICAgY29uc3Qgb3B0aW9u cyA9IHsKKyAgICAgICAgICAgIHB1YmxpY0tleTogeworICAgICAgICAgICAgICAgIHJwOiB7Cisg ICAgICAgICAgICAgICAgICAgIG5hbWU6ICJsb2NhbGhvc3QiLAorICAgICAgICAgICAgICAgIH0s CisgICAgICAgICAgICAgICAgdXNlcjogeworICAgICAgICAgICAgICAgICAgICBuYW1lOiAiSm9o biBBcHBsZXNlZWQiLAorICAgICAgICAgICAgICAgICAgICBpZDogQmFzZTY0VVJMLnBhcnNlKHRl c3RVc2VyaGFuZGxlQmFzZTY0KSwKKyAgICAgICAgICAgICAgICAgICAgZGlzcGxheU5hbWU6ICJB cHBsZXNlZWQiLAorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgY2hhbGxlbmdl OiBCYXNlNjRVUkwucGFyc2UoIk1USXpORFUyIiksCisgICAgICAgICAgICAgICAgcHViS2V5Q3Jl ZFBhcmFtczogW3sgdHlwZTogInB1YmxpYy1rZXkiLCBhbGc6IC03IH1dCisgICAgICAgICAgICB9 CisgICAgICAgIH07CisKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgICAg ICBpbnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IHNpbGVu dEZhaWx1cmU6IHRydWUsIG5mYzogeyBlcnJvcjogIm1hbGljaW91cy1wYXlsb2FkIiwgcGF5bG9h ZEJhc2U2NDogW3Rlc3REdW1teU1lc3NhZ2VQYXlsb2FkQmFzZTY0LCB0ZXN0TmZjVTJmVmVyc2lv bkJhc2U2NCwgdGVzdEdldEluZm9SZXNwb25zZUFwZHVCYXNlNjQsIHRlc3RDcmVhdGlvbk1lc3Nh Z2VBcGR1QmFzZTY0XSB9IH0pOworICAgICAgICByZXR1cm4gbmF2aWdhdG9yLmNyZWRlbnRpYWxz LmNyZWF0ZShvcHRpb25zKS50aGVuKGNyZWRlbnRpYWwgPT4geworICAgICAgICAgICAgY2hlY2tD dGFwTWFrZUNyZWRlbnRpYWxSZXN1bHQoY3JlZGVudGlhbCk7CisgICAgICAgIH0pOworICAgIH0s ICJQdWJsaWNLZXlDcmVkZW50aWFsJ3MgW1tjcmVhdGVdXSB3aXRoIGxlZ2FjeSBVMkYga2V5cyBp biBhIG1vY2sgbmZjIGF1dGhlbnRpY2F0b3IuIik7CiA8L3NjcmlwdD4K