156295 2016-04-06 11:11:13 -0700 [SOUP] Implement PlatformCookieJar::addCookie 2016-04-27 16:31:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 156091 1 bburg mcatanzaro bburg berto bugs-noreply cgarcia commit-queue danw gustavo mcatanzaro mrobinson oldest_to_newest 1181297 0 bburg 2016-04-06 11:11:13 -0700 Stub for implementing new CookieJar API. 1181462 1 mcatanzaro 2016-04-06 16:54:17 -0700 Thanks for the heads-up on this! 1181547 2 mcatanzaro 2016-04-06 19:56:51 -0700 Hey Brian, since you haven't landed your patch in bug #156091 yet, here's an implementation you can add to it: void addCookie(const NetworkStorageSession& session, const URL&, const Cookie& cookie) { // Ref is consumed by soup_cookie_jar_add_cookie. SoupCookie* soupCookie = soup_cookie_new(cookie.name.utf8().data(), cookie.value.utf8().data(), cookie.domain.utf8().data(), cookie.path.utf8().data(), static_cast<int>(cookie.expires)); soup_cookie_set_http_only(soupCookie, cookie.httpOnly); soup_cookie_set_secure(soupCookie, cookie.secure); if (cookie.session) soup_cookie_set_max_age(soupCookie, -1); SoupCookieJar* cookieJar = cookieJarForSession(session); soup_cookie_jar_add_cookie(cookieJar, soupCookie); } It compiles, and it might even work! 1181551 3 bburg 2016-04-06 20:07:06 -0700 (In reply to comment #2) > Hey Brian, since you haven't landed your patch in bug #156091 yet, here's an > implementation you can add to it: > > void addCookie(const NetworkStorageSession& session, const URL&, const > Cookie& cookie) > { > // Ref is consumed by soup_cookie_jar_add_cookie. > SoupCookie* soupCookie = soup_cookie_new(cookie.name.utf8().data(), > cookie.value.utf8().data(), > cookie.domain.utf8().data(), cookie.path.utf8().data(), > static_cast<int>(cookie.expires)); > soup_cookie_set_http_only(soupCookie, cookie.httpOnly); > soup_cookie_set_secure(soupCookie, cookie.secure); > if (cookie.session) > soup_cookie_set_max_age(soupCookie, -1); > > SoupCookieJar* cookieJar = cookieJarForSession(session); > soup_cookie_jar_add_cookie(cookieJar, soupCookie); > } > > It compiles, and it might even work! Awesome! Let's land it separately though, so that it can be reviewed by someone familiar with Soup :) 1181598 4 cgarcia 2016-04-06 23:09:25 -0700 (In reply to comment #2) > Hey Brian, since you haven't landed your patch in bug #156091 yet, here's an > implementation you can add to it: > > void addCookie(const NetworkStorageSession& session, const URL&, const > Cookie& cookie) > { > // Ref is consumed by soup_cookie_jar_add_cookie. This comment is very confusing. I normally use consume for floating references, meaning that the weak ref is converted to a normal ref, but SoupCookieJar is not even ref counted. So, I would not use Ref, and would say adopted instead of consumed. > SoupCookie* soupCookie = soup_cookie_new(cookie.name.utf8().data(), > cookie.value.utf8().data(), > cookie.domain.utf8().data(), cookie.path.utf8().data(), > static_cast<int>(cookie.expires)); I'm not sure this is correct, max_age is the number of seconds since now, but expires is an exact date (stored as an interval in milliseconds, it seems). so, I think we should pass -1 here always, and then use soup_cookie_set_expires() converting the expires interval to a SoupDate. > soup_cookie_set_http_only(soupCookie, cookie.httpOnly); > soup_cookie_set_secure(soupCookie, cookie.secure); > if (cookie.session) > soup_cookie_set_max_age(soupCookie, -1); > > SoupCookieJar* cookieJar = cookieJarForSession(session); > soup_cookie_jar_add_cookie(cookieJar, soupCookie); This could be a single line, no need to keep the local variable. Actually, I think even the cookie transfer could be more obvious if we use a helper function to create a SoupCookie out of a Cookie and then simply do: soup_cookie_jar_add_cookie(cookieJarForSession(session), toSoupCookie(cookie)); > } > > It compiles, and it might even work! I'm not sure it works . . . Please, check what expires actually means in both soup and WebCore. 1181652 5 danw 2016-04-07 05:35:56 -0700 (In reply to comment #4) > I'm not sure this is correct, max_age is the number of seconds since now, > but expires is an exact date (stored as an interval in milliseconds, it > seems). so, I think we should pass -1 here always, and then use > soup_cookie_set_expires() converting the expires interval to a SoupDate. ...unless... > > if (cookie.session) > > soup_cookie_set_max_age(soupCookie, -1); ...it's a session cookie. You only want to call one of set_expires() and set_max_age() 1181653 6 mcatanzaro 2016-04-07 05:39:45 -0700 Thanks Dan. (In reply to comment #4) > This comment is very confusing. I normally use consume for floating > references, meaning that the weak ref is converted to a normal ref, but > SoupCookieJar is not even ref counted. So, I would not use Ref, and would > say adopted instead of consumed. OK. > expires is an exact date (stored as an interval in milliseconds, it > seems). No way to tell from the struct. :( > so, I think we should pass -1 here always, and then use > soup_cookie_set_expires() converting the expires interval to a SoupDate. Good idea. > This could be a single line, no need to keep the local variable. OK. > Actually, I > think even the cookie transfer could be more obvious if we use a helper > function to create a SoupCookie out of a Cookie and then simply do: > > soup_cookie_jar_add_cookie(cookieJarForSession(session), > toSoupCookie(cookie)); OK. 1181713 7 bburg 2016-04-07 10:23:35 -0700 (In reply to comment #6) > Thanks Dan. > > (In reply to comment #4) > > This comment is very confusing. I normally use consume for floating > > references, meaning that the weak ref is converted to a normal ref, but > > SoupCookieJar is not even ref counted. So, I would not use Ref, and would > > say adopted instead of consumed. > > OK. > > > expires is an exact date (stored as an interval in milliseconds, it > > seems). > > No way to tell from the struct. :( It is milliseconds since the UNIX epoch. I added a comment in another patch to be landed, since I had this question as well. > > > so, I think we should pass -1 here always, and then use > > soup_cookie_set_expires() converting the expires interval to a SoupDate. > > Good idea. > > > This could be a single line, no need to keep the local variable. > > OK. > > > Actually, I > > think even the cookie transfer could be more obvious if we use a helper > > function to create a SoupCookie out of a Cookie and then simply do: > > > > soup_cookie_jar_add_cookie(cookieJarForSession(session), > > toSoupCookie(cookie)); > > OK. 1181752 8 mcatanzaro 2016-04-07 11:21:06 -0700 (In reply to comment #7) > It is milliseconds since the UNIX epoch. I added a comment in another patch > to be landed, since I had this question as well. Great. Another reminder not to assume.... Anyway, this was a bit tricky to handle properly; I was particularly disappointed to see it's impossible to portably convert from a double to a time_t, but fortunately WTF has better time functions than the standard library, so it wasn't needed in the end. 1181766 9 275904 mcatanzaro 2016-04-07 11:39:10 -0700 Created attachment 275904 [SOUP] Implement PlatformCookieJar::addCookie 1182067 10 275904 cgarcia 2016-04-07 22:18:38 -0700 Comment on attachment 275904 [SOUP] Implement PlatformCookieJar::addCookie View in context: https://bugs.webkit.org/attachment.cgi?id=275904&action=review > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:205 > -void addCookie(const NetworkStorageSession&, const URL&, const Cookie&) > +static SoupDate* msToSoupDate(double ms) > { > - // FIXME: implement this command. <https://webkit.org/b/156295> > - notImplemented(); > + int year = msToYear(ms); > + int dayOfYear = dayInYear(ms, year); > + bool leapYear = isLeapYear(year); > + int day = dayInMonthFromDayInYear(dayOfYear, leapYear); > + int month = monthFromDayInYear(dayOfYear, leapYear); > + int hour = msToHours(ms); > + int minute = msToMinutes(ms); > + int second = static_cast<int>(ms / 1000) % 60; > + return soup_date_new(year, month, day, hour, minute, second); > +} I don't understand this. If the WebCore cookie expires is the number of milliseconds elapsed since the epoch, can't we just convert from milliseconds to seconds and use soup_date_new_from_time_t? 1182153 11 mcatanzaro 2016-04-08 07:59:55 -0700 (In reply to comment #10) > I don't understand this. If the WebCore cookie expires is the number of > milliseconds elapsed since the epoch, can't we just convert from > milliseconds to seconds and use soup_date_new_from_time_t? Kinda, but I don't know what systems that might break on. Unfortunately there seems to be no portable way to convert from a double (or int) to a time_t. I wanted to assume that the time_t stores time in seconds since the epoch and do static_cast<std::time_t>(cookie.expires / 1000), but turns out C++ does not guarantee that; very frustrating. :( 1186699 12 mcatanzaro 2016-04-23 18:53:50 -0700 Carlos? 1186873 13 275904 cgarcia 2016-04-24 23:57:42 -0700 Comment on attachment 275904 [SOUP] Implement PlatformCookieJar::addCookie View in context: https://bugs.webkit.org/attachment.cgi?id=275904&action=review EWS is red, please submit a new patch for EWS before landing this > Source/WebCore/platform/network/soup/CookieJarSoup.cpp:204 > + int year = msToYear(ms); > + int dayOfYear = dayInYear(ms, year); > + bool leapYear = isLeapYear(year); > + int day = dayInMonthFromDayInYear(dayOfYear, leapYear); > + int month = monthFromDayInYear(dayOfYear, leapYear); > + int hour = msToHours(ms); > + int minute = msToMinutes(ms); > + int second = static_cast<int>(ms / 1000) % 60; > + return soup_date_new(year, month, day, hour, minute, second); I still don't understand this, but if you say there's no better way, it's fine with me. I wonder if it would look simpler without using all the local variables, something like: return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear), dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int>(ms / 1000) % 60); 1187953 14 mcatanzaro 2016-04-27 14:15:21 -0700 (In reply to comment #13) > I still don't understand this C++ doesn't guarantee how time_t is used to store time. I think maybe POSIX guarantees it's seconds since the epoch, but I'm not sure, and I think this code should be portable. 1187969 15 277540 mcatanzaro 2016-04-27 15:09:57 -0700 Created attachment 277540 Patch 1188005 16 277540 commit-queue 2016-04-27 16:31:45 -0700 Comment on attachment 277540 Patch Clearing flags on attachment: 277540 Committed r200159: <http://trac.webkit.org/changeset/200159> 1188006 17 commit-queue 2016-04-27 16:31:51 -0700 All reviewed patches have been landed. Closing bug. 275904 2016-04-07 11:39:10 -0700 2016-04-27 15:09:52 -0700 [SOUP] Implement PlatformCookieJar::addCookie bug-156295-20160407133905.patch text/plain 2891 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY4ZDVlODcyNTc5Njcx Yzk1ODVjODA2YWU3OTBjODYwMWFhODM2MS4uOTJjYzY2MDU4YWNiYjYwZGVkZjUxODcyYmM2ODgy MWI0ODQ3MjI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA0LTA3ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g SW1wbGVtZW50IFBsYXRmb3JtQ29va2llSmFyOjphZGRDb29raWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjI5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nv b2tpZUphclNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bXNUb1NvdXBEYXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OnRvU291cENvb2tpZSk6CisgICAgICAgIChXZWJDb3JlOjphZGRDb29raWUp OgorCiAyMDE2LTA0LTA3ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAg IENvb2tpZUphciBzaG91bGQgc3VwcG9ydCBhZGRpbmcgc3ludGhldGljIGNvb2tpZXMgZm9yIGRl dmVsb3BlciB0b29scwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9zb3VwL0Nvb2tpZUphclNvdXAuY3BwCmluZGV4IGM5ZTI1Y2U2YjkxMTU5MTg4ZjMzODViZjE3 ODM5ZjY1NDZmNzNmNzAuLmU5OWUzZWZjNGIzY2Q3NTdhM2I1MTY5YjcxMjk5OTIyZjRkMmNlYWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVK YXJTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29v a2llSmFyU291cC5jcHAKQEAgLTI4LDcgKzI4LDYgQEAKICNpbmNsdWRlICJHVW5pcXVlUHRyU291 cC5oIgogI2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0LmgiCi0j aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvb2tpZUphci5o IgogI2luY2x1ZGUgIlNvdXBOZXR3b3JrU2Vzc2lvbi5oIgogI2luY2x1ZGUgPHd0Zi9nbGliL0dS ZWZQdHIuaD4KQEAgLTE5MiwxMCArMTkxLDM2IEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IE5l dHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAg ICAgfQogfQogCi12b2lkIGFkZENvb2tpZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mLCBj b25zdCBVUkwmLCBjb25zdCBDb29raWUmKQorc3RhdGljIFNvdXBEYXRlKiBtc1RvU291cERhdGUo ZG91YmxlIG1zKQogewotICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQgdGhpcyBjb21tYW5kLiA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTU2Mjk1PgotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaW50 IHllYXIgPSBtc1RvWWVhcihtcyk7CisgICAgaW50IGRheU9mWWVhciA9IGRheUluWWVhcihtcywg eWVhcik7CisgICAgYm9vbCBsZWFwWWVhciA9IGlzTGVhcFllYXIoeWVhcik7CisgICAgaW50IGRh eSA9IGRheUluTW9udGhGcm9tRGF5SW5ZZWFyKGRheU9mWWVhciwgbGVhcFllYXIpOworICAgIGlu dCBtb250aCA9IG1vbnRoRnJvbURheUluWWVhcihkYXlPZlllYXIsIGxlYXBZZWFyKTsKKyAgICBp bnQgaG91ciA9IG1zVG9Ib3Vycyhtcyk7CisgICAgaW50IG1pbnV0ZSA9IG1zVG9NaW51dGVzKG1z KTsKKyAgICBpbnQgc2Vjb25kID0gc3RhdGljX2Nhc3Q8aW50PihtcyAvIDEwMDApICUgNjA7Cisg ICAgcmV0dXJuIHNvdXBfZGF0ZV9uZXcoeWVhciwgbW9udGgsIGRheSwgaG91ciwgbWludXRlLCBz ZWNvbmQpOworfQorCitzdGF0aWMgU291cENvb2tpZSogdG9Tb3VwQ29va2llKGNvbnN0IENvb2tp ZSYgY29va2llKQoreworICAgIFNvdXBDb29raWUqIHNvdXBDb29raWUgPSBzb3VwX2Nvb2tpZV9u ZXcoY29va2llLm5hbWUudXRmOCgpLmRhdGEoKSwgY29va2llLnZhbHVlLnV0ZjgoKS5kYXRhKCks CisgICAgICAgIGNvb2tpZS5kb21haW4udXRmOCgpLmRhdGEoKSwgY29va2llLnBhdGgudXRmOCgp LmRhdGEoKSwgLTEpOworICAgIHNvdXBfY29va2llX3NldF9odHRwX29ubHkoc291cENvb2tpZSwg Y29va2llLmh0dHBPbmx5KTsKKyAgICBzb3VwX2Nvb2tpZV9zZXRfc2VjdXJlKHNvdXBDb29raWUs IGNvb2tpZS5zZWN1cmUpOworICAgIGlmICghY29va2llLnNlc3Npb24pIHsKKyAgICAgICAgU291 cERhdGUqIGRhdGUgPSBtc1RvU291cERhdGUoY29va2llLmV4cGlyZXMpOworICAgICAgICBzb3Vw X2Nvb2tpZV9zZXRfZXhwaXJlcyhzb3VwQ29va2llLCBkYXRlKTsKKyAgICAgICAgc291cF9kYXRl X2ZyZWUoZGF0ZSk7CisgICAgfQorICAgIHJldHVybiBzb3VwQ29va2llOworfQorCit2b2lkIGFk ZENvb2tpZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYs IGNvbnN0IENvb2tpZSYgY29va2llKQoreworICAgIHNvdXBfY29va2llX2phcl9hZGRfY29va2ll KGNvb2tpZUphckZvclNlc3Npb24oc2Vzc2lvbiksIHRvU291cENvb2tpZShjb29raWUpKTsKIH0K IAogdm9pZCBnZXRIb3N0bmFtZXNXaXRoQ29va2llcyhjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Np b24mIHNlc3Npb24sIEhhc2hTZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKQo= 277540 2016-04-27 15:09:57 -0700 2016-04-27 16:31:45 -0700 Patch bug-156295-20160427171027.patch text/plain 2827 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQzMmZhMmQzYzU0ZGYy NmMwMjU2MmUwMTg4YmRlNGQzOGE0YWZiYy4uNDJlYmE4NjI0YmY3MTllYWU3YmU4ZDA4MDdjZjE4 NGRhZTcyNzEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA0LTI3ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g SW1wbGVtZW50IFBsYXRmb3JtQ29va2llSmFyOjphZGRDb29raWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjI5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9z b3VwL0Nvb2tpZUphclNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bXNUb1NvdXBEYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OnRvU291cENvb2tpZSk6CisgICAgICAgIChXZWJDb3JlOjphZGRD b29raWUpOgorCiAyMDE2LTA0LTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgRm9udDo6cmVtb3ZlRnJvbVN5c3RlbUZhbGxiYWNr Q2FjaGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L0Nvb2tpZUphclNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L0Nvb2tpZUphclNvdXAuY3BwCmluZGV4IGM5ZTI1Y2U2YjkxMTU5MTg4ZjMzODViZjE3ODM5ZjY1 NDZmNzNmNzAuLjJmZWRhNWU2NTcyNThmMzQyZDFhMDhmNDI1NmQ3YzA1ZDMwMjhiMTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJTb3Vw LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFy U291cC5jcHAKQEAgLTI4LDkgKzI4LDkgQEAKICNpbmNsdWRlICJHVW5pcXVlUHRyU291cC5oIgog I2luY2x1ZGUgIlVSTC5oIgogI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0LmgiCi0jaW5jbHVk ZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNvb2tpZUphci5oIgogI2lu Y2x1ZGUgIlNvdXBOZXR3b3JrU2Vzc2lvbi5oIgorI2luY2x1ZGUgPHd0Zi9EYXRlTWF0aC5oPgog I2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5n Lmg+CiAKQEAgLTE5MiwxMCArMTkyLDMxIEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IE5ldHdv cmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAgICAg fQogfQogCi12b2lkIGFkZENvb2tpZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mLCBjb25z dCBVUkwmLCBjb25zdCBDb29raWUmKQorc3RhdGljIFNvdXBEYXRlKiBtc1RvU291cERhdGUoZG91 YmxlIG1zKQogewotICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQgdGhpcyBjb21tYW5kLiA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMTU2Mjk1PgotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaW50IHll YXIgPSBtc1RvWWVhcihtcyk7CisgICAgaW50IGRheU9mWWVhciA9IGRheUluWWVhcihtcywgeWVh cik7CisgICAgYm9vbCBsZWFwWWVhciA9IGlzTGVhcFllYXIoeWVhcik7CisgICAgcmV0dXJuIHNv dXBfZGF0ZV9uZXcoeWVhciwgbW9udGhGcm9tRGF5SW5ZZWFyKGRheU9mWWVhciwgbGVhcFllYXIp LCBkYXlJbk1vbnRoRnJvbURheUluWWVhcihkYXlPZlllYXIsIGxlYXBZZWFyKSwgbXNUb0hvdXJz KG1zKSwgbXNUb01pbnV0ZXMobXMpLCBzdGF0aWNfY2FzdDxpbnQ+KG1zIC8gMTAwMCkgJSA2MCk7 Cit9CisKK3N0YXRpYyBTb3VwQ29va2llKiB0b1NvdXBDb29raWUoY29uc3QgQ29va2llJiBjb29r aWUpCit7CisgICAgU291cENvb2tpZSogc291cENvb2tpZSA9IHNvdXBfY29va2llX25ldyhjb29r aWUubmFtZS51dGY4KCkuZGF0YSgpLCBjb29raWUudmFsdWUudXRmOCgpLmRhdGEoKSwKKyAgICAg ICAgY29va2llLmRvbWFpbi51dGY4KCkuZGF0YSgpLCBjb29raWUucGF0aC51dGY4KCkuZGF0YSgp LCAtMSk7CisgICAgc291cF9jb29raWVfc2V0X2h0dHBfb25seShzb3VwQ29va2llLCBjb29raWUu aHR0cE9ubHkpOworICAgIHNvdXBfY29va2llX3NldF9zZWN1cmUoc291cENvb2tpZSwgY29va2ll LnNlY3VyZSk7CisgICAgaWYgKCFjb29raWUuc2Vzc2lvbikgeworICAgICAgICBTb3VwRGF0ZSog ZGF0ZSA9IG1zVG9Tb3VwRGF0ZShjb29raWUuZXhwaXJlcyk7CisgICAgICAgIHNvdXBfY29va2ll X3NldF9leHBpcmVzKHNvdXBDb29raWUsIGRhdGUpOworICAgICAgICBzb3VwX2RhdGVfZnJlZShk YXRlKTsKKyAgICB9CisgICAgcmV0dXJuIHNvdXBDb29raWU7Cit9CisKK3ZvaWQgYWRkQ29va2ll KGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiwgY29uc3Qg Q29va2llJiBjb29raWUpCit7CisgICAgc291cF9jb29raWVfamFyX2FkZF9jb29raWUoY29va2ll SmFyRm9yU2Vzc2lvbihzZXNzaW9uKSwgdG9Tb3VwQ29va2llKGNvb2tpZSkpOwogfQogCiB2b2lk IGdldEhvc3RuYW1lc1dpdGhDb29raWVzKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vz c2lvbiwgSGFzaFNldDxTdHJpbmc+JiBob3N0bmFtZXMpCg==