208676 2020-03-05 17:00:19 -0800 [WebAuthn] Do not perform Attestation with type is 'none' 2022-01-19 05:16:38 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jiewen_tan jiewen_tan bfulgham jiewen_tan webkit-bug-importer oldest_to_newest 1626404 0 jiewen_tan 2020-03-05 17:00:19 -0800 Avoid Apple Attestation when attestation = "none". 1626405 1 jiewen_tan 2020-03-05 17:00:32 -0800 <rdar://problem/59692104> 1626412 2 392653 jiewen_tan 2020-03-05 17:14:29 -0800 Created attachment 392653 Patch 1626800 3 392653 bfulgham 2020-03-06 12:30:55 -0800 Comment on attachment 392653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392653&action=review > Source/WebKit/ChangeLog:3 > + [WebAuthn] Avoid Apple Attestation when attestation = "none" Maybe call this "Do not perform Attestation with type is 'none'"? > Source/WebKit/ChangeLog:10 > + accesses to Apple Attestation for now. The whitelist includes file URL, "... to restrict access until validation is complete. The whitelist allows file URLs and test-related domains." > Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:101 > +// FIXME<rdar://problem/60108131>: Remove this whitelist before shipping. I think its enough just say: // FIXME(<rdar://problem/60108131>): Remove this whitelist once testing is complete. > LayoutTests/ChangeLog:3 > + [WebAuthn] Avoid Apple Attestation when attestation = "none" Ditto (change title). 1626803 4 392653 jiewen_tan 2020-03-06 12:37:10 -0800 Comment on attachment 392653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392653&action=review Thanks Brent for r+ this patch. >> Source/WebKit/ChangeLog:3 >> + [WebAuthn] Avoid Apple Attestation when attestation = "none" > > Maybe call this "Do not perform Attestation with type is 'none'"? Fixed. >> Source/WebKit/ChangeLog:10 >> + accesses to Apple Attestation for now. The whitelist includes file URL, > > "... to restrict access until validation is complete. The whitelist allows file URLs and test-related domains." Fixed. >> Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:101 >> +// FIXME<rdar://problem/60108131>: Remove this whitelist before shipping. > > I think its enough just say: > > // FIXME(<rdar://problem/60108131>): Remove this whitelist once testing is complete. Fixed. >> LayoutTests/ChangeLog:3 >> + [WebAuthn] Avoid Apple Attestation when attestation = "none" > > Ditto (change title). Fixed. 1626806 5 392757 jiewen_tan 2020-03-06 12:41:37 -0800 Created attachment 392757 Patch for Landing 1626807 6 jiewen_tan 2020-03-06 12:42:48 -0800 Committed r258020: <https://trac.webkit.org/changeset/258020> 392653 2020-03-05 17:14:29 -0800 2020-03-06 12:30:55 -0800 Patch bug-208676-20200305171428.patch text/plain 12044 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJmM2JiNzM1MmE0OTQyYjQw NmU4Mjg1YWJhYjkzM2I0NTc3ZmI0YzguLmVhMGZjMjk2ZTNjMTYwM2M0ZDEzMjg5ZWRhYjNhOTJm YjNjOWIxODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDMtMDUgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIEF2b2lkIEFw cGxlIEF0dGVzdGF0aW9uIHdoZW4gYXR0ZXN0YXRpb24gPSAibm9uZSIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY3NgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTk2OTIxMDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQmVzaWRlcyB0aGUgc3VnZ2VzdGVkIHRpdGxlLCB0aGlzIHBhdGNoIGFsc28g YWRkcyBhIHdoaXRlbGlzdCB0byByZXN0cmljdAorICAgICAgICBhY2Nlc3NlcyB0byBBcHBsZSBB dHRlc3RhdGlvbiBmb3Igbm93LiBUaGUgd2hpdGVsaXN0IGluY2x1ZGVzIGZpbGUgVVJMLAorICAg ICAgICBsb2NhbGhvc3QgYW5kIHRoZSB0ZXN0IHNpdGUuCisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cyB3aXRoIG5ldyBjb250ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQVBJV2ViQXV0aGVudGljYXRpb25QYW5lbENsaWVudC5oOgorICAgICAgICAoQVBJOjpXZWJB dXRoZW50aWNhdGlvblBhbmVsQ2xpZW50OjpzZWxlY3RBc3NlcnRpb25SZXNwb25zZSBjb25zdCk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVu dGljYXRvci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9M b2NhbEF1dGhlbnRpY2F0b3IubW06CisgICAgICAgIChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRv ckludGVybmFsOjp3aGl0ZWxpc3RlZFJwSWQpOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhl bnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24pOgor ICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhlbnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRp YWxBZnRlckF0dGVzdGVkKToKKwogMjAyMC0wMy0wNSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVf Y2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgd2ViIHBhZ2UgYWRkaXRpb25zIHRvIFdl YlBhZ2VQcm94eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdl YkF1dGhlbnRpY2F0aW9uUGFuZWxDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9BUElXZWJBdXRoZW50aWNhdGlvblBhbmVsQ2xpZW50LmgKaW5kZXggZjAxMjAzOWZhMzA3OTli ZDQ0NmI4NDkxZTg0MDQ1OTkyM2E4OTBjZC4uN2FmZGZkMmQ2MmVkNTJiNTViYjU1ZTI2ODBkN2Ni MjUyODUwY2ZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdl YkF1dGhlbnRpY2F0aW9uUGFuZWxDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJV2ViQXV0aGVudGljYXRpb25QYW5lbENsaWVudC5oCkBAIC01MCw3ICs1MCw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlUGFuZWwoV2ViS2l0OjpXZWJBdXRoZW50 aWNhdGlvblN0YXR1cykgY29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc21pc3NQYW5lbChX ZWJLaXQ6OldlYkF1dGhlbnRpY2F0aW9uUmVzdWx0KSBjb25zdCB7IH0KICAgICB2aXJ0dWFsIHZv aWQgcmVxdWVzdFBpbih1aW50NjRfdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXVEY6 OlN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSBjb25zdCB7IGNvbXBsZXRpb25IYW5kbGVy KGVtcHR5U3RyaW5nKCkpOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNlbGVjdEFzc2VydGlvblJlc3Bv bnNlKFZlY3RvcjxSZWY8V2ViQ29yZTo6QXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlPj4m JiByZXNwb25zZXMsIFdlYktpdDo6V2ViQXV0aGVudGljYXRpb25Tb3VyY2UsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoV2ViQ29yZTo6QXV0aGVudGljYXRvckFzc2VydGlvblJlc3BvbnNlKik+JiYg Y29tcGxldGlvbkhhbmRsZXIpIGNvbnN0IHsgY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7IH0K KyAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0QXNzZXJ0aW9uUmVzcG9uc2UoVmVjdG9yPFJlZjxXZWJD b3JlOjpBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVzcG9uc2U+PiYmLCBXZWJLaXQ6OldlYkF1dGhl bnRpY2F0aW9uU291cmNlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OkF1dGhlbnRp Y2F0b3JBc3NlcnRpb25SZXNwb25zZSopPiYmIGNvbXBsZXRpb25IYW5kbGVyKSBjb25zdCB7IGNv bXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOyB9CiAgICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGlj eUZvckxvY2FsQXV0aGVudGljYXRvcihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYktpdDo6TG9j YWxBdXRoZW50aWNhdG9yUG9saWN5KT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgeyBjb21w bGV0aW9uSGFuZGxlcihXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvclBvbGljeTo6RGlzYWxsb3cp OyB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50 aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5oCmluZGV4IDY5 ZWQzNGUxNTg0MTVjNTA1Yjk2NjU0ZWY3ZTAxN2ZkZDMyMTgwYmEuLjI4YWVlYzhhZDg0NDA5ZjAy NGVlMDQyM2U2OTFmNGE4ODI2ZWY1MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVu dGljYXRvci5oCkBAIC0zOCw3ICszOCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTG9j YWxBdXRoZW50aWNhdG9yIGZpbmFsIDogcHVibGljIEF1dGhlbnRpY2F0b3IgewogcHVibGljOgog ICAgIC8vIEhlcmUgaXMgdGhlIEZTTS4KLSAgICAvLyBNYWtlQ3JlZGVudGlhbDogSW5pdCA9PiBS ZXF1ZXN0UmVjZWl2ZWQgPT4gUG9saWN5RGVjaWRlZCA9PiBVc2VyVmVyaWZpZWQgPT4gQXR0ZXN0 ZWQgPT4gRW5kCisgICAgLy8gTWFrZUNyZWRlbnRpYWw6IEluaXQgPT4gUmVxdWVzdFJlY2VpdmVk ID0+IFBvbGljeURlY2lkZWQgPT4gVXNlclZlcmlmaWVkID0+IChBdHRlc3RlZCkgPT4gRW5kCiAg ICAgLy8gR2V0QXNzZXJ0aW9uOiBJbml0ID0+IFJlcXVlc3RSZWNlaXZlZCA9PiBSZXNwb25zZVNl bGVjdGVkID0+IFVzZXJWZXJpZmllZCA9PiBFbmQKICAgICBlbnVtIGNsYXNzIFN0YXRlIHsKICAg ICAgICAgSW5pdCwKQEAgLTYwLDcgKzYwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIG1ha2VDcmVk ZW50aWFsKCkgZmluYWw7CiAgICAgdm9pZCBjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJEZWNp ZGVQb2xpY3koTG9jYWxBdXRoZW50aWNhdG9yUG9saWN5KTsKICAgICB2b2lkIGNvbnRpbnVlTWFr ZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24oU2VjQWNjZXNzQ29udHJvbFJlZiwgTG9j YWxDb25uZWN0aW9uOjpVc2VyVmVyaWZpY2F0aW9uLCBMQUNvbnRleHQgKik7Ci0gICAgdm9pZCBj b250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJBdHRlc3RlZChTZWNLZXlSZWYsIFZlY3Rvcjx1aW50 OF90PiYmIGNyZWRlbnRpYWxJZCwgVmVjdG9yPHVpbnQ4X3Q+JiYgYXV0aERhdGEsIE5TQXJyYXkg KmNlcnRpZmljYXRlcywgTlNFcnJvciAqKTsKKyAgICB2b2lkIGNvbnRpbnVlTWFrZUNyZWRlbnRp YWxBZnRlckF0dGVzdGVkKFZlY3Rvcjx1aW50OF90PiYmIGNyZWRlbnRpYWxJZCwgVmVjdG9yPHVp bnQ4X3Q+JiYgYXV0aERhdGEsIE5TQXJyYXkgKmNlcnRpZmljYXRlcywgTlNFcnJvciAqKTsKIAog ICAgIHZvaWQgZ2V0QXNzZXJ0aW9uKCkgZmluYWw7CiAgICAgdm9pZCBjb250aW51ZUdldEFzc2Vy dGlvbkFmdGVyUmVzcG9uc2VTZWxlY3RlZChSZWY8V2ViQ29yZTo6QXV0aGVudGljYXRvckFzc2Vy dGlvblJlc3BvbnNlPiYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRvci5t bQppbmRleCBkYThjMWIzOWZmYThhYjVmNmNhMGMwOTc5YzlhZjM0YzliNTdmYzk1Li45OTgxZTQ0 YzRhMTU0NjZiMjliZDNmZTdkZTg2MDZkYmIwZTAxNGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3Iu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2Ev TG9jYWxBdXRoZW50aWNhdG9yLm1tCkBAIC05OCw2ICs5OCwxNyBAQCBzdGF0aWMgaW5saW5lIFJl ZjxBcnJheUJ1ZmZlcj4gdG9BcnJheUJ1ZmZlcihOU0RhdGEgKmRhdGEpCiAgICAgcmV0dXJuIEFy cmF5QnVmZmVyOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oZGF0YS5i eXRlcyksIGRhdGEubGVuZ3RoKTsKIH0KIAorLy8gRklYTUU8cmRhcjovL3Byb2JsZW0vNjAxMDgx MzE+OiBSZW1vdmUgdGhpcyB3aGl0ZWxpc3QgYmVmb3JlIHNoaXBwaW5nLgorc3RhdGljIGNvbnN0 IEhhc2hTZXQ8U3RyaW5nPiYgd2hpdGVsaXN0ZWRScElkKCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8SGFzaFNldDxTdHJpbmc+PiB3aGl0ZWxpc3RlZFJwSWQgPSBzdGQ6OmluaXRpYWxp emVyX2xpc3Q8U3RyaW5nPiB7CisgICAgICAgICIiLAorICAgICAgICAibG9jYWxob3N0IiwKKyAg ICAgICAgInRsc3Rlc3R3ZWJraXQub3JnIiwKKyAgICB9OworICAgIHJldHVybiB3aGl0ZWxpc3Rl ZFJwSWQ7Cit9CisKIH0gLy8gTG9jYWxBdXRoZW50aWNhdG9ySW50ZXJuYWwKIAogTG9jYWxBdXRo ZW50aWNhdG9yOjpMb2NhbEF1dGhlbnRpY2F0b3IoVW5pcXVlUmVmPExvY2FsQ29ubmVjdGlvbj4m JiBjb25uZWN0aW9uKQpAQCAtMzEzLDE5ICszMjQsMjUgQEAgdm9pZCBMb2NhbEF1dGhlbnRpY2F0 b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24oU2VjQWNjZXNz Q28KICAgICAvLyBTdGVwIDEyLgogICAgIGF1dG8gYXV0aERhdGEgPSBidWlsZEF1dGhEYXRhKGNy ZWF0aW9uT3B0aW9ucy5ycC5pZCwgbWFrZUNyZWRlbnRpYWxGbGFncywgY291bnRlciwgYXR0ZXN0 ZWRDcmVkZW50aWFsRGF0YSk7CiAKKyAgICAvLyBTa2lwIEFwcGxlIEF0dGVzdGF0aW9uIGZvciBu b25lIGF0dGVzdGF0aW9uLCBhbmQgbm9uIHdoaXRlbGlzdGVkIFJQIElEIGZvciBub3cuCisgICAg aWYgKGNyZWF0aW9uT3B0aW9ucy5hdHRlc3RhdGlvbiA9PSBBdHRlc3RhdGlvbkNvbnZleWFuY2VQ cmVmZXJlbmNlOjpOb25lIHx8ICF3aGl0ZWxpc3RlZFJwSWQoKS5jb250YWlucyhjcmVhdGlvbk9w dGlvbnMucnAuaWQpKSB7CisgICAgICAgIGF1dG8gYXR0ZXN0YXRpb25PYmplY3QgPSBidWlsZEF0 dGVzdGF0aW9uT2JqZWN0KFdURk1vdmUoYXV0aERhdGEpLCAiIiwgeyB9LCBBdHRlc3RhdGlvbkNv bnZleWFuY2VQcmVmZXJlbmNlOjpOb25lKTsKKyAgICAgICAgcmVjZWl2ZVJlc3BvbmQoQXV0aGVu dGljYXRvckF0dGVzdGF0aW9uUmVzcG9uc2U6OmNyZWF0ZShjcmVkZW50aWFsSWQsIGF0dGVzdGF0 aW9uT2JqZWN0KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyBTdGVwIDEzLiBB cHBsZSBBdHRlc3RhdGlvbgotICAgIGF1dG8gKnByaXZhdGVLZXlSZWYgPSBwcml2YXRlS2V5Lmdl dCgpOwogICAgIGF1dG8gbnNBdXRoRGF0YSA9IHRvTlNEYXRhKGF1dGhEYXRhKTsKLSAgICBhdXRv IGNhbGxiYWNrID0gW3ByaXZhdGVLZXkgPSBXVEZNb3ZlKHByaXZhdGVLZXkpLCBjcmVkZW50aWFs SWQgPSBXVEZNb3ZlKGNyZWRlbnRpYWxJZCksIGF1dGhEYXRhID0gV1RGTW92ZShhdXRoRGF0YSks IHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSAoTlNBcnJheSAqIF9OdWxsYWJsZSBjZXJ0 aWZpY2F0ZXMsIE5TRXJyb3IgKiBfTnVsbGFibGUgZXJyb3IpIG11dGFibGUgeworICAgIGF1dG8g Y2FsbGJhY2sgPSBbY3JlZGVudGlhbElkID0gV1RGTW92ZShjcmVkZW50aWFsSWQpLCBhdXRoRGF0 YSA9IFdURk1vdmUoYXV0aERhdGEpLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0gKE5T QXJyYXkgKiBfTnVsbGFibGUgY2VydGlmaWNhdGVzLCBOU0Vycm9yICogX051bGxhYmxlIGVycm9y KSBtdXRhYmxlIHsKICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICAgICAg aWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgd2Vha1RoaXMtPmNv bnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVkKHByaXZhdGVLZXkuZ2V0KCksIFdURk1v dmUoY3JlZGVudGlhbElkKSwgV1RGTW92ZShhdXRoRGF0YSksIGNlcnRpZmljYXRlcywgZXJyb3Ip OworICAgICAgICB3ZWFrVGhpcy0+Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQo V1RGTW92ZShjcmVkZW50aWFsSWQpLCBXVEZNb3ZlKGF1dGhEYXRhKSwgY2VydGlmaWNhdGVzLCBl cnJvcik7CiAgICAgfTsKLSAgICBtX2Nvbm5lY3Rpb24tPmdldEF0dGVzdGF0aW9uKHByaXZhdGVL ZXlSZWYsIG5zQXV0aERhdGEuZ2V0KCksIHRvTlNEYXRhKHJlcXVlc3REYXRhKCkuaGFzaCkuZ2V0 KCksIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICBtX2Nvbm5lY3Rpb24tPmdldEF0dGVzdGF0aW9u KHByaXZhdGVLZXkuZ2V0KCksIG5zQXV0aERhdGEuZ2V0KCksIHRvTlNEYXRhKHJlcXVlc3REYXRh KCkuaGFzaCkuZ2V0KCksIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIAotdm9pZCBMb2NhbEF1dGhl bnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVkKFNlY0tleVJlZiBw cml2YXRlS2V5LCBWZWN0b3I8dWludDhfdD4mJiBjcmVkZW50aWFsSWQsIFZlY3Rvcjx1aW50OF90 PiYmIGF1dGhEYXRhLCBOU0FycmF5ICpjZXJ0aWZpY2F0ZXMsIE5TRXJyb3IgKmVycm9yKQordm9p ZCBMb2NhbEF1dGhlbnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVk KFZlY3Rvcjx1aW50OF90PiYmIGNyZWRlbnRpYWxJZCwgVmVjdG9yPHVpbnQ4X3Q+JiYgYXV0aERh dGEsIE5TQXJyYXkgKmNlcnRpZmljYXRlcywgTlNFcnJvciAqZXJyb3IpCiB7CiAgICAgdXNpbmcg bmFtZXNwYWNlIExvY2FsQXV0aGVudGljYXRvckludGVybmFsOwogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMThiYjE4NWE1 MjA3NTM4OWI3ODM4MzMwNWU4N2Q4YTIyNTNkNTRkYi4uZjNhNzg2Y2RiNDVjZTg0NDYzYzk1MjY3 ODQ3M2FiYmI1ZTA1YzZmNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTA1ICBKaWV3 ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBBdm9p ZCBBcHBsZSBBdHRlc3RhdGlvbiB3aGVuIGF0dGVzdGF0aW9uID0gIm5vbmUiCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg2NzYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzU5NjkyMTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEF0dGVzdGF0aW9uIGlzIHNraXBwZWQgYnkgZGVmYXVsdCBhbmQgdGhl cmVmb3JlIGFkZCBwYXJhbWV0ZXJzIHRvIG92ZXJyaWRlIGl0LgorCisgICAgICAgICogaHR0cC93 cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNyZWF0ZS1mYWlsdXJlLWxvY2FsLmh0 dHBzLmh0bWw6CisgICAgICAgICogaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50 aWFsLWNyZWF0ZS1zdWNjZXNzLWxvY2FsLmh0dHBzLmh0bWw6CisKIDIwMjAtMDMtMDUgIFNhaWQg QWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUg dGhlIG9wdGltaXphdGlvbiBmb3IgZGlzY2FyZGluZyBubyBvcGVyYXRpb24gRGlzcGxheUxpc3Qg aXRlbXMgYmV0d2VlbiBTYXZlIGFuZCBSZXN0b3JlIGl0ZW1zCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLWZhaWx1 cmUtbG9jYWwuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1Ymxp Yy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCmluZGV4IDFj YWZmZDdjMmVmZjBkNzcxYmM0NDg3ZDE1NzVkYjA3ZDFlYTY4NWQuLjBhNWFiZTI4ODU2OWFlYzdi Y2U5OTc2ZTk3YjRlYjI4NTJlMmViODQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0 L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRw cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3Jl ZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCkBAIC0xMjksMTYgKzEyOSwy MCBAQAogICAgICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB1c2VyOiB7 CiAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lOiAiSm9obiBBcHBsZXNlZWQiLAotICAgICAg ICAgICAgICAgICAgICAgICAgaWQ6IEJhc2U2NFVSTC5wYXJzZSh0ZXN0VXNlcmhhbmRsZUJhc2U2 NCksCisgICAgICAgICAgICAgICAgICAgICAgICBpZDogQmFzZTY0VVJMLnBhcnNlKHVzZXJoYW5k bGVCYXNlNjQpLAogICAgICAgICAgICAgICAgICAgICAgICAgZGlzcGxheU5hbWU6ICJKb2huIiwK ICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgY2hhbGxlbmdlOiBh c2NpaVRvVWludDhBcnJheSgiMTIzNDU2IiksCi0gICAgICAgICAgICAgICAgICAgIHB1YktleUNy ZWRQYXJhbXM6IFt7IHR5cGU6ICJwdWJsaWMta2V5IiwgYWxnOiAtNyB9XQorICAgICAgICAgICAg ICAgICAgICBwdWJLZXlDcmVkUGFyYW1zOiBbeyB0eXBlOiAicHVibGljLWtleSIsIGFsZzogLTcg fV0sCisgICAgICAgICAgICAgICAgICAgIGF0dGVzdGF0aW9uOiAiZGlyZWN0IgogICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFs cykKICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29u ZmlndXJhdGlvbih7IGxvY2FsOiB7IGFjY2VwdEF1dGhlbnRpY2F0aW9uOiB0cnVlLCBhY2NlcHRB dHRlc3RhdGlvbjogZmFsc2UsIHByaXZhdGVLZXlCYXNlNjQ6IHByaXZhdGVLZXlCYXNlNjQgfSB9 KTsKLSAgICAgICAgICAgIHJldHVybiBwcm9taXNlUmVqZWN0cyh0LCAiVW5rbm93bkVycm9yIiwg bmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKSwgIkNvdWxkbid0IGF0dGVzdDog VGhlIG9wZXJhdGlvbiBjb3VsZG4ndCBjb21wbGV0ZS4iKTsKKyAgICAgICAgICAgIHJldHVybiBw cm9taXNlUmVqZWN0cyh0LCAiVW5rbm93bkVycm9yIiwgbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNy ZWF0ZShvcHRpb25zKSwgIkNvdWxkbid0IGF0dGVzdDogVGhlIG9wZXJhdGlvbiBjb3VsZG4ndCBj b21wbGV0ZS4iKS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RS dW5uZXIpCisgICAgICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuY2xlYW5VcEtleWNoYWluKHRl c3RScElkLCB1c2VyaGFuZGxlQmFzZTY0KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICB9LCAi UHVibGljS2V5Q3JlZGVudGlhbCdzIFtbY3JlYXRlXV0gd2l0aG91dCBhdHRlc3RhdGlvbiBpbiBh IG1vY2sgbG9jYWwgYXV0aGVudGljYXRvci4iKTsKIAogICAgICAgICBwcm9taXNlX3Rlc3QodCA9 PiB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5 LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbCBiL0xheW91dFRlc3Rz L2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1s b2NhbC5odHRwcy5odG1sCmluZGV4IGY1MzcyYmVjMzIxOTMzMjkyMDFjZmU3ZjBlZjg5NDFiOTA4 YWY0M2EuLjhhYWY1YWZiOWUzMTcwOWI2ZTI0NWY4Nzg0MmNkNmFlODNhYmNmOWMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1j cmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0 L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRw cy5odG1sCkBAIC0xNCw3ICsxNCw3IEBACiAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja1dl YkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7CiAgICAgICAgICAgICAgICAgbG9jYWw6IHsK ICAgICAgICAgICAgICAgICAgICAgYWNjZXB0QXV0aGVudGljYXRpb246IHRydWUsCi0gICAgICAg ICAgICAgICAgICAgIGFjY2VwdEF0dGVzdGF0aW9uOiB0cnVlLAorICAgICAgICAgICAgICAgICAg ICBhY2NlcHRBdHRlc3RhdGlvbjogZmFsc2UsCiAgICAgICAgICAgICAgICAgICAgIHByaXZhdGVL ZXlCYXNlNjQ6IHByaXZhdGVLZXlCYXNlNjQsCiAgICAgICAgICAgICAgICAgICAgIHVzZXJDZXJ0 aWZpY2F0ZUJhc2U2NDogdGVzdEF0dGVzdGF0aW9uQ2VydGlmaWNhdGVCYXNlNjQsCiAgICAgICAg ICAgICAgICAgICAgIGludGVybWVkaWF0ZUNBQ2VydGlmaWNhdGVCYXNlNjQ6IHRlc3RBdHRlc3Rh dGlvbklzc3VpbmdDQUNlcnRpZmljYXRlQmFzZTY0CkBAIC0xNzEsNiArMTcxLDE3IEBACiAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgfTsKIAorICAgICAgICAgICAgaWYgKHdpbmRvdy5p bnRlcm5hbHMpCisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tXZWJBdXRoZW50aWNh dGlvbkNvbmZpZ3VyYXRpb24oeworICAgICAgICAgICAgICAgICAgICBsb2NhbDogeworICAgICAg ICAgICAgICAgICAgICAgICAgYWNjZXB0QXV0aGVudGljYXRpb246IHRydWUsCisgICAgICAgICAg ICAgICAgICAgICAgICBhY2NlcHRBdHRlc3RhdGlvbjogdHJ1ZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgIHByaXZhdGVLZXlCYXNlNjQ6IHByaXZhdGVLZXlCYXNlNjQsCisgICAgICAgICAgICAg ICAgICAgICAgICB1c2VyQ2VydGlmaWNhdGVCYXNlNjQ6IHRlc3RBdHRlc3RhdGlvbkNlcnRpZmlj YXRlQmFzZTY0LAorICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJtZWRpYXRlQ0FDZXJ0aWZp Y2F0ZUJhc2U2NDogdGVzdEF0dGVzdGF0aW9uSXNzdWluZ0NBQ2VydGlmaWNhdGVCYXNlNjQKKyAg ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0pOworCiAgICAgICAgICAgICBy ZXR1cm4gbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKS50aGVuKGNyZWRlbnRp YWwgPT4gewogICAgICAgICAgICAgICAgIGNoZWNrUmVzdWx0KGNyZWRlbnRpYWwsIGZhbHNlKTsK ICAgICAgICAgICAgIH0pOwo= 392757 2020-03-06 12:41:37 -0800 2022-01-19 05:16:38 -0800 Patch for Landing bug-208676-20200306124136.patch text/plain 12086 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc1ZmE3NGY4ODY3NzQ2Zjk0 OGFhZGFiZWIwZjNmNTRkNmJjMmEyODYuLjU5ZjY2ZjFmNzdjOTBlZjAzNzY2ZWFjMGExMWQyNWNh YjA2NzAyMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDMtMDUgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViQXV0aG5dIERvIG5vdCBw ZXJmb3JtIEF0dGVzdGF0aW9uIHdpdGggdHlwZSBpcyAnbm9uZScKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY3NgorICAgICAgICA8cmRhcjovL3By b2JsZW0vNTk2OTIxMDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKwor ICAgICAgICBCZXNpZGVzIHRoZSBzdWdnZXN0ZWQgdGl0bGUsIHRoaXMgcGF0Y2ggYWxzbyBhZGRz IGEgd2hpdGVsaXN0IHRvIHJlc3RyaWN0CisgICAgICAgIGFjY2VzcyB1bnRpbCB2YWxpZGF0aW9u IGlzIGNvbXBsZXRlLiBUaGUgd2hpdGVsaXN0IGFsbG93cyBmaWxlIFVSTHMgYW5kCisgICAgICAg IHRlc3QtcmVsYXRlZCBkb21haW5zLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMgd2l0aCBuZXcgY29udGVudHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVdlYkF1 dGhlbnRpY2F0aW9uUGFuZWxDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6V2ViQXV0aGVudGljYXRp b25QYW5lbENsaWVudDo6c2VsZWN0QXNzZXJ0aW9uUmVzcG9uc2UgY29uc3QpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50 aWNhdG9yLm1tOgorICAgICAgICAoV2ViS2l0OjpMb2NhbEF1dGhlbnRpY2F0b3JJbnRlcm5hbDo6 d2hpdGVsaXN0ZWRScElkKToKKyAgICAgICAgKFdlYktpdDo6TG9jYWxBdXRoZW50aWNhdG9yOjpj b250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJVc2VyVmVyaWZpY2F0aW9uKToKKyAgICAgICAgKFdl YktpdDo6TG9jYWxBdXRoZW50aWNhdG9yOjpjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJBdHRl c3RlZCk6CisKIDIwMjAtMDMtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIE1ha2Ugc3VyZSBjb21wbGV0aW9uIGhhbmRsZXIgZ2l2ZW4gdG8gQXV4aWxpYXJ5 UHJvY2Vzc1Byb3h5OjpzZW5kTWVzc2FnZSBpcyBjYWxsZWQgYXN5bmNocm9ub3VzbHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJBdXRoZW50aWNhdGlvblBh bmVsQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2ViQXV0aGVudGlj YXRpb25QYW5lbENsaWVudC5oCmluZGV4IGYwMTIwMzlmYTMwNzk5YmQ0NDZiODQ5MWU4NDA0NTk5 MjNhODkwY2QuLjdhZmRmZDJkNjJlZDUyYjU1YmI1NWUyNjgwZDdjYjI1Mjg1MGNmYjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJBdXRoZW50aWNhdGlvblBh bmVsQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdlYkF1dGhl bnRpY2F0aW9uUGFuZWxDbGllbnQuaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZVBhbmVsKFdlYktpdDo6V2ViQXV0aGVudGljYXRpb25TdGF0dXMpIGNv bnN0IHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNtaXNzUGFuZWwoV2ViS2l0OjpXZWJBdXRoZW50 aWNhdGlvblJlc3VsdCkgY29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RQaW4odWlu dDY0X3QsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV1RGOjpTdHJpbmcmKT4mJiBjb21w bGV0aW9uSGFuZGxlcikgY29uc3QgeyBjb21wbGV0aW9uSGFuZGxlcihlbXB0eVN0cmluZygpKTsg fQotICAgIHZpcnR1YWwgdm9pZCBzZWxlY3RBc3NlcnRpb25SZXNwb25zZShWZWN0b3I8UmVmPFdl YkNvcmU6OkF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZT4+JiYgcmVzcG9uc2VzLCBXZWJL aXQ6OldlYkF1dGhlbnRpY2F0aW9uU291cmNlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYkNv cmU6OkF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZSopPiYmIGNvbXBsZXRpb25IYW5kbGVy KSBjb25zdCB7IGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOyB9CisgICAgdmlydHVhbCB2b2lk IHNlbGVjdEFzc2VydGlvblJlc3BvbnNlKFZlY3RvcjxSZWY8V2ViQ29yZTo6QXV0aGVudGljYXRv ckFzc2VydGlvblJlc3BvbnNlPj4mJiwgV2ViS2l0OjpXZWJBdXRoZW50aWNhdGlvblNvdXJjZSwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpBdXRoZW50aWNhdG9yQXNzZXJ0aW9uUmVz cG9uc2UqKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgY29uc3QgeyBjb21wbGV0aW9uSGFuZGxlcihu dWxscHRyKTsgfQogICAgIHZpcnR1YWwgdm9pZCBkZWNpZGVQb2xpY3lGb3JMb2NhbEF1dGhlbnRp Y2F0b3IoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJLaXQ6OkxvY2FsQXV0aGVudGljYXRvclBv bGljeSk+JiYgY29tcGxldGlvbkhhbmRsZXIpIGNvbnN0IHsgY29tcGxldGlvbkhhbmRsZXIoV2Vi S2l0OjpMb2NhbEF1dGhlbnRpY2F0b3JQb2xpY3k6OkRpc2FsbG93KTsgfQogfTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQXV0aGVudGljYXRpb24vQ29jb2EvTG9j YWxBdXRoZW50aWNhdG9yLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IuaAppbmRleCA2OWVkMzRlMTU4NDE1YzUwNWI5 NjY1NGVmN2UwMTdmZGQzMjE4MGJhLi4yOGFlZWM4YWQ4NDQwOWYwMjRlZTA0MjNlNjkxZjRhODgy NmVmNTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNh dGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IuaApAQCAtMzgs NyArMzgsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIExvY2FsQXV0aGVudGljYXRvciBm aW5hbCA6IHB1YmxpYyBBdXRoZW50aWNhdG9yIHsKIHB1YmxpYzoKICAgICAvLyBIZXJlIGlzIHRo ZSBGU00uCi0gICAgLy8gTWFrZUNyZWRlbnRpYWw6IEluaXQgPT4gUmVxdWVzdFJlY2VpdmVkID0+ IFBvbGljeURlY2lkZWQgPT4gVXNlclZlcmlmaWVkID0+IEF0dGVzdGVkID0+IEVuZAorICAgIC8v IE1ha2VDcmVkZW50aWFsOiBJbml0ID0+IFJlcXVlc3RSZWNlaXZlZCA9PiBQb2xpY3lEZWNpZGVk ID0+IFVzZXJWZXJpZmllZCA9PiAoQXR0ZXN0ZWQpID0+IEVuZAogICAgIC8vIEdldEFzc2VydGlv bjogSW5pdCA9PiBSZXF1ZXN0UmVjZWl2ZWQgPT4gUmVzcG9uc2VTZWxlY3RlZCA9PiBVc2VyVmVy aWZpZWQgPT4gRW5kCiAgICAgZW51bSBjbGFzcyBTdGF0ZSB7CiAgICAgICAgIEluaXQsCkBAIC02 MCw3ICs2MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtYWtlQ3JlZGVudGlhbCgpIGZpbmFsOwog ICAgIHZvaWQgY29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyRGVjaWRlUG9saWN5KExvY2FsQXV0 aGVudGljYXRvclBvbGljeSk7CiAgICAgdm9pZCBjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJV c2VyVmVyaWZpY2F0aW9uKFNlY0FjY2Vzc0NvbnRyb2xSZWYsIExvY2FsQ29ubmVjdGlvbjo6VXNl clZlcmlmaWNhdGlvbiwgTEFDb250ZXh0ICopOwotICAgIHZvaWQgY29udGludWVNYWtlQ3JlZGVu dGlhbEFmdGVyQXR0ZXN0ZWQoU2VjS2V5UmVmLCBWZWN0b3I8dWludDhfdD4mJiBjcmVkZW50aWFs SWQsIFZlY3Rvcjx1aW50OF90PiYmIGF1dGhEYXRhLCBOU0FycmF5ICpjZXJ0aWZpY2F0ZXMsIE5T RXJyb3IgKik7CisgICAgdm9pZCBjb250aW51ZU1ha2VDcmVkZW50aWFsQWZ0ZXJBdHRlc3RlZChW ZWN0b3I8dWludDhfdD4mJiBjcmVkZW50aWFsSWQsIFZlY3Rvcjx1aW50OF90PiYmIGF1dGhEYXRh LCBOU0FycmF5ICpjZXJ0aWZpY2F0ZXMsIE5TRXJyb3IgKik7CiAKICAgICB2b2lkIGdldEFzc2Vy dGlvbigpIGZpbmFsOwogICAgIHZvaWQgY29udGludWVHZXRBc3NlcnRpb25BZnRlclJlc3BvbnNl U2VsZWN0ZWQoUmVmPFdlYkNvcmU6OkF1dGhlbnRpY2F0b3JBc3NlcnRpb25SZXNwb25zZT4mJik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJBdXRoZW50aWNhdGlvbi9D b2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJB dXRoZW50aWNhdGlvbi9Db2NvYS9Mb2NhbEF1dGhlbnRpY2F0b3IubW0KaW5kZXggZGE4YzFiMzlm ZmE4YWI1ZjZjYTBjMDk3OWM5YWYzNGM5YjU3ZmM5NS4uNDc3ZDNkMzQ1NWM1Yjc3NmM1ZTdmMDkw NzAzNjcyMjIyYzc1ZDQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi QXV0aGVudGljYXRpb24vQ29jb2EvTG9jYWxBdXRoZW50aWNhdG9yLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkF1dGhlbnRpY2F0aW9uL0NvY29hL0xvY2FsQXV0aGVudGljYXRv ci5tbQpAQCAtOTgsNiArOTgsMTcgQEAgc3RhdGljIGlubGluZSBSZWY8QXJyYXlCdWZmZXI+IHRv QXJyYXlCdWZmZXIoTlNEYXRhICpkYXRhKQogICAgIHJldHVybiBBcnJheUJ1ZmZlcjo6Y3JlYXRl KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGRhdGEuYnl0ZXMpLCBkYXRhLmxlbmd0 aCk7CiB9CiAKKy8vIEZJWE1FKDxyZGFyOi8vcHJvYmxlbS82MDEwODEzMT4pOiBSZW1vdmUgdGhp cyB3aGl0ZWxpc3Qgb25jZSB0ZXN0aW5nIGlzIGNvbXBsZXRlLgorc3RhdGljIGNvbnN0IEhhc2hT ZXQ8U3RyaW5nPiYgd2hpdGVsaXN0ZWRScElkKCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8SGFzaFNldDxTdHJpbmc+PiB3aGl0ZWxpc3RlZFJwSWQgPSBzdGQ6OmluaXRpYWxpemVyX2xp c3Q8U3RyaW5nPiB7CisgICAgICAgICIiLAorICAgICAgICAibG9jYWxob3N0IiwKKyAgICAgICAg InRsc3Rlc3R3ZWJraXQub3JnIiwKKyAgICB9OworICAgIHJldHVybiB3aGl0ZWxpc3RlZFJwSWQ7 Cit9CisKIH0gLy8gTG9jYWxBdXRoZW50aWNhdG9ySW50ZXJuYWwKIAogTG9jYWxBdXRoZW50aWNh dG9yOjpMb2NhbEF1dGhlbnRpY2F0b3IoVW5pcXVlUmVmPExvY2FsQ29ubmVjdGlvbj4mJiBjb25u ZWN0aW9uKQpAQCAtMzEzLDE5ICszMjQsMjUgQEAgdm9pZCBMb2NhbEF1dGhlbnRpY2F0b3I6OmNv bnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlclVzZXJWZXJpZmljYXRpb24oU2VjQWNjZXNzQ28KICAg ICAvLyBTdGVwIDEyLgogICAgIGF1dG8gYXV0aERhdGEgPSBidWlsZEF1dGhEYXRhKGNyZWF0aW9u T3B0aW9ucy5ycC5pZCwgbWFrZUNyZWRlbnRpYWxGbGFncywgY291bnRlciwgYXR0ZXN0ZWRDcmVk ZW50aWFsRGF0YSk7CiAKKyAgICAvLyBTa2lwIEFwcGxlIEF0dGVzdGF0aW9uIGZvciBub25lIGF0 dGVzdGF0aW9uLCBhbmQgbm9uIHdoaXRlbGlzdGVkIFJQIElEIGZvciBub3cuCisgICAgaWYgKGNy ZWF0aW9uT3B0aW9ucy5hdHRlc3RhdGlvbiA9PSBBdHRlc3RhdGlvbkNvbnZleWFuY2VQcmVmZXJl bmNlOjpOb25lIHx8ICF3aGl0ZWxpc3RlZFJwSWQoKS5jb250YWlucyhjcmVhdGlvbk9wdGlvbnMu cnAuaWQpKSB7CisgICAgICAgIGF1dG8gYXR0ZXN0YXRpb25PYmplY3QgPSBidWlsZEF0dGVzdGF0 aW9uT2JqZWN0KFdURk1vdmUoYXV0aERhdGEpLCAiIiwgeyB9LCBBdHRlc3RhdGlvbkNvbnZleWFu Y2VQcmVmZXJlbmNlOjpOb25lKTsKKyAgICAgICAgcmVjZWl2ZVJlc3BvbmQoQXV0aGVudGljYXRv ckF0dGVzdGF0aW9uUmVzcG9uc2U6OmNyZWF0ZShjcmVkZW50aWFsSWQsIGF0dGVzdGF0aW9uT2Jq ZWN0KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyBTdGVwIDEzLiBBcHBsZSBB dHRlc3RhdGlvbgotICAgIGF1dG8gKnByaXZhdGVLZXlSZWYgPSBwcml2YXRlS2V5LmdldCgpOwog ICAgIGF1dG8gbnNBdXRoRGF0YSA9IHRvTlNEYXRhKGF1dGhEYXRhKTsKLSAgICBhdXRvIGNhbGxi YWNrID0gW3ByaXZhdGVLZXkgPSBXVEZNb3ZlKHByaXZhdGVLZXkpLCBjcmVkZW50aWFsSWQgPSBX VEZNb3ZlKGNyZWRlbnRpYWxJZCksIGF1dGhEYXRhID0gV1RGTW92ZShhdXRoRGF0YSksIHdlYWtU aGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSAoTlNBcnJheSAqIF9OdWxsYWJsZSBjZXJ0aWZpY2F0 ZXMsIE5TRXJyb3IgKiBfTnVsbGFibGUgZXJyb3IpIG11dGFibGUgeworICAgIGF1dG8gY2FsbGJh Y2sgPSBbY3JlZGVudGlhbElkID0gV1RGTW92ZShjcmVkZW50aWFsSWQpLCBhdXRoRGF0YSA9IFdU Rk1vdmUoYXV0aERhdGEpLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0gKE5TQXJyYXkg KiBfTnVsbGFibGUgY2VydGlmaWNhdGVzLCBOU0Vycm9yICogX051bGxhYmxlIGVycm9yKSBtdXRh YmxlIHsKICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICAgICAgaWYgKCF3 ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgd2Vha1RoaXMtPmNvbnRpbnVl TWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVkKHByaXZhdGVLZXkuZ2V0KCksIFdURk1vdmUoY3Jl ZGVudGlhbElkKSwgV1RGTW92ZShhdXRoRGF0YSksIGNlcnRpZmljYXRlcywgZXJyb3IpOworICAg ICAgICB3ZWFrVGhpcy0+Y29udGludWVNYWtlQ3JlZGVudGlhbEFmdGVyQXR0ZXN0ZWQoV1RGTW92 ZShjcmVkZW50aWFsSWQpLCBXVEZNb3ZlKGF1dGhEYXRhKSwgY2VydGlmaWNhdGVzLCBlcnJvcik7 CiAgICAgfTsKLSAgICBtX2Nvbm5lY3Rpb24tPmdldEF0dGVzdGF0aW9uKHByaXZhdGVLZXlSZWYs IG5zQXV0aERhdGEuZ2V0KCksIHRvTlNEYXRhKHJlcXVlc3REYXRhKCkuaGFzaCkuZ2V0KCksIFdU Rk1vdmUoY2FsbGJhY2spKTsKKyAgICBtX2Nvbm5lY3Rpb24tPmdldEF0dGVzdGF0aW9uKHByaXZh dGVLZXkuZ2V0KCksIG5zQXV0aERhdGEuZ2V0KCksIHRvTlNEYXRhKHJlcXVlc3REYXRhKCkuaGFz aCkuZ2V0KCksIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIAotdm9pZCBMb2NhbEF1dGhlbnRpY2F0 b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVkKFNlY0tleVJlZiBwcml2YXRl S2V5LCBWZWN0b3I8dWludDhfdD4mJiBjcmVkZW50aWFsSWQsIFZlY3Rvcjx1aW50OF90PiYmIGF1 dGhEYXRhLCBOU0FycmF5ICpjZXJ0aWZpY2F0ZXMsIE5TRXJyb3IgKmVycm9yKQordm9pZCBMb2Nh bEF1dGhlbnRpY2F0b3I6OmNvbnRpbnVlTWFrZUNyZWRlbnRpYWxBZnRlckF0dGVzdGVkKFZlY3Rv cjx1aW50OF90PiYmIGNyZWRlbnRpYWxJZCwgVmVjdG9yPHVpbnQ4X3Q+JiYgYXV0aERhdGEsIE5T QXJyYXkgKmNlcnRpZmljYXRlcywgTlNFcnJvciAqZXJyb3IpCiB7CiAgICAgdXNpbmcgbmFtZXNw YWNlIExvY2FsQXV0aGVudGljYXRvckludGVybmFsOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDI4MzExMTA0NGM4ZGU5 ZjBmNmU0MDhlZTE4Yzc2NzY1ZjJmMzk4OC4uOWUwZGIzZDBiNGM4NDA2YjBiNTVhNGVkZGMxOWY2 ZjIwMmMyZjY5ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTA1ICBKaWV3ZW4gVGFu ICA8amlld2VuX3RhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1dGhuXSBEbyBub3QgcGVy Zm9ybSBBdHRlc3RhdGlvbiB3aXRoIHR5cGUgaXMgJ25vbmUnCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg2NzYKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU5NjkyMTA0PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAg ICAgICAgQXR0ZXN0YXRpb24gaXMgc2tpcHBlZCBieSBkZWZhdWx0IGFuZCB0aGVyZWZvcmUgYWRk IHBhcmFtZXRlcnMgdG8gb3ZlcnJpZGUgaXQuCisKKyAgICAgICAgKiBodHRwL3dwdC93ZWJhdXRo bi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLWZhaWx1cmUtbG9jYWwuaHR0cHMuaHRtbDoK KyAgICAgICAgKiBodHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRl LXN1Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbDoKKwogMjAyMC0wMy0wNiAgSmFzb24gTGF3cmVuY2Ug IDxsYXdyZW5jZS5qQGFwcGxlLmNvbT4KIAogICAgICAgICBbIG1hY09TIGlPUyB3azIgXSBodHRw L3dwdC9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3JrZXItbmV0d29ya3Byb2Nlc3MtY3Jhc2gu aHRtbCBpcyBmbGFreSBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC93 ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLWZhaWx1cmUtbG9jYWwuaHR0cHMu aHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlh bC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCmluZGV4IDFjYWZmZDdjMmVmZjBkNzcx YmM0NDg3ZDE1NzVkYjA3ZDFlYTY4NWQuLjBhNWFiZTI4ODU2OWFlYzdiY2U5OTc2ZTk3YjRlYjI4 NTJlMmViODQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1Ymxp Yy1rZXktY3JlZGVudGlhbC1jcmVhdGUtZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUt ZmFpbHVyZS1sb2NhbC5odHRwcy5odG1sCkBAIC0xMjksMTYgKzEyOSwyMCBAQAogICAgICAgICAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICAgICB1c2VyOiB7CiAgICAgICAgICAgICAg ICAgICAgICAgICBuYW1lOiAiSm9obiBBcHBsZXNlZWQiLAotICAgICAgICAgICAgICAgICAgICAg ICAgaWQ6IEJhc2U2NFVSTC5wYXJzZSh0ZXN0VXNlcmhhbmRsZUJhc2U2NCksCisgICAgICAgICAg ICAgICAgICAgICAgICBpZDogQmFzZTY0VVJMLnBhcnNlKHVzZXJoYW5kbGVCYXNlNjQpLAogICAg ICAgICAgICAgICAgICAgICAgICAgZGlzcGxheU5hbWU6ICJKb2huIiwKICAgICAgICAgICAgICAg ICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAgY2hhbGxlbmdlOiBhc2NpaVRvVWludDhBcnJh eSgiMTIzNDU2IiksCi0gICAgICAgICAgICAgICAgICAgIHB1YktleUNyZWRQYXJhbXM6IFt7IHR5 cGU6ICJwdWJsaWMta2V5IiwgYWxnOiAtNyB9XQorICAgICAgICAgICAgICAgICAgICBwdWJLZXlD cmVkUGFyYW1zOiBbeyB0eXBlOiAicHVibGljLWtleSIsIGFsZzogLTcgfV0sCisgICAgICAgICAg ICAgICAgICAgIGF0dGVzdGF0aW9uOiAiZGlyZWN0IgogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH07CiAgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFscykKICAgICAgICAgICAg ICAgICBpbnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9uQ29uZmlndXJhdGlvbih7IGxv Y2FsOiB7IGFjY2VwdEF1dGhlbnRpY2F0aW9uOiB0cnVlLCBhY2NlcHRBdHRlc3RhdGlvbjogZmFs c2UsIHByaXZhdGVLZXlCYXNlNjQ6IHByaXZhdGVLZXlCYXNlNjQgfSB9KTsKLSAgICAgICAgICAg IHJldHVybiBwcm9taXNlUmVqZWN0cyh0LCAiVW5rbm93bkVycm9yIiwgbmF2aWdhdG9yLmNyZWRl bnRpYWxzLmNyZWF0ZShvcHRpb25zKSwgIkNvdWxkbid0IGF0dGVzdDogVGhlIG9wZXJhdGlvbiBj b3VsZG4ndCBjb21wbGV0ZS4iKTsKKyAgICAgICAgICAgIHJldHVybiBwcm9taXNlUmVqZWN0cyh0 LCAiVW5rbm93bkVycm9yIiwgbmF2aWdhdG9yLmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKSwg IkNvdWxkbid0IGF0dGVzdDogVGhlIG9wZXJhdGlvbiBjb3VsZG4ndCBjb21wbGV0ZS4iKS50aGVu KCgpID0+IHsKKyAgICAgICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAg ICAgICAgICAgICAgIHRlc3RSdW5uZXIuY2xlYW5VcEtleWNoYWluKHRlc3RScElkLCB1c2VyaGFu ZGxlQmFzZTY0KTsKKyAgICAgICAgICAgIH0pOwogICAgICAgICB9LCAiUHVibGljS2V5Q3JlZGVu dGlhbCdzIFtbY3JlYXRlXV0gd2l0aG91dCBhdHRlc3RhdGlvbiBpbiBhIG1vY2sgbG9jYWwgYXV0 aGVudGljYXRvci4iKTsKIAogICAgICAgICBwcm9taXNlX3Rlc3QodCA9PiB7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3dwdC93ZWJhdXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3Jl YXRlLXN1Y2Nlc3MtbG9jYWwuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1 dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRwcy5odG1s CmluZGV4IGY1MzcyYmVjMzIxOTMzMjkyMDFjZmU3ZjBlZjg5NDFiOTA4YWY0M2EuLjhhYWY1YWZi OWUzMTcwOWI2ZTI0NWY4Nzg0MmNkNmFlODNhYmNmOWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1s b2NhbC5odHRwcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3dlYmF1dGhuL3B1Ymxp Yy1rZXktY3JlZGVudGlhbC1jcmVhdGUtc3VjY2Vzcy1sb2NhbC5odHRwcy5odG1sCkBAIC0xNCw3 ICsxNCw3IEBACiAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja1dlYkF1dGhlbnRpY2F0aW9u Q29uZmlndXJhdGlvbih7CiAgICAgICAgICAgICAgICAgbG9jYWw6IHsKICAgICAgICAgICAgICAg ICAgICAgYWNjZXB0QXV0aGVudGljYXRpb246IHRydWUsCi0gICAgICAgICAgICAgICAgICAgIGFj Y2VwdEF0dGVzdGF0aW9uOiB0cnVlLAorICAgICAgICAgICAgICAgICAgICBhY2NlcHRBdHRlc3Rh dGlvbjogZmFsc2UsCiAgICAgICAgICAgICAgICAgICAgIHByaXZhdGVLZXlCYXNlNjQ6IHByaXZh dGVLZXlCYXNlNjQsCiAgICAgICAgICAgICAgICAgICAgIHVzZXJDZXJ0aWZpY2F0ZUJhc2U2NDog dGVzdEF0dGVzdGF0aW9uQ2VydGlmaWNhdGVCYXNlNjQsCiAgICAgICAgICAgICAgICAgICAgIGlu dGVybWVkaWF0ZUNBQ2VydGlmaWNhdGVCYXNlNjQ6IHRlc3RBdHRlc3RhdGlvbklzc3VpbmdDQUNl cnRpZmljYXRlQmFzZTY0CkBAIC0xNzEsNiArMTcxLDE3IEBACiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfTsKIAorICAgICAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAg ICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tXZWJBdXRoZW50aWNhdGlvbkNvbmZpZ3VyYXRp b24oeworICAgICAgICAgICAgICAgICAgICBsb2NhbDogeworICAgICAgICAgICAgICAgICAgICAg ICAgYWNjZXB0QXV0aGVudGljYXRpb246IHRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICBh Y2NlcHRBdHRlc3RhdGlvbjogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHByaXZhdGVL ZXlCYXNlNjQ6IHByaXZhdGVLZXlCYXNlNjQsCisgICAgICAgICAgICAgICAgICAgICAgICB1c2Vy Q2VydGlmaWNhdGVCYXNlNjQ6IHRlc3RBdHRlc3RhdGlvbkNlcnRpZmljYXRlQmFzZTY0LAorICAg ICAgICAgICAgICAgICAgICAgICAgaW50ZXJtZWRpYXRlQ0FDZXJ0aWZpY2F0ZUJhc2U2NDogdGVz dEF0dGVzdGF0aW9uSXNzdWluZ0NBQ2VydGlmaWNhdGVCYXNlNjQKKyAgICAgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgICAgIH0pOworCiAgICAgICAgICAgICByZXR1cm4gbmF2aWdhdG9y LmNyZWRlbnRpYWxzLmNyZWF0ZShvcHRpb25zKS50aGVuKGNyZWRlbnRpYWwgPT4gewogICAgICAg ICAgICAgICAgIGNoZWNrUmVzdWx0KGNyZWRlbnRpYWwsIGZhbHNlKTsKICAgICAgICAgICAgIH0p Owo=