107124 2013-01-17 07:15:31 -0800 [BlackBerry] Race condition clearing invalid proxy credentials in NetworkJob 2013-01-18 09:39:28 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 joenotcharles joenotcharles mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 809316 0 joenotcharles 2013-01-17 07:15:31 -0800 NetworkJob contains this code when sending a request with proxy auth credentials: // Prevent them from been used again if they are wrong. // If they are correct, they will be put into CredentialStorage. if (!proxyInfo.address.empty()) { proxyInfo.username.clear(); proxyInfo.password.clear(); BlackBerry::Platform::Settings::instance()->storeProxyCredentials(proxyInfo); } Later when notifyAuthReceived is called, the credentials used are saved in CredentialStorage if "success" is true, or purged if "success" is false. The intent is that from this point forward the credentials will be read from CredentialStorage rather than Platform::Settings, and if the credentials did not succeed they will not be in CredentialStorage so the browser will re-prompt. Two problems with this: 1. If the proxy server is slow to respond, another request could go out before the success result is received, and since the credentials have already been cleared this request would prompt the user for credentials even though the saved credentials are correct. 2. In CredentialStorage, the credentials are indexed by auth type, and in Settings they are not. So after successfully authenticating with, for instance, NTLM auth, the credentials will be stored with NTLM but cleared from Settings. If the proxy server is then reconfigured to ask for Digest auth, the browser will prompt for credentials again rather than using the saved credentials. 809322 1 183182 joenotcharles 2013-01-17 07:23:40 -0800 Created attachment 183182 fix 809611 2 183182 webkit.review.bot 2013-01-17 12:16:59 -0800 Comment on attachment 183182 fix Rejecting attachment 183182 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: t/git/webkit-commit-queue/Source/WebKit/chromium/v8 --revision 13388 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 53>At revision 13388. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/15943093 810682 3 183476 joenotcharles 2013-01-18 09:07:23 -0800 Created attachment 183476 rebased patch Rebased 810721 4 183476 webkit.review.bot 2013-01-18 09:39:25 -0800 Comment on attachment 183476 rebased patch Clearing flags on attachment: 183476 Committed r140164: <http://trac.webkit.org/changeset/140164> 810722 5 webkit.review.bot 2013-01-18 09:39:28 -0800 All reviewed patches have been landed. Closing bug. 183182 2013-01-17 07:23:40 -0800 2013-01-18 09:07:23 -0800 fix 0001-BlackBerry-Only-clear-credentials-when-purgeCredenti.patch text/plain 5342 joenotcharles RnJvbSA4MGQ3NGNmMGZhZGJmMGRlNTY5NDU2MmU3NjUyMWE4MjI0ZTkyNWUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDE3IEphbiAyMDEzIDEwOjEzOjE0IC0wNTAwClN1YmplY3Q6IFtQQVRDSCAxLzNdIFtCbGFja0Jl cnJ5XSBPbmx5IGNsZWFyIGNyZWRlbnRpYWxzIHdoZW4KIHB1cmdlQ3JlZGVudGlhbHMgaXMgY2Fs bGVkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTI0CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClN0b3AgY2xlYXJpbmcgY3JlZGVudGlhbHMgd2hlbiBz ZW5kaW5nIG91dCBhIHJlcXVlc3QganVzdCBpbiBjYXNlIHRoZXkncmUgd3JvbmcuIFRoYXQncyBz dHVwaWQgYW5kCmhhcyByYWNlIGNvbmRpdGlvbnMuIE9ubHkgY2xlYXIgdGhlbSB3aGVuIHdlIGtu b3cgdGhleSdyZSB3cm9uZy4KCkludGVybmFsIFBSOiAyMzExNTgKSW50ZXJuYWwgUmV2aWV3ZXI6 IEdlb3JnZSBTdGFpa29zCgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9i LmNwcDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToK KFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnB1cmdlQ3JlZGVudGlhbHMpOgotLS0KIFNvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNyArKysrKysrKysK IC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAgIHwgICAz NyArKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCsp LCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ0YTMwZC4uMzdmNjJlYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTE3ICBKb2UgTWFzb24gIDxqbWFzb25Acmlt LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gT25seSBjbGVhciBjcmVkZW50aWFscyB3aGVu IHB1cmdlQ3JlZGVudGlhbHMgaXMgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcxMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTdG9wIGNsZWFyaW5nIGNyZWRlbnRpYWxzIHdoZW4gc2VuZGlu ZyBvdXQgYSByZXF1ZXN0IGp1c3QgaW4gY2FzZSB0aGV5J3JlIHdyb25nLiBUaGF0J3Mgc3R1cGlk IGFuZAorICAgICAgICBoYXMgcmFjZSBjb25kaXRpb25zLiBPbmx5IGNsZWFyIHRoZW0gd2hlbiB3 ZSBrbm93IHRoZXkncmUgd3JvbmcuCisKKyAgICAgICAgSW50ZXJuYWwgUFI6IDIzMTE1OAorICAg ICAgICBJbnRlcm5hbCBSZXZpZXdlcjogR2VvcmdlIFN0YWlrb3MKKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKKyAgICAgICAgKFdlYkNv cmU6Ok5ldHdvcmtKb2I6OnB1cmdlQ3JlZGVudGlhbHMpOgorCiAyMDEzLTAxLTExICBNYXJ5IFd1 ICA8bWFyeS53dUB0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVu YWJsZSBjb25jYXRlbmF0aW5nIGhlYWRlcnMgd2l0aCBzYW1lIGZpZWxkIG5hbWUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9i LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3Jr Sm9iLmNwcAppbmRleCA0Y2QzNDk2Li4yYTk3YWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiBS ZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHly aWdodCAoQykgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiwgMjAxMyBSZXNlYXJjaCBJbiBNb3Rpb24g TGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCkBAIC03NjIs NiArNzYyLDkgQEAgYm9vbCBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQ cm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlIHR5cGUsIFByb3QKICAgICBpZiAoIW5ld1VSTC5pc1Zh bGlkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIElNUE9SVEFOVDogaWYgYSBu ZXcgc291cmNlIG9mIGNyZWRlbnRpYWxzIGlzIGFkZGVkIHRvIHRoaXMgbWV0aG9kLCBiZSBzdXJl IHRvIGhhbmRsZSBpdCBpbgorICAgIC8vIHB1cmdlQ3JlZGVudGlhbHMgYXMgd2VsbCEKKwogICAg IFN0cmluZyBob3N0OwogICAgIGludCBwb3J0OwogICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpQ cm94eUluZm8gcHJveHlJbmZvOwpAQCAtODMyLDE4ICs4MzUsNyBAQCBib29sIE5ldHdvcmtKb2I6 OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUgdHlw ZSwgUHJvdAogICAgICAgICB9CiAKICAgICAgICAgLy8gQmVmb3JlIGFza2luZyB0aGUgdXNlciBm b3IgY3JlZGVudGlhbHMsIHdlIGNoZWNrIGlmIHRoZSBVUkwgY29udGFpbnMgdGhhdC4KLSAgICAg ICAgaWYgKCF1c2VybmFtZS5pc0VtcHR5KCkgfHwgIXBhc3N3b3JkLmlzRW1wdHkoKSkgewotICAg ICAgICAgICAgLy8gUHJldmVudCB0aGVtIGZyb20gYmVlbiB1c2VkIGFnYWluIGlmIHRoZXkgYXJl IHdyb25nLgotICAgICAgICAgICAgLy8gSWYgdGhleSBhcmUgY29ycmVjdCwgdGhleSB3aWxsIGJl IHB1dCBpbnRvIENyZWRlbnRpYWxTdG9yYWdlLgotICAgICAgICAgICAgaWYgKCFwcm94eUluZm8u YWRkcmVzcy5lbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgcHJveHlJbmZvLnVzZXJuYW1lLmNs ZWFyKCk7Ci0gICAgICAgICAgICAgICAgcHJveHlJbmZvLnBhc3N3b3JkLmNsZWFyKCk7Ci0gICAg ICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5z dG9yZVByb3h5Q3JlZGVudGlhbHMocHJveHlJbmZvKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fdXNlciA9ICIiOwotICAg ICAgICAgICAgICAgIG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3Bhc3MgPSAiIjsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKHVzZXJuYW1lLmlzRW1wdHko KSAmJiBwYXNzd29yZC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGlmIChtX2hhbmRsZS0+Zmly c3RSZXF1ZXN0KCkudGFyZ2V0VHlwZSgpICE9IFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0SXNNYWlu RnJhbWUgJiYgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5pc0No cm9tZVByb2Nlc3MoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTkxMCw2 ICs5MDIsMjUgQEAgdm9pZCBOZXR3b3JrSm9iOjpwdXJnZUNyZWRlbnRpYWxzKCkKICAgICBpZiAo Y2hhbGxlbmdlLmlzTnVsbCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBjb25zdCBTdHJpbmcm IHB1cmdlVXNlcm5hbWUgPSBjaGFsbGVuZ2UucHJvcG9zZWRDcmVkZW50aWFsKCkudXNlcigpOwor ICAgIGNvbnN0IFN0cmluZyYgcHVyZ2VQYXNzd29yZCA9IGNoYWxsZW5nZS5wcm9wb3NlZENyZWRl bnRpYWwoKS5wYXNzd29yZCgpOworCisgICAgLy8gU2luY2UgdGhpcyBjcmVkZW50aWFsIGRpZG4n dCB3b3JrLCByZW1vdmUgaXQgZnJvbSBhbGwgc291cmNlcyB3aGljaCB3b3VsZCByZXR1cm4gaXQK KyAgICAvLyBJTVBPUlRBTlQ6IGV2ZXJ5IHNvdXJjZSB0aGF0IGlzIGNoZWNrZWQgZm9yIGEgcGFz c3dvcmQgaW4gc2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMgc2hvdWxkCisgICAgLy8gYmUgaGFu ZGxlZCBoZXJlIQorCisgICAgaWYgKGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKS5zZXJ2ZXJU eXBlKCkgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQIHx8IGNoYWxsZW5nZS5wcm90ZWN0aW9u U3BhY2UoKS5zZXJ2ZXJUeXBlKCkgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQUykgeworICAg ICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6UHJveHlJbmZvIHByb3h5SW5mbyA9IEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2UoKS0+cHJveHlJbmZvKG1faGFuZGxlLT5m aXJzdFJlcXVlc3QoKS51cmwoKS5zdHJpbmcoKSk7CisgICAgICAgIGlmICghcHJveHlJbmZvLmFk ZHJlc3MuZW1wdHkoKSAmJiBwdXJnZVVzZXJuYW1lID09IHByb3h5SW5mby51c2VybmFtZS5jX3N0 cigpICYmIHB1cmdlUGFzc3dvcmQgPT0gcHJveHlJbmZvLnBhc3N3b3JkLmNfc3RyKCkpIHsKKyAg ICAgICAgICAgIHByb3h5SW5mby51c2VybmFtZS5jbGVhcigpOworICAgICAgICAgICAgcHJveHlJ bmZvLnBhc3N3b3JkLmNsZWFyKCk7CisgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6 U2V0dGluZ3M6Omluc3RhbmNlKCktPnN0b3JlUHJveHlDcmVkZW50aWFscyhwcm94eUluZm8pOwor ICAgICAgICB9CisgICAgfSBlbHNlIGlmIChtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV91c2Vy ID09IHB1cmdlVXNlcm5hbWUgJiYgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fcGFzcyA9PSBw dXJnZVBhc3N3b3JkKSB7CisgICAgICAgIG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3VzZXIg PSAiIjsKKyAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fcGFzcyA9ICIiOworICAg IH0KKwogICAgIENyZWRlbnRpYWxTdG9yYWdlOjpyZW1vdmUoY2hhbGxlbmdlLnByb3RlY3Rpb25T cGFjZSgpKTsKICAgICBjaGFsbGVuZ2Uuc2V0U3RvcmVkKGZhbHNlKTsKICNpZiBFTkFCTEUoQkxB Q0tCRVJSWV9DUkVERU5USUFMX1BFUlNJU1QpCi0tIAoxLjcuNS40Cgo= 183476 2013-01-18 09:07:23 -0800 2013-01-18 09:39:25 -0800 rebased patch 0001-BlackBerry-Only-clear-credentials-when-purgeCredenti.patch text/plain 4996 joenotcharles RnJvbSBiNTA0MTAwNjBkZTAwZTE5OGI0MTcwYTJjZWExZDM3Y2RmMWVlNTA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDE3IEphbiAyMDEzIDEwOjEzOjE0IC0wNTAwClN1YmplY3Q6IFtQQVRDSCAxLzRdIFtCbGFja0Jl cnJ5XSBPbmx5IGNsZWFyIGNyZWRlbnRpYWxzIHdoZW4KIHB1cmdlQ3JlZGVudGlhbHMgaXMgY2Fs bGVkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTI0CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClN0b3AgY2xlYXJpbmcgY3JlZGVudGlhbHMgd2hlbiBz ZW5kaW5nIG91dCBhIHJlcXVlc3QganVzdCBpbiBjYXNlIHRoZXkncmUgd3JvbmcuIFRoYXQncyBz dHVwaWQgYW5kCmhhcyByYWNlIGNvbmRpdGlvbnMuIE9ubHkgY2xlYXIgdGhlbSB3aGVuIHdlIGtu b3cgdGhleSdyZSB3cm9uZy4KCkludGVybmFsIFBSOiAyMzExNTgKSW50ZXJuYWwgUmV2aWV3ZXI6 IEdlb3JnZSBTdGFpa29zCgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9i LmNwcDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToK KFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnB1cmdlQ3JlZGVudGlhbHMpOgotLS0KIFNvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNyArKysrKysrKysK IC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgICAgIHwgICAz NSArKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCsp LCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzcyZWUxNi4uOTU5NjA2MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTE3ICBKb2UgTWFzb24gIDxqbWFzb25Acmlt LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gT25seSBjbGVhciBjcmVkZW50aWFscyB3aGVu IHB1cmdlQ3JlZGVudGlhbHMgaXMgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcxMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTdG9wIGNsZWFyaW5nIGNyZWRlbnRpYWxzIHdoZW4gc2VuZGlu ZyBvdXQgYSByZXF1ZXN0IGp1c3QgaW4gY2FzZSB0aGV5J3JlIHdyb25nLiBUaGF0J3Mgc3R1cGlk IGFuZAorICAgICAgICBoYXMgcmFjZSBjb25kaXRpb25zLiBPbmx5IGNsZWFyIHRoZW0gd2hlbiB3 ZSBrbm93IHRoZXkncmUgd3JvbmcuCisKKyAgICAgICAgSW50ZXJuYWwgUFI6IDIzMTE1OAorICAg ICAgICBJbnRlcm5hbCBSZXZpZXdlcjogR2VvcmdlIFN0YWlrb3MKKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKKyAgICAgICAgKFdlYkNv cmU6Ok5ldHdvcmtKb2I6OnB1cmdlQ3JlZGVudGlhbHMpOgorCiAyMDEzLTAxLTE3ICBMZW8gWWFu ZyAgPGxlb3lhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gVXBkYXRlIEF1dGhl bnRpY2F0aW9uIFR5cGUgYW5kIFNjaGVtZSBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3Bw CmluZGV4IDlmNDZkZTkuLjQzYjA3OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTc3Niw2ICs3 NzYsOSBAQCBib29sIE5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3Rl Y3Rpb25TcGFjZVNlcnZlclR5cGUgdHlwZSwgUHJvdAogICAgIGlmICghbmV3VVJMLmlzVmFsaWQo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gSU1QT1JUQU5UOiBpZiBhIG5ldyBz b3VyY2Ugb2YgY3JlZGVudGlhbHMgaXMgYWRkZWQgdG8gdGhpcyBtZXRob2QsIGJlIHN1cmUgdG8g aGFuZGxlIGl0IGluCisgICAgLy8gcHVyZ2VDcmVkZW50aWFscyBhcyB3ZWxsIQorCiAgICAgU3Ry aW5nIGhvc3Q7CiAgICAgaW50IHBvcnQ7CiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlByb3h5 SW5mbyBwcm94eUluZm87CkBAIC04NDYsMTggKzg0OSw3IEBAIGJvb2wgTmV0d29ya0pvYjo6c2Vu ZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoUHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZSB0eXBlLCBQ cm90CiAgICAgICAgIH0KIAogICAgICAgICAvLyBCZWZvcmUgYXNraW5nIHRoZSB1c2VyIGZvciBj cmVkZW50aWFscywgd2UgY2hlY2sgaWYgdGhlIFVSTCBjb250YWlucyB0aGF0LgotICAgICAgICBp ZiAoIXVzZXJuYW1lLmlzRW1wdHkoKSB8fCAhcGFzc3dvcmQuaXNFbXB0eSgpKSB7Ci0gICAgICAg ICAgICAvLyBQcmV2ZW50IHRoZW0gZnJvbSBiZWVuIHVzZWQgYWdhaW4gaWYgdGhleSBhcmUgd3Jv bmcuCi0gICAgICAgICAgICAvLyBJZiB0aGV5IGFyZSBjb3JyZWN0LCB0aGV5IHdpbGwgYmUgcHV0 IGludG8gQ3JlZGVudGlhbFN0b3JhZ2UuCi0gICAgICAgICAgICBpZiAoIXByb3h5SW5mby5hZGRy ZXNzLmVtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICBwcm94eUluZm8udXNlcm5hbWUuY2xlYXIo KTsKLSAgICAgICAgICAgICAgICBwcm94eUluZm8ucGFzc3dvcmQuY2xlYXIoKTsKLSAgICAgICAg ICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPnN0b3Jl UHJveHlDcmVkZW50aWFscyhwcm94eUluZm8pOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgICAgICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV91c2VyID0gIiI7Ci0gICAgICAg ICAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fcGFzcyA9ICIiOwotICAgICAgICAg ICAgfQotICAgICAgICB9IGVsc2UgeworICAgICAgICBpZiAodXNlcm5hbWUuaXNFbXB0eSgpICYm IHBhc3N3b3JkLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgaWYgKG1faGFuZGxlLT5maXJzdFJl cXVlc3QoKS50YXJnZXRUeXBlKCkgIT0gUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc01haW5GcmFt ZSAmJiBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPmlzQ2hyb21l UHJvY2VzcygpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtOTI0LDYgKzkx NiwyNSBAQCB2b2lkIE5ldHdvcmtKb2I6OnB1cmdlQ3JlZGVudGlhbHMoKQogICAgIGlmIChjaGFs bGVuZ2UuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGNvbnN0IFN0cmluZyYgcHVy Z2VVc2VybmFtZSA9IGNoYWxsZW5nZS5wcm9wb3NlZENyZWRlbnRpYWwoKS51c2VyKCk7CisgICAg Y29uc3QgU3RyaW5nJiBwdXJnZVBhc3N3b3JkID0gY2hhbGxlbmdlLnByb3Bvc2VkQ3JlZGVudGlh bCgpLnBhc3N3b3JkKCk7CisKKyAgICAvLyBTaW5jZSB0aGlzIGNyZWRlbnRpYWwgZGlkbid0IHdv cmssIHJlbW92ZSBpdCBmcm9tIGFsbCBzb3VyY2VzIHdoaWNoIHdvdWxkIHJldHVybiBpdAorICAg IC8vIElNUE9SVEFOVDogZXZlcnkgc291cmNlIHRoYXQgaXMgY2hlY2tlZCBmb3IgYSBwYXNzd29y ZCBpbiBzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyBzaG91bGQKKyAgICAvLyBiZSBoYW5kbGVk IGhlcmUhCisKKyAgICBpZiAoY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZSgpLnNlcnZlclR5cGUo KSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFAgfHwgY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFj ZSgpLnNlcnZlclR5cGUoKSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFBTKSB7CisgICAgICAg IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpQcm94eUluZm8gcHJveHlJbmZvID0gQmxhY2tCZXJyeTo6 UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5wcm94eUluZm8obV9oYW5kbGUtPmZpcnN0 UmVxdWVzdCgpLnVybCgpLnN0cmluZygpKTsKKyAgICAgICAgaWYgKCFwcm94eUluZm8uYWRkcmVz cy5lbXB0eSgpICYmIHB1cmdlVXNlcm5hbWUgPT0gcHJveHlJbmZvLnVzZXJuYW1lLmNfc3RyKCkg JiYgcHVyZ2VQYXNzd29yZCA9PSBwcm94eUluZm8ucGFzc3dvcmQuY19zdHIoKSkgeworICAgICAg ICAgICAgcHJveHlJbmZvLnVzZXJuYW1lLmNsZWFyKCk7CisgICAgICAgICAgICBwcm94eUluZm8u cGFzc3dvcmQuY2xlYXIoKTsKKyAgICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0 aW5nczo6aW5zdGFuY2UoKS0+c3RvcmVQcm94eUNyZWRlbnRpYWxzKHByb3h5SW5mbyk7CisgICAg ICAgIH0KKyAgICB9IGVsc2UgaWYgKG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3VzZXIgPT0g cHVyZ2VVc2VybmFtZSAmJiBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9wYXNzID09IHB1cmdl UGFzc3dvcmQpIHsKKyAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fdXNlciA9ICIi OworICAgICAgICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9wYXNzID0gIiI7CisgICAgfQor CiAgICAgQ3JlZGVudGlhbFN0b3JhZ2U6OnJlbW92ZShjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNl KCkpOwogICAgIGNoYWxsZW5nZS5zZXRTdG9yZWQoZmFsc2UpOwogI2lmIEVOQUJMRShCTEFDS0JF UlJZX0NSRURFTlRJQUxfUEVSU0lTVCkKLS0gCjEuNy41LjQKCg==