137300 2014-10-01 06:24:24 -0700 [SOUP] TLS errors should take precedence over HTTP authentication 2015-03-12 13:09:19 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned clopez danw gustavo mcatanzaro nicolas svillar oldest_to_newest 1038527 0 cgarcia 2014-10-01 06:24:24 -0700 When not ignoring TLS errors we should fail before showing the HTTP auth dialog in case of invalid certificate. See also https://bugzilla.gnome.org/show_bug.cgi?id=633366 1038528 1 239022 cgarcia 2014-10-01 06:29:12 -0700 Created attachment 239022 Patch 1038546 2 mcatanzaro 2014-10-01 07:51:02 -0700 I'm not sure if your test works. The server isn't set up to use HTTP authentication; I think you need to add a SoupAuthDomain for "/auth" using soup_server_add_auth_domain(). 1038552 3 cgarcia 2014-10-01 08:20:43 -0700 (In reply to comment #2) > I'm not sure if your test works. The server isn't set up to use HTTP authentication; I think you need to add a SoupAuthDomain for "/auth" using soup_server_add_auth_domain(). I wrote the test before the patch, the test does the same than the auth tests 1038554 4 mcatanzaro 2014-10-01 08:38:14 -0700 OK, I guess the WWW-Authenticate header is sufficient. 1039671 5 239022 svillar 2014-10-06 01:05:01 -0700 Comment on attachment 239022 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239022&action=review The change looks conceptually good to me. I was wondering if it wouldn't be better to listen to tls-errors notifications from the SoupMessage instead of having to handle these things in different parts of our code... > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:-577 > - if (!response.soupMessageTLSErrors() || gIgnoreSSLErrors) I guess this deserves a comment explaining that in the case of authentication challenge, the response has not been updated with the SoupMessage contents yet. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:593 > + handle->client()->didFail(handle, ResourceError::tlsError(d->m_soupRequest.get(), tlsErrors, certificate)); So I guess both soupMessageCertificate() and soupMessageTLSErrors() became unused methods with these changes. Time to remove them? 1039687 6 cgarcia 2014-10-06 02:18:41 -0700 (In reply to comment #5) > (From update of attachment 239022 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239022&action=review > > The change looks conceptually good to me. I was wondering if it wouldn't be better to listen to tls-errors notifications from the SoupMessage instead of having to handle these things in different parts of our code... Yes, but unfortunately libsoup doesn't emit notify for tls-errors nor flags properties. > > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:-577 > > - if (!response.soupMessageTLSErrors() || gIgnoreSSLErrors) > > I guess this deserves a comment explaining that in the case of authentication challenge, the response has not been updated with the SoupMessage contents yet. Ok. > > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:593 > > + handle->client()->didFail(handle, ResourceError::tlsError(d->m_soupRequest.get(), tlsErrors, certificate)); > > So I guess both soupMessageCertificate() and soupMessageTLSErrors() became unused methods with these changes. Time to remove them? No, those are used by CertificateInfo when created for a ResourceResponse 1039694 7 239022 svillar 2014-10-06 03:15:20 -0700 Comment on attachment 239022 Patch I'll r+ it now but I'd like to hear Dan's opinion on the matter before landing. 1039717 8 danw 2014-10-06 06:11:28 -0700 (In reply to comment #6) > (In reply to comment #5) > > The change looks conceptually good to me. I was wondering if it wouldn't be better to listen to tls-errors notifications from the SoupMessage instead of having to handle these things in different parts of our code... > > Yes, but unfortunately libsoup doesn't emit notify for tls-errors nor flags properties. Hm... it's a bug that :flags doesn't get notified when CERTIFICATE_TRUSTED changes. But :tls-errors definitely should be getting notified (and the flags will have already changed at the point when :tls-errors is notified). 1039734 9 cgarcia 2014-10-06 08:59:44 -0700 So, Dan confirmed I was wrong, I was not getting the tls-errors notify signal because I was connecting in request-started and it's too late. But I realized we are connecting to got-headers, that is also emitted before authenticate and tls errors are already set at that point so it looks like a good place to handle TLS errors. 1039737 10 239338 cgarcia 2014-10-06 09:09:54 -0700 Created attachment 239338 Patch Updated patch, now TLS errors are handled in a single place. 1039984 11 239338 svillar 2014-10-07 00:29:51 -0700 Comment on attachment 239338 Patch Much better now. 1040027 12 cgarcia 2014-10-07 08:49:19 -0700 Committed r174394: <http://trac.webkit.org/changeset/174394> 239022 2014-10-01 06:29:12 -0700 2014-10-06 09:09:54 -0700 Patch wkcore-soup-https-auth.diff text/plain 7374 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5Y2Y4ZDg5Li4xNDZlMzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTQtMTAtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtTT1VQXSBUTFMgZXJyb3JzIHNob3VsZCB0YWtlIHByZWNlZGVuY2Ugb3Zl ciBIVFRQIGF1dGhlbnRpY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzczMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDaGVjayBUTFMgZXJyb3JzIGJlZm9yZSBzdGFydGluZyB0aGUgYXV0aGVu dGljYXRpb24gcHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFuZGxlVW5pZ25vcmVkVExT RXJyb3JzKTogUmVmYWN0b3JlZCB0byByZWNlaXZlIHRoZQorICAgICAgICBzb3VwIG1lc3NhZ2Uu CisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVzdENhbGxiYWNrKTogUGFzcyB0aGUgY3VycmVu dCBzb3VwIG1lc3NhZ2UgdG8gaGFuZGxlVW5pZ25vcmVkVExTRXJyb3JzKCkuCisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KTogUmV0dXJuIGVhcmx5IGFuZCBjYW5jZWwgdGhlIHJlcXVlc3QKKyAgICAgICAgaW4gY2FzZSBv ZiBUTFMgZXJyb3JzLgorCisyMDE0LTEwLTAxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBMYXllcmluZyB2aW9sYXRpb246IE1lZGlhUGxheWVy IHNob3VsZCBub3QgcmVmZXJlbmNlL3VzZSBGcmFtZVZpZXcKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTYyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAK aW5kZXggZDEwODUwZC4uMzU1ZjUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTU2OSwx MiArNTY5LDE1IEBAIHN0YXRpYyB2b2lkIGNsZWFudXBTb3VwUmVxdWVzdE9wZXJhdGlvbihSZXNv dXJjZUhhbmRsZSogaGFuZGxlLCBib29sIGlzRGVzdHJveWluCiAgICAgICAgIGhhbmRsZS0+ZGVy ZWYoKTsKIH0KIAotc3RhdGljIGJvb2wgaGFuZGxlVW5pZ25vcmVkVExTRXJyb3JzKFJlc291cmNl SGFuZGxlKiBoYW5kbGUpCitzdGF0aWMgYm9vbCBoYW5kbGVVbmlnbm9yZWRUTFNFcnJvcnMoUmVz b3VyY2VIYW5kbGUqIGhhbmRsZSwgU291cE1lc3NhZ2UqIG1lc3NhZ2UpCiB7Ci0gICAgUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsKLSAgICBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSA9IGQtPm1fcmVzcG9uc2U7CisgICAgaWYgKGdJZ25v cmVTU0xFcnJvcnMpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghcmVzcG9uc2Uu c291cE1lc3NhZ2VUTFNFcnJvcnMoKSB8fCBnSWdub3JlU1NMRXJyb3JzKQorICAgIEdUbHNDZXJ0 aWZpY2F0ZSogY2VydGlmaWNhdGUgPSBudWxscHRyOworICAgIEdUbHNDZXJ0aWZpY2F0ZUZsYWdz IHRsc0Vycm9ycyA9IHN0YXRpY19jYXN0PEdUbHNDZXJ0aWZpY2F0ZUZsYWdzPigwKTsKKyAgICBz b3VwX21lc3NhZ2VfZ2V0X2h0dHBzX3N0YXR1cyhtZXNzYWdlLCAmY2VydGlmaWNhdGUsICZ0bHNF cnJvcnMpOworICAgIGlmICghdGxzRXJyb3JzKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBTdHJpbmcgbG93ZXJjYXNlSG9zdFVSTCA9IGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkudXJsKCku aG9zdCgpLmxvd2VyKCk7CkBAIC01ODIsMTEgKzU4NSwxMiBAQCBzdGF0aWMgYm9vbCBoYW5kbGVV bmlnbm9yZWRUTFNFcnJvcnMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgLy8gV2UgYXJlbid0IGlnbm9yaW5nIGVycm9ycyBnbG9iYWxseSwgYnV0 IHRoZSB1c2VyIG1heSBoYXZlIGFscmVhZHkgZGVjaWRlZCB0byBhY2NlcHQgdGhpcyBjZXJ0aWZp Y2F0ZS4KLSAgICBDZXJ0aWZpY2F0ZXNNYXA6Oml0ZXJhdG9yIGkgPSBjbGllbnRDZXJ0aWZpY2F0 ZXMoKS5maW5kKGxvd2VyY2FzZUhvc3RVUkwpOwotICAgIGlmIChpICE9IGNsaWVudENlcnRpZmlj YXRlcygpLmVuZCgpICYmIGktPnZhbHVlLmNvbnRhaW5zKHJlc3BvbnNlLnNvdXBNZXNzYWdlQ2Vy dGlmaWNhdGUoKSkpCisgICAgYXV0byBpdCA9IGNsaWVudENlcnRpZmljYXRlcygpLmZpbmQobG93 ZXJjYXNlSG9zdFVSTCk7CisgICAgaWYgKGl0ICE9IGNsaWVudENlcnRpZmljYXRlcygpLmVuZCgp ICYmIGl0LT52YWx1ZS5jb250YWlucyhjZXJ0aWZpY2F0ZSkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIGhhbmRsZS0+Y2xpZW50KCktPmRpZEZhaWwoaGFuZGxlLCBSZXNvdXJjZUVycm9y Ojp0bHNFcnJvcihkLT5tX3NvdXBSZXF1ZXN0LmdldCgpLCByZXNwb25zZS5zb3VwTWVzc2FnZVRM U0Vycm9ycygpLCByZXNwb25zZS5zb3VwTWVzc2FnZUNlcnRpZmljYXRlKCkpKTsKKyAgICBSZXNv dXJjZUhhbmRsZUludGVybmFsKiBkID0gaGFuZGxlLT5nZXRJbnRlcm5hbCgpOworICAgIGhhbmRs ZS0+Y2xpZW50KCktPmRpZEZhaWwoaGFuZGxlLCBSZXNvdXJjZUVycm9yOjp0bHNFcnJvcihkLT5t X3NvdXBSZXF1ZXN0LmdldCgpLCB0bHNFcnJvcnMsIGNlcnRpZmljYXRlKSk7CiAgICAgcmV0dXJu IHRydWU7CiB9CiAKQEAgLTY3Niw3ICs2ODAsNyBAQCBzdGF0aWMgdm9pZCBzZW5kUmVxdWVzdENh bGxiYWNrKEdPYmplY3QqLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKICAg ICAgICAgfQogICAgICAgICBkLT5tX3Jlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShzb3Vw TWVzc2FnZSk7CiAKLSAgICAgICAgaWYgKGhhbmRsZVVuaWdub3JlZFRMU0Vycm9ycyhoYW5kbGUu Z2V0KCkpKSB7CisgICAgICAgIGlmIChoYW5kbGVVbmlnbm9yZWRUTFNFcnJvcnMoaGFuZGxlLmdl dCgpLCBzb3VwTWVzc2FnZSkpIHsKICAgICAgICAgICAgIGNsZWFudXBTb3VwUmVxdWVzdE9wZXJh dGlvbihoYW5kbGUuZ2V0KCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0x MDg1LDYgKzEwODksMTQgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZTo6ZGlkUmVjZWl2ZUF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGwKIHsKICAgICBBU1NFUlQo ZC0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlLmlzTnVsbCgpKTsKIAorICAgIC8vIEF1dGhlbnRpY2F0 aW9uIGNoYWxsZW5nZSBpcyByZWNlaXZlZCBiZWZvcmUgdGhlIHJlc3BvbnNlLCBidXQgVExTIGVy cm9ycyBzaG91bGQgdGFrZSBwcmVjZWRlbmNlLgorICAgIC8vIENoZWNrIHRoYXQgdGhlcmUgYXJl bid0IFRMUyBlcnJvcnMgYmVmb3JlIGNvbnRpbnVpbmcgd2l0aCB0aGUgYXV0aGVudGljYXRpb24u CisgICAgaWYgKGhhbmRsZVVuaWdub3JlZFRMU0Vycm9ycyh0aGlzLCBjaGFsbGVuZ2Uuc291cE1l c3NhZ2UoKSkpIHsKKyAgICAgICAgY2xlYXJBdXRoZW50aWNhdGlvbigpOworICAgICAgICBjYW5j ZWwoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIC8vIEZJWE1FOiBQZXIgdGhlIHNw ZWNpZmljYXRpb24sIHRoZSB1c2VyIHNob3VsZG4ndCBiZSBhc2tlZCBmb3IgY3JlZGVudGlhbHMg aWYgdGhlcmUgd2VyZSBpbmNvcnJlY3Qgb25lcyBwcm92aWRlZCBleHBsaWNpdGx5LgogICAgIGJv b2wgdXNlQ3JlZGVudGlhbFN0b3JhZ2UgPSBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSgpOwog ICAgIGlmICh1c2VDcmVkZW50aWFsU3RvcmFnZSkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGM4NTk0NDkuLjI4MjRjMTkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxNC0xMC0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgW1NPVVBdIFRMUyBlcnJvcnMgc2hvdWxkIHRha2UgcHJlY2VkZW5jZSBvdmVyIEhU VFAgYXV0aGVudGljYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNzMwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBhIHRlc3QgY2FzZSB0byBjaGVjayB0aGF0IGF1dGhlbnRpY2F0ZSBzaWdu YWwgaXMgbm90IGVtaXR0ZWQKKyAgICAgICAgaW4gY2FzZSBvZiBUTFMgZXJyb3JzLCBhbmQgdGhl IGxvYWQgZmFpbHMgaW5zdGVhZC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0U1NMLmNwcDoKKyAgICAgICAgKHdlYlZpZXdBdXRoZW50aWNhdGlvbkNhbGxi YWNrKToKKyAgICAgICAgKHRlc3RUTFNFcnJvcnNIVFRQQXV0aCk6CisgICAgICAgIChodHRwc1Nl cnZlckNhbGxiYWNrKToKKyAgICAgICAgKGJlZm9yZUFsbCk6CisKIDIwMTQtMDktMzAgIEV2YSBC YWxhenNmYWx2aSAgPGV2YWIudS1zemVnZWRAcGFydG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAg ICBSZW1vdmUgdGhpcmRwYXJ0eS91bml0dGVzdDIgZnJvbSB3ZWJraXRweQpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RTU0wuY3BwIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RTU0wuY3BwCmluZGV4IGIyYWQ1NDMu LjM1NzJjNGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0 ay9UZXN0U1NMLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv VGVzdFNTTC5jcHAKQEAgLTE0NCw2ICsxNDQsMjQgQEAgc3RhdGljIHZvaWQgdGVzdFRMU0Vycm9y c1JlZGlyZWN0KFNTTFRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnQoIXRl c3QtPm1fbG9hZEV2ZW50cy5jb250YWlucyhMb2FkVHJhY2tpbmdUZXN0OjpMb2FkQ29tbWl0dGVk KSk7CiB9CiAKK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3QXV0aGVudGljYXRpb25DYWxsYmFjayhX ZWJLaXRXZWJWaWV3KiwgV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0KiByZXF1ZXN0KQorewor ICAgIGdfYXNzZXJ0X25vdF9yZWFjaGVkKCk7CisgICAgcmV0dXJuIFRSVUU7Cit9CisKKworc3Rh dGljIHZvaWQgdGVzdFRMU0Vycm9yc0hUVFBBdXRoKFNTTFRlc3QqIHRlc3QsIGdjb25zdHBvaW50 ZXIpCit7CisgICAgd2Via2l0X3dlYl9jb250ZXh0X3NldF90bHNfZXJyb3JzX3BvbGljeSh3ZWJr aXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQodGVzdC0+bV93ZWJWaWV3KSwgV0VCS0lUX1RMU19FUlJP UlNfUE9MSUNZX0ZBSUwpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QodGVzdC0+bV93ZWJWaWV3LCAi YXV0aGVudGljYXRlIiwgR19DQUxMQkFDSyh3ZWJWaWV3QXV0aGVudGljYXRpb25DYWxsYmFjayks IE5VTEwpOworICAgIHRlc3QtPmxvYWRVUkkoa0h0dHBzU2VydmVyLT5nZXRVUklGb3JQYXRoKCIv YXV0aCIpLmRhdGEoKSk7CisgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAg Z19hc3NlcnQodGVzdC0+bV9sb2FkRmFpbGVkKTsKKyAgICBnX2Fzc2VydCh0ZXN0LT5tX2xvYWRF dmVudHMuY29udGFpbnMoTG9hZFRyYWNraW5nVGVzdDo6UHJvdmlzaW9uYWxMb2FkRmFpbGVkKSk7 CisgICAgZ19hc3NlcnQoIXRlc3QtPm1fbG9hZEV2ZW50cy5jb250YWlucyhMb2FkVHJhY2tpbmdU ZXN0OjpMb2FkQ29tbWl0dGVkKSk7Cit9CisKIGNsYXNzIFRMU0Vycm9yc1Rlc3Q6IHB1YmxpYyBT U0xUZXN0IHsKIHB1YmxpYzoKICAgICBNQUtFX0dMSUJfVEVTVF9GSVhUVVJFKFRMU0Vycm9yc1Rl c3QpOwpAQCAtMjM0LDYgKzI1Miw5IEBAIHN0YXRpYyB2b2lkIGh0dHBzU2VydmVyQ2FsbGJhY2so U291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QKICAgICB9IGVs c2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvcmVkaXJlY3QiKSkgewogICAgICAgICBzb3VwX21l c3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19NT1ZFRF9QRVJNQU5FTlRMWSk7 CiAgICAgICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9o ZWFkZXJzLCAiTG9jYXRpb24iLCBrSHR0cFNlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3Rlc3QtaW1h Z2UiKS5kYXRhKCkpOworICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9hdXRoIikp IHsKKyAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNf VU5BVVRIT1JJWkVEKTsKKyAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfYXBwZW5kKG1lc3Nh Z2UtPnJlc3BvbnNlX2hlYWRlcnMsICJXV1ctQXV0aGVudGljYXRlIiwgIkJhc2ljIHJlYWxtPVwi SFRUUFMgYXV0aFwiIik7CiAgICAgfSBlbHNlCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3Rh dHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX05PVF9GT1VORCk7CiB9CkBAIC0yODIsNiArMzAzLDcg QEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIC8vIGRvbmUgaW4gdGhlIHRscy1wZXJtaXNzaW9uLXJl cXVlc3QgdGVzdC4KICAgICBTU0xUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAidGxzLWVycm9y cy1wb2xpY3kiLCB0ZXN0VExTRXJyb3JzUG9saWN5KTsKICAgICBTU0xUZXN0OjphZGQoIldlYktp dFdlYlZpZXciLCAidGxzLWVycm9ycy1yZWRpcmVjdC10by1odHRwIiwgdGVzdFRMU0Vycm9yc1Jl ZGlyZWN0KTsKKyAgICBTU0xUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAidGxzLWh0dHAtYXV0 aCIsIHRlc3RUTFNFcnJvcnNIVFRQQXV0aCk7CiAgICAgVExTRXJyb3JzVGVzdDo6YWRkKCJXZWJL aXRXZWJWaWV3IiwgImxvYWQtZmFpbGVkLXdpdGgtdGxzLWVycm9ycyIsIHRlc3RMb2FkRmFpbGVk V2l0aFRMU0Vycm9ycyk7CiB9CiAK 239338 2014-10-06 09:09:54 -0700 2014-10-07 00:29:50 -0700 Patch wcore-tls-error-before-auth.diff text/plain 7922 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiODJiYzhhLi5kN2U1NDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMTAtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBUTFMgZXJyb3JzIHNob3VsZCB0YWtlIHByZWNlZGVuY2Ugb3Zl ciBIVFRQIGF1dGhlbnRpY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzczMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBIYW5kbGUgVExTIGVycm9ycyBpbiBnb3QtaGVhZGVycyBjYWxsYmFjayB0 byBtYWtlIHN1cmUgaXQgaGFwcGVucworICAgICAgICBiZWZvcmUgc3RhcnRpbmcgdGhlIGF1dGhl bnRpY2F0aW9uIHByb2Nlc3MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmhhbmRsZVVuaWdub3JlZFRM U0Vycm9ycyk6IFJlZmFjdG9yZWQgdG8gcmVjZWl2ZSB0aGUKKyAgICAgICAgc291cCBtZXNzYWdl LgorICAgICAgICAoV2ViQ29yZTo6Z290SGVhZGVyc0NhbGxiYWNrKTogUmV0dXJuIGVhcmx5IGFu ZCBjYW5jZWwgdGhlIHJlcXVlc3QgaW4gY2FzZSBvZiBUTFMgZXJyb3JzLgorICAgICAgICAoV2Vi Q29yZTo6c2VuZFJlcXVlc3RDYWxsYmFjayk6IERvIG5vdCBoYW5kbGUgVExTIGVycm9ycyBoZXJl LCB0aGUgcmVxdWVzdCBzaG91bGQgaGF2ZSBhbHJlYWR5IGJlZW4KKyAgICAgICAgY2FuY2VsbGVk IGF0IHRoaXMgcG9pbnQgaW4gY2FzZSBvZiBUTFMgZXJyb3JzLgorCiAyMDE0LTEwLTA1ICBDaHJp c3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaXM8PigpIC8g ZG93bmNhc3Q8PigpIGZvciBTY3JvbGxpbmdDb29yZGluYXRvciAvIFNjcm9sbGluZ1N0YXRlTm9k ZSBzdWJjbGFzc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGQxMDg1MGQuLjkwNjM0ZTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291 cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC0zMDYsMTIgKzMwNiw0MiBAQCBzdGF0aWMgYm9v bCBpc0F1dGhlbnRpY2F0aW9uRmFpbHVyZVN0YXR1c0NvZGUoaW50IGh0dHBTdGF0dXNDb2RlKQog ICAgIHJldHVybiBodHRwU3RhdHVzQ29kZSA9PSBTT1VQX1NUQVRVU19QUk9YWV9BVVRIRU5USUNB VElPTl9SRVFVSVJFRCB8fCBodHRwU3RhdHVzQ29kZSA9PSBTT1VQX1NUQVRVU19VTkFVVEhPUkla RUQ7CiB9CiAKK3N0YXRpYyBib29sIGhhbmRsZVVuaWdub3JlZFRMU0Vycm9ycyhSZXNvdXJjZUhh bmRsZSogaGFuZGxlLCBTb3VwTWVzc2FnZSogbWVzc2FnZSkKK3sKKyAgICBpZiAoZ0lnbm9yZVNT TEVycm9ycykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgR1Rsc0NlcnRpZmljYXRlKiBj ZXJ0aWZpY2F0ZSA9IG51bGxwdHI7CisgICAgR1Rsc0NlcnRpZmljYXRlRmxhZ3MgdGxzRXJyb3Jz ID0gc3RhdGljX2Nhc3Q8R1Rsc0NlcnRpZmljYXRlRmxhZ3M+KDApOworICAgIHNvdXBfbWVzc2Fn ZV9nZXRfaHR0cHNfc3RhdHVzKG1lc3NhZ2UsICZjZXJ0aWZpY2F0ZSwgJnRsc0Vycm9ycyk7Cisg ICAgaWYgKCF0bHNFcnJvcnMpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFN0cmluZyBs b3dlcmNhc2VIb3N0VVJMID0gaGFuZGxlLT5maXJzdFJlcXVlc3QoKS51cmwoKS5ob3N0KCkubG93 ZXIoKTsKKyAgICBpZiAoYWxsb3dzQW55SFRUUFNDZXJ0aWZpY2F0ZUhvc3RzKCkuY29udGFpbnMo bG93ZXJjYXNlSG9zdFVSTCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIFdlIGFy ZW4ndCBpZ25vcmluZyBlcnJvcnMgZ2xvYmFsbHksIGJ1dCB0aGUgdXNlciBtYXkgaGF2ZSBhbHJl YWR5IGRlY2lkZWQgdG8gYWNjZXB0IHRoaXMgY2VydGlmaWNhdGUuCisgICAgYXV0byBpdCA9IGNs aWVudENlcnRpZmljYXRlcygpLmZpbmQobG93ZXJjYXNlSG9zdFVSTCk7CisgICAgaWYgKGl0ICE9 IGNsaWVudENlcnRpZmljYXRlcygpLmVuZCgpICYmIGl0LT52YWx1ZS5jb250YWlucyhjZXJ0aWZp Y2F0ZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFJlc291cmNlSGFuZGxlSW50ZXJu YWwqIGQgPSBoYW5kbGUtPmdldEludGVybmFsKCk7CisgICAgaGFuZGxlLT5jbGllbnQoKS0+ZGlk RmFpbChoYW5kbGUsIFJlc291cmNlRXJyb3I6OnRsc0Vycm9yKGQtPm1fc291cFJlcXVlc3QuZ2V0 KCksIHRsc0Vycm9ycywgY2VydGlmaWNhdGUpKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogc3Rh dGljIHZvaWQgZ290SGVhZGVyc0NhbGxiYWNrKFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBncG9pbnRl ciBkYXRhKQogewogICAgIFJlc291cmNlSGFuZGxlKiBoYW5kbGUgPSBzdGF0aWNfY2FzdDxSZXNv dXJjZUhhbmRsZSo+KGRhdGEpOwogICAgIGlmICghaGFuZGxlIHx8IGhhbmRsZS0+Y2FuY2VsbGVk T3JDbGllbnRsZXNzKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChoYW5kbGVVbmlnbm9y ZWRUTFNFcnJvcnMoaGFuZGxlLCBtZXNzYWdlKSkgeworICAgICAgICBoYW5kbGUtPmNhbmNlbCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCog ZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsKIAogI2lmIFBMQVRGT1JNKEdUSykKQEAgLTU2OSwy NyArNTk5LDYgQEAgc3RhdGljIHZvaWQgY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKFJlc291 cmNlSGFuZGxlKiBoYW5kbGUsIGJvb2wgaXNEZXN0cm95aW4KICAgICAgICAgaGFuZGxlLT5kZXJl ZigpOwogfQogCi1zdGF0aWMgYm9vbCBoYW5kbGVVbmlnbm9yZWRUTFNFcnJvcnMoUmVzb3VyY2VI YW5kbGUqIGhhbmRsZSkKLXsKLSAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gaGFuZGxl LT5nZXRJbnRlcm5hbCgpOwotICAgIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlID0g ZC0+bV9yZXNwb25zZTsKLQotICAgIGlmICghcmVzcG9uc2Uuc291cE1lc3NhZ2VUTFNFcnJvcnMo KSB8fCBnSWdub3JlU1NMRXJyb3JzKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBTdHJp bmcgbG93ZXJjYXNlSG9zdFVSTCA9IGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkudXJsKCkuaG9zdCgp Lmxvd2VyKCk7Ci0gICAgaWYgKGFsbG93c0FueUhUVFBTQ2VydGlmaWNhdGVIb3N0cygpLmNvbnRh aW5zKGxvd2VyY2FzZUhvc3RVUkwpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyBX ZSBhcmVuJ3QgaWdub3JpbmcgZXJyb3JzIGdsb2JhbGx5LCBidXQgdGhlIHVzZXIgbWF5IGhhdmUg YWxyZWFkeSBkZWNpZGVkIHRvIGFjY2VwdCB0aGlzIGNlcnRpZmljYXRlLgotICAgIENlcnRpZmlj YXRlc01hcDo6aXRlcmF0b3IgaSA9IGNsaWVudENlcnRpZmljYXRlcygpLmZpbmQobG93ZXJjYXNl SG9zdFVSTCk7Ci0gICAgaWYgKGkgIT0gY2xpZW50Q2VydGlmaWNhdGVzKCkuZW5kKCkgJiYgaS0+ dmFsdWUuY29udGFpbnMocmVzcG9uc2Uuc291cE1lc3NhZ2VDZXJ0aWZpY2F0ZSgpKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaGFuZGxlLT5jbGllbnQoKS0+ZGlkRmFpbChoYW5kbGUs IFJlc291cmNlRXJyb3I6OnRsc0Vycm9yKGQtPm1fc291cFJlcXVlc3QuZ2V0KCksIHJlc3BvbnNl LnNvdXBNZXNzYWdlVExTRXJyb3JzKCksIHJlc3BvbnNlLnNvdXBNZXNzYWdlQ2VydGlmaWNhdGUo KSkpOwotICAgIHJldHVybiB0cnVlOwotfQotCiBzaXplX3QgUmVzb3VyY2VIYW5kbGU6OmN1cnJl bnRTdHJlYW1Qb3NpdGlvbigpIGNvbnN0CiB7CiAgICAgR0lucHV0U3RyZWFtKiBiYXNlU3RyZWFt ID0gZC0+bV9pbnB1dFN0cmVhbS5nZXQoKTsKQEAgLTY3NiwxMSArNjg1LDYgQEAgc3RhdGljIHZv aWQgc2VuZFJlcXVlc3RDYWxsYmFjayhHT2JqZWN0KiwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdw b2ludGVyIGRhdGEpCiAgICAgICAgIH0KICAgICAgICAgZC0+bV9yZXNwb25zZS51cGRhdGVGcm9t U291cE1lc3NhZ2Uoc291cE1lc3NhZ2UpOwogCi0gICAgICAgIGlmIChoYW5kbGVVbmlnbm9yZWRU TFNFcnJvcnMoaGFuZGxlLmdldCgpKSkgewotICAgICAgICAgICAgY2xlYW51cFNvdXBSZXF1ZXN0 T3BlcmF0aW9uKGhhbmRsZS5nZXQoKSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K LQogICAgICAgICBpZiAoU09VUF9TVEFUVVNfSVNfUkVESVJFQ1RJT04oc291cE1lc3NhZ2UtPnN0 YXR1c19jb2RlKSAmJiBzaG91bGRSZWRpcmVjdChoYW5kbGUuZ2V0KCkpKSB7CiAgICAgICAgICAg ICBkLT5tX2lucHV0U3RyZWFtID0gaW5wdXRTdHJlYW07CiAgICAgICAgICAgICBnX2lucHV0X3N0 cmVhbV9za2lwX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGdEZWZhdWx0UmVhZEJ1ZmZl clNpemUsIEdfUFJJT1JJVFlfREVGQVVMVCwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MjQ5MWMxLi5jMTllYTRjIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQt MTAtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtTT1VQXSBUTFMgZXJyb3JzIHNob3VsZCB0YWtlIHByZWNlZGVuY2Ugb3ZlciBIVFRQIGF1 dGhlbnRpY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzczMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgYSB0ZXN0IGNhc2UgdG8gY2hlY2sgdGhhdCBhdXRoZW50aWNhdGUgc2lnbmFsIGlz IG5vdCBlbWl0dGVkCisgICAgICAgIGluIGNhc2Ugb2YgVExTIGVycm9ycywgYW5kIHRoZSBsb2Fk IGZhaWxzIGluc3RlYWQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJH dGsvVGVzdFNTTC5jcHA6CisgICAgICAgICh3ZWJWaWV3QXV0aGVudGljYXRpb25DYWxsYmFjayk6 CisgICAgICAgICh0ZXN0VExTRXJyb3JzSFRUUEF1dGgpOgorICAgICAgICAoaHR0cHNTZXJ2ZXJD YWxsYmFjayk6CisgICAgICAgIChiZWZvcmVBbGwpOgorCiAyMDE0LTEwLTA2ICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRVdTIGJ1YmJsZSBob3ZlciBz aG93cyB3cm9uZyB0aW1lc3RhbXBzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDJHdGsvVGVzdFNTTC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdDJHdGsvVGVzdFNTTC5jcHAKaW5kZXggYjJhZDU0My4uMzU3MmM0ZiAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RTU0wuY3BwCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0U1NMLmNwcApAQCAtMTQ0LDYg KzE0NCwyNCBAQCBzdGF0aWMgdm9pZCB0ZXN0VExTRXJyb3JzUmVkaXJlY3QoU1NMVGVzdCogdGVz dCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2VydCghdGVzdC0+bV9sb2FkRXZlbnRzLmNvbnRh aW5zKExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRDb21taXR0ZWQpKTsKIH0KIAorc3RhdGljIGdib29s ZWFuIHdlYlZpZXdBdXRoZW50aWNhdGlvbkNhbGxiYWNrKFdlYktpdFdlYlZpZXcqLCBXZWJLaXRB dXRoZW50aWNhdGlvblJlcXVlc3QqIHJlcXVlc3QpCit7CisgICAgZ19hc3NlcnRfbm90X3JlYWNo ZWQoKTsKKyAgICByZXR1cm4gVFJVRTsKK30KKworCitzdGF0aWMgdm9pZCB0ZXN0VExTRXJyb3Jz SFRUUEF1dGgoU1NMVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sKKyAgICB3ZWJraXRfd2Vi X2NvbnRleHRfc2V0X3Rsc19lcnJvcnNfcG9saWN5KHdlYmtpdF93ZWJfdmlld19nZXRfY29udGV4 dCh0ZXN0LT5tX3dlYlZpZXcpLCBXRUJLSVRfVExTX0VSUk9SU19QT0xJQ1lfRkFJTCk7CisgICAg Z19zaWduYWxfY29ubmVjdCh0ZXN0LT5tX3dlYlZpZXcsICJhdXRoZW50aWNhdGUiLCBHX0NBTExC QUNLKHdlYlZpZXdBdXRoZW50aWNhdGlvbkNhbGxiYWNrKSwgTlVMTCk7CisgICAgdGVzdC0+bG9h ZFVSSShrSHR0cHNTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9hdXRoIikuZGF0YSgpKTsKKyAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydCh0ZXN0LT5tX2xvYWRG YWlsZWQpOworICAgIGdfYXNzZXJ0KHRlc3QtPm1fbG9hZEV2ZW50cy5jb250YWlucyhMb2FkVHJh Y2tpbmdUZXN0OjpQcm92aXNpb25hbExvYWRGYWlsZWQpKTsKKyAgICBnX2Fzc2VydCghdGVzdC0+ bV9sb2FkRXZlbnRzLmNvbnRhaW5zKExvYWRUcmFja2luZ1Rlc3Q6OkxvYWRDb21taXR0ZWQpKTsK K30KKwogY2xhc3MgVExTRXJyb3JzVGVzdDogcHVibGljIFNTTFRlc3QgewogcHVibGljOgogICAg IE1BS0VfR0xJQl9URVNUX0ZJWFRVUkUoVExTRXJyb3JzVGVzdCk7CkBAIC0yMzQsNiArMjUyLDkg QEAgc3RhdGljIHZvaWQgaHR0cHNTZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVyKiBzZXJ2ZXIsIFNv dXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdAogICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0 aCwgIi9yZWRpcmVjdCIpKSB7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3Nh Z2UsIFNPVVBfU1RBVFVTX01PVkVEX1BFUk1BTkVOVExZKTsKICAgICAgICAgc291cF9tZXNzYWdl X2hlYWRlcnNfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJMb2NhdGlvbiIsIGtI dHRwU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvdGVzdC1pbWFnZSIpLmRhdGEoKSk7CisgICAgfSBl bHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL2F1dGgiKSkgeworICAgICAgICBzb3VwX21lc3Nh Z2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19VTkFVVEhPUklaRUQpOworICAgICAg ICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywg IldXVy1BdXRoZW50aWNhdGUiLCAiQmFzaWMgcmVhbG09XCJIVFRQUyBhdXRoXCIiKTsKICAgICB9 IGVsc2UKICAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFU VVNfTk9UX0ZPVU5EKTsKIH0KQEAgLTI4Miw2ICszMDMsNyBAQCB2b2lkIGJlZm9yZUFsbCgpCiAg ICAgLy8gZG9uZSBpbiB0aGUgdGxzLXBlcm1pc3Npb24tcmVxdWVzdCB0ZXN0LgogICAgIFNTTFRl c3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ0bHMtZXJyb3JzLXBvbGljeSIsIHRlc3RUTFNFcnJv cnNQb2xpY3kpOwogICAgIFNTTFRlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ0bHMtZXJyb3Jz LXJlZGlyZWN0LXRvLWh0dHAiLCB0ZXN0VExTRXJyb3JzUmVkaXJlY3QpOworICAgIFNTTFRlc3Q6 OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ0bHMtaHR0cC1hdXRoIiwgdGVzdFRMU0Vycm9yc0hUVFBB dXRoKTsKICAgICBUTFNFcnJvcnNUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAibG9hZC1mYWls ZWQtd2l0aC10bHMtZXJyb3JzIiwgdGVzdExvYWRGYWlsZWRXaXRoVExTRXJyb3JzKTsKIH0KIAo=