191530 2018-11-11 18:23:45 -0800 [WebAuthn] Incorporate more detailed UnknownError messages for LocalAuthenticator 2020-01-24 13:59:05 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 182769 1 jiewen_tan jiewen_tan alex.gaynor bfulgham commit-queue jiewen_tan webkit-bug-importer oldest_to_newest 1477457 0 jiewen_tan 2018-11-11 18:23:45 -0800 Incorporate more detailed UnknownError messages for LocalAuthenticator for testing since all UnknownError will be surpassed to NotAllowedError, i.e. operation timeout for production. 1609359 1 388366 jiewen_tan 2020-01-21 16:18:20 -0800 Created attachment 388366 Patch 1609365 2 388366 bfulgham 2020-01-21 16:26:15 -0800 Comment on attachment 388366 Patch r=me 1609379 3 388366 jiewen_tan 2020-01-21 16:42:15 -0800 Comment on attachment 388366 Patch Thanks Brent for r+ this patch. 1609399 4 388366 commit-queue 2020-01-21 17:26:02 -0800 Comment on attachment 388366 Patch Clearing flags on attachment: 388366 Committed r254894: <https://trac.webkit.org/changeset/254894> 1609400 5 commit-queue 2020-01-21 17:26:03 -0800 All reviewed patches have been landed. Closing bug. 1609401 6 webkit-bug-importer 2020-01-21 17:27:15 -0800 <rdar://problem/58781040> 1610538 7 jiewen_tan 2020-01-23 22:38:10 -0800 A follow up to add more details is here: Committed r255056: <https://trac.webkit.org/changeset/255056> 1610850 8 jiewen_tan 2020-01-24 13:59:05 -0800 A follow up on r255056: Committed r255093: <https://trac.webkit.org/changeset/255093> 388366 2020-01-21 16:18:20 -0800 2020-01-21 17:26:02 -0800 Patch bug-191530-20200121161819.patch text/plain 12560 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdhYzUyOTczZmQxNzIzZGU2 Y2RmOTJlMWExMmNkNWYyMjg2YThjNjcuLmY1NTdmMWJjNTg3ZGZmMDhiNzZiMGUzM2QwZmMzMjBj NzNhMDRlZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDEtMjEgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEluY29ycG9y YXRlIG1vcmUgZGV0YWlsZWQgVW5rbm93bkVycm9yIG1lc3NhZ2VzIGZvciBMb2NhbEF1dGhlbnRp Y2F0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MTUzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgcGF0Y2ggcmVwbGFjZXMgVW5rbm93bkVycm9yIG1lc3NhZ2VzIHdpdGhpbiBMb2NhbEF1dGhl bnRpY2F0b3Igd2l0aCB0aGUgTE9HX0VSUk9SCisgICAgICAgIG1lc3NhZ2VzLiBBdCB0aGUgbWVh bnRpbWUsIGl0IGVuaGFuY2VzIE1vY2tMb2NhbENvbm5lY3Rpb246OmdldEF0dGVzdGF0aW9uIHRv IHJldHVybgorICAgICAgICBlcnJvcnMgaW5zdGVhZCBvZiBhc3NlcnRpb25zLgorCisgICAgICAg ICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5t bToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9yOjptYWtlQ3JlZGVudGlhbCk6 CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVNYWtlQ3JlZGVu dGlhbEFmdGVyVXNlckNvbnNlbnRlZCk6CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGlj YXRvcjo6Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQpOgorICAgICAgICAoV2Vi S2l0OjpMb2NhbEF1dGhlbnRpY2F0b3I6OmdldEFzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6 OkxvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVHZXRBc3NlcnRpb25BZnRlclVzZXJDb25zZW50 ZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Nb2NrL01vY2tMb2Nh bENvbm5lY3Rpb24ubW06CisgICAgICAgIChXZWJLaXQ6Ok1vY2tMb2NhbENvbm5lY3Rpb246Omdl dEF0dGVzdGF0aW9uIGNvbnN0KToKKwogMjAyMC0wMS0yMSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFk ZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjU0ODc2 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v Q29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCmluZGV4IDNjMjQwY2E2 YTg5NGJkMTNmODk0MGRhNTQ0YzNkYTdhMzYxOTcwZTAuLjg1ZTBhZmIxOTEyMjRmODk4OGRhNDUw ZDA1YzZlZjk5Y2NjY2I4YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0 b3IubW0KQEAgLTEzMSw3ICsxMzEsNyBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6bWFrZUNy ZWRlbnRpYWwoKQogICAgICAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5n KChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpcXVlcnksICZhdHRyaWJ1dGVzQXJyYXlSZWYpOwog ICAgICAgICBpZiAoc3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91bmQpIHsKICAg ICAgICAgICAgIExPR19FUlJPUigiQ291bGRuJ3QgcXVlcnkgS2V5Y2hhaW46ICVkIiwgc3RhdHVz KTsKLSAgICAgICAgICAgIHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRhdGEgeyBVbmtub3duRXJy b3IsICJVbmtub3duIGludGVybmFsIGVycm9yLiJfcyB9KTsKKyAgICAgICAgICAgIHJlY2VpdmVS ZXNwb25kKEV4Y2VwdGlvbkRhdGEgeyBVbmtub3duRXJyb3IsIG1ha2VTdHJpbmcoIkNvdWxkbid0 IHF1ZXJ5IEtleWNoYWluOiAiLCBzdGF0dXMpIH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CiAgICAgICAgIGF1dG8gcmV0YWluQXR0cmlidXRlc0FycmF5ID0gYWRvcHRDRihhdHRy aWJ1dGVzQXJyYXlSZWYpOwpAQCAtMTg2LDggKzE4Niw4IEBAIHZvaWQgTG9jYWxBdXRoZW50aWNh dG9yOjpjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJVc2VyQ29uc2VudGVkKExvY2FsQ29ubmVj dGlvCiAgICAgfTsKICAgICBPU1N0YXR1cyBzdGF0dXMgPSBTZWNJdGVtRGVsZXRlKChfX2JyaWRn ZSBDRkRpY3Rpb25hcnlSZWYpZGVsZXRlUXVlcnkpOwogICAgIGlmIChzdGF0dXMgJiYgc3RhdHVz ICE9IGVyclNlY0l0ZW1Ob3RGb3VuZCkgewotICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IGRl dGVsZSBvbGRlciBjcmVkZW50aWFsOiAlZCIsIHN0YXR1cyk7Ci0gICAgICAgIHJlY2VpdmVSZXNw b25kKEV4Y2VwdGlvbkRhdGEgeyBVbmtub3duRXJyb3IsICJVbmtub3duIGludGVybmFsIGVycm9y LiJfcyB9KTsKKyAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBkZWxldGUgb2xkZXIgY3JlZGVu dGlhbDogJWQiLCBzdGF0dXMpOworICAgICAgICByZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRh IHsgVW5rbm93bkVycm9yLCBtYWtlU3RyaW5nKCJDb3VsZG4ndCBkZWxldGUgb2xkZXIgY3JlZGVu dGlhbDogIiwgc3RhdHVzKSB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjExLDcg KzIxMSw3IEBAIHZvaWQgTG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZU1ha2VDcmVkZW50aWFs QWZ0ZXJBdHRlc3RlZChTZWNLZXlSZWYgcHJpdmF0ZUtlCiAKICAgICBpZiAoZXJyb3IpIHsKICAg ICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBhdHRlc3Q6ICVAIiwgZXJyb3IpOwotICAgICAgICBy ZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9yLCAiVW5rbm93biBpbnRl cm5hbCBlcnJvci4iX3MgfSk7CisgICAgICAgIHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRhdGEg eyBVbmtub3duRXJyb3IsIG1ha2VTdHJpbmcoIkNvdWxkbid0IGF0dGVzdDogIiwgU3RyaW5nKGVy cm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKSkgfSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgLy8gQXR0ZXN0YXRpb24gQ2VydGlmaWNhdGUgYW5kIEF0dGVzdGF0aW9uIElzc3VpbmcgQ0EK QEAgLTI0OSw3ICsyNDksNyBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29udGludWVNYWtl Q3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQoU2VjS2V5UmVmIHByaXZhdGVLZQogICAgICAgICBPU1N0 YXR1cyBzdGF0dXMgPSBTZWNJdGVtQ29weU1hdGNoaW5nKChfX2JyaWRnZSBDRkRpY3Rpb25hcnlS ZWYpY3JlZGVudGlhbElkUXVlcnksICZhdHRyaWJ1dGVzUmVmKTsKICAgICAgICAgaWYgKHN0YXR1 cykgewogICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBnZXQgQ3JlZGVudGlhbCBJRDog JWQiLCBzdGF0dXMpOwotICAgICAgICAgICAgcmVjZWl2ZVJlc3BvbmQoRXhjZXB0aW9uRGF0YSB7 IFVua25vd25FcnJvciwgIlVua25vd24gaW50ZXJuYWwgZXJyb3IuIl9zIH0pOworICAgICAgICAg ICAgcmVjZWl2ZVJlc3BvbmQoRXhjZXB0aW9uRGF0YSB7IFVua25vd25FcnJvciwgbWFrZVN0cmlu ZygiQ291bGRuJ3QgZ2V0IENyZWRlbnRpYWwgSUQ6ICIsIHN0YXR1cykgfSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgYXV0byByZXRhaW5BdHRyaWJ1dGVzID0gYWRv cHRDRihhdHRyaWJ1dGVzUmVmKTsKQEAgLTI3NCw3ICsyNzQsNyBAQCB2b2lkIExvY2FsQXV0aGVu dGljYXRvcjo6Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQoU2VjS2V5UmVmIHBy aXZhdGVLZQogICAgICAgICBzdGF0dXMgPSBTZWNJdGVtVXBkYXRlKChfX2JyaWRnZSBDRkRpY3Rp b25hcnlSZWYpdXBkYXRlUXVlcnksIChfX2JyaWRnZSBDRkRpY3Rpb25hcnlSZWYpdXBkYXRlUGFy YW1zKTsKICAgICAgICAgaWYgKHN0YXR1cykgewogICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3Vs ZG4ndCB1cGRhdGUgdGhlIEtleWNoYWluIGl0ZW06ICVkIiwgc3RhdHVzKTsKLSAgICAgICAgICAg IHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRhdGEgeyBVbmtub3duRXJyb3IsICJVbmtub3duIGlu dGVybmFsIGVycm9yLiJfcyB9KTsKKyAgICAgICAgICAgIHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlv bkRhdGEgeyBVbmtub3duRXJyb3IsIG1ha2VTdHJpbmcoIkNvdWxkbid0IHVwZGF0ZSB0aGUgS2V5 Y2hhaW4gaXRlbTogIiwgc3RhdHVzKSB9KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogICAgIH0KQEAgLTI5NSw3ICsyOTUsNyBAQCB2b2lkIExvY2FsQXV0aGVudGljYXRvcjo6Y29u dGludWVNYWtlQ3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQoU2VjS2V5UmVmIHByaXZhdGVLZQogICAg ICAgICAgICAgYXV0byByZXRhaW5FcnJvciA9IGFkb3B0Q0YoZXJyb3JSZWYpOwogICAgICAgICAg ICAgaWYgKGVycm9yUmVmKSB7CiAgICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZG4ndCBl eHBvcnQgdGhlIHB1YmxpYyBrZXk6ICVAIiwgKE5TRXJyb3IqKWVycm9yUmVmKTsKLSAgICAgICAg ICAgICAgICByZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9yLCAiVW5r bm93biBpbnRlcm5hbCBlcnJvci4iX3MgfSk7CisgICAgICAgICAgICAgICAgcmVjZWl2ZVJlc3Bv bmQoRXhjZXB0aW9uRGF0YSB7IFVua25vd25FcnJvciwgbWFrZVN0cmluZygiQ291bGRuJ3QgZXhw b3J0IHRoZSBwdWJsaWMga2V5OiAiLCBTdHJpbmcoKChOU0Vycm9yKillcnJvclJlZikubG9jYWxp emVkRGVzY3JpcHRpb24pKSB9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBBU1NFUlQoKChOU0RhdGEgKilwdWJsaWNLZXlEYXRhUmVmLmdldCgp KS5sZW5ndGggPT0gKDEgKyAyICogRVMyNTZGaWVsZEVsZW1lbnRMZW5ndGgpKTsgLy8gMDQgfCBY IHwgWQpAQCAtMzI3LDcgKzMyNyw3IEBAIHZvaWQgTG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51 ZU1ha2VDcmVkZW50aWFsQWZ0ZXJBdHRlc3RlZChTZWNLZXlSZWYgcHJpdmF0ZUtlCiAgICAgICAg ICAgICBhdXRvIHJldGFpbkVycm9yID0gYWRvcHRDRihlcnJvclJlZik7CiAgICAgICAgICAgICBp ZiAoZXJyb3JSZWYpIHsKICAgICAgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IGdlbmVy YXRlIHRoZSBzaWduYXR1cmU6ICVAIiwgKE5TRXJyb3IqKWVycm9yUmVmKTsKLSAgICAgICAgICAg ICAgICByZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9yLCAiVW5rbm93 biBpbnRlcm5hbCBlcnJvci4iX3MgfSk7CisgICAgICAgICAgICAgICAgcmVjZWl2ZVJlc3BvbmQo RXhjZXB0aW9uRGF0YSB7IFVua25vd25FcnJvciwgbWFrZVN0cmluZygiQ291bGRuJ3QgZ2VuZXJh dGUgdGhlIHNpZ25hdHVyZTogIiwgU3RyaW5nKCgoTlNFcnJvciopZXJyb3JSZWYpLmxvY2FsaXpl ZERlc2NyaXB0aW9uKSkgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgc2lnbmF0dXJlID0gdG9WZWN0b3IoKE5TRGF0YSAqKXNpZ25hdHVyZVJl Zi5nZXQoKSk7CkBAIC0zNzksNyArMzc5LDcgQEAgdm9pZCBMb2NhbEF1dGhlbnRpY2F0b3I6Omdl dEFzc2VydGlvbigpCiAgICAgT1NTdGF0dXMgc3RhdHVzID0gU2VjSXRlbUNvcHlNYXRjaGluZygo X19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKXF1ZXJ5LCAmYXR0cmlidXRlc0FycmF5UmVmKTsKICAg ICBpZiAoc3RhdHVzICYmIHN0YXR1cyAhPSBlcnJTZWNJdGVtTm90Rm91bmQpIHsKICAgICAgICAg TE9HX0VSUk9SKCJDb3VsZG4ndCBxdWVyeSBLZXljaGFpbjogJWQiLCBzdGF0dXMpOwotICAgICAg ICByZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9yLCAiVW5rbm93biBp bnRlcm5hbCBlcnJvci4iX3MgfSk7CisgICAgICAgIHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRh dGEgeyBVbmtub3duRXJyb3IsIG1ha2VTdHJpbmcoIkNvdWxkbid0IHF1ZXJ5IEtleWNoYWluOiAi LCBzdGF0dXMpIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGF1dG8gcmV0YWluQXR0 cmlidXRlc0FycmF5ID0gYWRvcHRDRihhdHRyaWJ1dGVzQXJyYXlSZWYpOwpAQCAtNDYxLDcgKzQ2 MSw3IEBAIHZvaWQgTG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZUdldEFzc2VydGlvbkFmdGVy VXNlckNvbnNlbnRlZChMb2NhbENvbm5lY3Rpb246CiAgICAgICAgIE9TU3RhdHVzIHN0YXR1cyA9 IFNlY0l0ZW1Db3B5TWF0Y2hpbmcoKF9fYnJpZGdlIENGRGljdGlvbmFyeVJlZilxdWVyeSwgJnBy aXZhdGVLZXlSZWYpOwogICAgICAgICBpZiAoc3RhdHVzKSB7CiAgICAgICAgICAgICBMT0dfRVJS T1IoIkNvdWxkbid0IGdldCB0aGUgcHJpdmF0ZSBrZXkgcmVmZXJlbmNlOiAlZCIsIHN0YXR1cyk7 Ci0gICAgICAgICAgICByZWNlaXZlUmVzcG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9y LCAiVW5rbm93biBpbnRlcm5hbCBlcnJvci4iX3MgfSk7CisgICAgICAgICAgICByZWNlaXZlUmVz cG9uZChFeGNlcHRpb25EYXRhIHsgVW5rbm93bkVycm9yLCBtYWtlU3RyaW5nKCJDb3VsZG4ndCBn ZXQgdGhlIHByaXZhdGUga2V5IHJlZmVyZW5jZTogIiwgc3RhdHVzKSB9KTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogICAgICAgICBhdXRvIHByaXZhdGVLZXkgPSBhZG9wdENGKHBy aXZhdGVLZXlSZWYpOwpAQCAtNDc1LDcgKzQ3NSw3IEBAIHZvaWQgTG9jYWxBdXRoZW50aWNhdG9y Ojpjb250aW51ZUdldEFzc2VydGlvbkFmdGVyVXNlckNvbnNlbnRlZChMb2NhbENvbm5lY3Rpb246 CiAgICAgICAgIGF1dG8gcmV0YWluRXJyb3IgPSBhZG9wdENGKGVycm9yUmVmKTsKICAgICAgICAg aWYgKGVycm9yUmVmKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkbid0IGdlbmVyYXRl IHRoZSBzaWduYXR1cmU6ICVAIiwgKE5TRXJyb3IqKWVycm9yUmVmKTsKLSAgICAgICAgICAgIHJl Y2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRhdGEgeyBVbmtub3duRXJyb3IsICJVbmtub3duIGludGVy bmFsIGVycm9yLiJfcyB9KTsKKyAgICAgICAgICAgIHJlY2VpdmVSZXNwb25kKEV4Y2VwdGlvbkRh dGEgeyBVbmtub3duRXJyb3IsIG1ha2VTdHJpbmcoIkNvdWxkbid0IGdlbmVyYXRlIHRoZSBzaWdu YXR1cmU6ICIsIFN0cmluZygoKE5TRXJyb3IqKWVycm9yUmVmKS5sb2NhbGl6ZWREZXNjcmlwdGlv bikpIH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIHNpZ25hdHVy ZSA9IHRvVmVjdG9yKChOU0RhdGEgKilzaWduYXR1cmVSZWYuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vTW9jay9Nb2NrTG9jYWxD b25uZWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24v TW9jay9Nb2NrTG9jYWxDb25uZWN0aW9uLm1tCmluZGV4IGNkYjFhYTM0MjVmOWU4Y2ZjNjI4ZjI1 YmVhMmE3MjUwZTk3YWU4NzMuLjRmYTQ2NGY5ZTQ4MDA0YzVlODQyY2RkOWRjOTJmZTg3MDI0NDdj NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9u L01vY2svTW9ja0xvY2FsQ29ubmVjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJBdXRoZW50aWNhdGlvbi9Nb2NrL01vY2tMb2NhbENvbm5lY3Rpb24ubW0KQEAgLTczLDcg KzczLDcgQEAgdm9pZCBNb2NrTG9jYWxDb25uZWN0aW9uOjpnZXRBdHRlc3RhdGlvbihjb25zdCBT dHJpbmcmIHJwSWQsIGNvbnN0IFN0cmluZyYgdXNlcm4KICAgICBSdW5Mb29wOjptYWluKCkuZGlz cGF0Y2goW2NvbmZpZ3VyYXRpb24gPSBtX2NvbmZpZ3VyYXRpb24sIHJwSWQsIHVzZXJuYW1lLCBo YXNoLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXSgpIG11dGFibGUgewogICAgICAgICBB U1NFUlQoY29uZmlndXJhdGlvbi5sb2NhbCk7CiAgICAgICAgIGlmICghY29uZmlndXJhdGlvbi5s b2NhbC0+YWNjZXB0QXR0ZXN0YXRpb24pIHsKLSAgICAgICAgICAgIGNhbGxiYWNrKE5VTEwsIE5V TEwsIFtOU0Vycm9yIGVycm9yV2l0aERvbWFpbjpOU09TU3RhdHVzRXJyb3JEb21haW4gY29kZTot MSB1c2VySW5mbzpuaWxdKTsKKyAgICAgICAgICAgIGNhbGxiYWNrKE5VTEwsIE5VTEwsIFtOU0Vy cm9yIGVycm9yV2l0aERvbWFpbjpAIldlYkF1dGhlbnRpY2F0aW9uIiBjb2RlOi0xIHVzZXJJbmZv OkB7IE5TTG9jYWxpemVkRGVzY3JpcHRpb25LZXk6IEAiVGhlIG9wZXJhdGlvbiBjb3VsZG4ndCBj b21wbGV0ZS4iIH1dKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC04OSw3 ICs4OSwxMCBAQCB2b2lkIE1vY2tMb2NhbENvbm5lY3Rpb246OmdldEF0dGVzdGF0aW9uKGNvbnN0 IFN0cmluZyYgcnBJZCwgY29uc3QgU3RyaW5nJiB1c2VybgogICAgICAgICAgICAgKF9fYnJpZGdl IENGRGljdGlvbmFyeVJlZilvcHRpb25zLAogICAgICAgICAgICAgJmVycm9yUmVmCiAgICAgICAg ICkpOwotICAgICAgICBBU1NFUlQoIWVycm9yUmVmKTsKKyAgICAgICAgaWYgKGVycm9yUmVmKSB7 CisgICAgICAgICAgICBjYWxsYmFjayhOVUxMLCBOVUxMLCAoTlNFcnJvciAqKWVycm9yUmVmKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCiAgICAgICAgIC8vIE1vY2sgd2hhdCBE ZXZpY2VJZGVudGl0eSB3b3VsZCBkby4KICAgICAgICAgU3RyaW5nIGxhYmVsID0gbWFrZVN0cmlu Zyh1c2VybmFtZSwgIkAiLCBycElkLCAiLXJrLXVjcnQiKTsKQEAgLTk5LDcgKzEwMiwxMCBAQCB2 b2lkIE1vY2tMb2NhbENvbm5lY3Rpb246OmdldEF0dGVzdGF0aW9uKGNvbnN0IFN0cmluZyYgcnBJ ZCwgY29uc3QgU3RyaW5nJiB1c2VybgogICAgICAgICAgICAgKGlkKWtTZWNBdHRyTGFiZWw6IChp ZClsYWJlbCwKICAgICAgICAgfTsKICAgICAgICAgT1NTdGF0dXMgc3RhdHVzID0gU2VjSXRlbUFk ZCgoX19icmlkZ2UgQ0ZEaWN0aW9uYXJ5UmVmKWFkZFF1ZXJ5LCBOVUxMKTsKLSAgICAgICAgQVNT RVJUX1VOVVNFRChzdGF0dXMsICFzdGF0dXMpOworICAgICAgICBpZiAoc3RhdHVzKSB7CisgICAg ICAgICAgICBjYWxsYmFjayhOVUxMLCBOVUxMLCBbTlNFcnJvciBlcnJvcldpdGhEb21haW46QCJX ZWJBdXRoZW50aWNhdGlvbiIgY29kZTpzdGF0dXMgdXNlckluZm86QHsgTlNMb2NhbGl6ZWREZXNj cmlwdGlvbktleTogQCJDb3VsZG4ndCBhZGQgdGhlIGtleSB0byB0aGUga2V5Y2hhaW4uIiB9XSk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KIAogICAgICAgICBhdXRvIGF0dGVzdGF0 aW9uQ2VydGlmaWNhdGUgPSBhZG9wdENGKFNlY0NlcnRpZmljYXRlQ3JlYXRlV2l0aERhdGEoTlVM TCwgKF9fYnJpZGdlIENGRGF0YVJlZilhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJh c2U2NEVuY29kZWRTdHJpbmc6Y29uZmlndXJhdGlvbi5sb2NhbC0+dXNlckNlcnRpZmljYXRlQmFz ZTY0IG9wdGlvbnM6TlNEYXRhQmFzZTY0RGVjb2RpbmdJZ25vcmVVbmtub3duQ2hhcmFjdGVyc10p LmdldCgpKSk7CiAgICAgICAgIGF1dG8gYXR0ZXN0YXRpb25Jc3N1aW5nQ0FDZXJ0aWZpY2F0ZSA9 IGFkb3B0Q0YoU2VjQ2VydGlmaWNhdGVDcmVhdGVXaXRoRGF0YShOVUxMLCAoX19icmlkZ2UgQ0ZE YXRhUmVmKWFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQmFzZTY0RW5jb2RlZFN0cmlu Zzpjb25maWd1cmF0aW9uLmxvY2FsLT5pbnRlcm1lZGlhdGVDQUNlcnRpZmljYXRlQmFzZTY0IG9w dGlvbnM6TlNEYXRhQmFzZTY0RGVjb2RpbmdJZ25vcmVVbmtub3duQ2hhcmFjdGVyc10pLmdldCgp KSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggN2ZkMWNhOTAwZjU0ZDVlZDE4YWEyNjQwZjI2NmU5MDdlNzA1Nzk0MS4uODMy NTAwOTkwYmNlMTQ2ODk2YzAzODMwNThlNWVhYWRkZDJkM2ExZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDIwLTAxLTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAg ICAgICAgW1dlYkF1dGhuXSBJbmNvcnBvcmF0ZSBtb3JlIGRldGFpbGVkIFVua25vd25FcnJvciBt ZXNzYWdlcyBmb3IgTG9jYWxBdXRoZW50aWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE1MzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3Jl ZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sOgorCiAyMDIwLTAxLTIxICBK dXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdMMl0gU2Ft cGxlciBvYmplY3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9w dWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLWZhaWx1cmUtbG9jYWwuaHR0cHMuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUt ZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCmluZGV4IDM5YzdlYzdmYWM1NGRmNzE3ZGIzN2FhMDg0 OTU3ZDc0MGMyNzJlNTcuLjI0YzVjZDhiN2JjNDA3NjJkN2MxMzRjZTkwOWVkZjVkZWEzMDkyNDgg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3Jl ZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3Rz L2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1s b2NhbC5odHRwcy5odG1sCkBAIC0xMTgsNyArMTE4LDcgQEAKICAgICAgICAgICAgIH07CiAgICAg ICAgICAgICBpZiAod2luZG93LmludGVybmFscykKICAgICAgICAgICAgICAgICBpbnRlcm5hbHMu c2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IGxvY2FsOiB7IGFjY2VwdEF1 dGhlbnRpY2F0aW9uOiB0cnVlLCBhY2NlcHRBdHRlc3RhdGlvbjogZmFsc2UgfSB9KTsKLSAgICAg ICAgICAgIHJldHVybiBwcm9taXNlUmVqZWN0cyh0LCAiVW5rbm93bkVycm9yIiwgbmF2aWdhdG9y LmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKSwgIlVua25vd24gaW50ZXJuYWwgZXJyb3IuIik7 CisgICAgICAgICAgICByZXR1cm4gcHJvbWlzZVJlamVjdHModCwgIlVua25vd25FcnJvciIsIG5h dmlnYXRvci5jcmVkZW50aWFscy5jcmVhdGUob3B0aW9ucyksICJDb3VsZG4ndCBhdHRlc3Q6IFRo ZSBvcGVyYXRpb24gY291bGRuJ3QgY29tcGxldGUuIik7CiAgICAgICAgIH0sICJQdWJsaWNLZXlD cmVkZW50aWFsJ3MgW1tjcmVhdGVdXSB3aXRob3V0IGF0dGVzdGF0aW9uIGluIGEgbW9jayBsb2Nh bCBhdXRoZW50aWNhdG9yLiIpOwogCiAgICAgICAgIHByb21pc2VfdGVzdCh0ID0+IHsKQEAgLTE0 MCw3ICsxNDAsNyBAQAogICAgICAgICAgICAgICAgIGludGVybmFscy5zZXRNb2NrV2ViQXV0aGVu dGljYXRpb25Db25maWd1cmF0aW9uKHsgbG9jYWw6IHsgYWNjZXB0QXV0aGVudGljYXRpb246IHRy dWUsIGFjY2VwdEF0dGVzdGF0aW9uOiBmYWxzZSB9IH0pOwogICAgICAgICAgICAgICAgIHRlc3RS dW5uZXIuYWRkVGVzdEtleVRvS2V5Y2hhaW4ocHJpdmF0ZUtleUJhc2U2NCwgdGVzdFJwSWQsIHVz ZXJoYW5kbGVCYXNlNjQpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIHByb21p c2VSZWplY3RzKHQsICJVbmtub3duRXJyb3IiLCBuYXZpZ2F0b3IuY3JlZGVudGlhbHMuY3JlYXRl KG9wdGlvbnMpLCAiVW5rbm93biBpbnRlcm5hbCBlcnJvci4iKS50aGVuKCgpID0+IHsKKyAgICAg ICAgICAgIHJldHVybiBwcm9taXNlUmVqZWN0cyh0LCAiVW5rbm93bkVycm9yIiwgbmF2aWdhdG9y LmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKSwgIkNvdWxkbid0IGF0dGVzdDogVGhlIG9wZXJh dGlvbiBjb3VsZG4ndCBjb21wbGV0ZS4iKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgICAgICAgICAgICAgICAgIGFzc2VydF9mYWxzZSh0 ZXN0UnVubmVyLmtleUV4aXN0c0luS2V5Y2hhaW4odGVzdFJwSWQsIHVzZXJoYW5kbGVCYXNlNjQp KTsKICAgICAgICAgICAgIH0pOwo=