mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix CookieManager bugs that were breaking Google Scholar

Browse source
This commit is contained in:
Simon Kornblith 2010-10-18 19:45:10 +00:00
parent 7f3908f1b8
commit 1575ce9df0
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/xpcom/connector.js
View file

@ -359,8 +359,9 @@ Zotero.Connector.CookieManager = function(browser, uri, cookieData) {
var splitCookies = cookieData.split(/; ?/); var splitCookies = cookieData.split(/; ?/);
this._cookies = {}; this._cookies = {};
for each(var cookie in splitCookies) { for each(var cookie in splitCookies) {
var splitCookie = cookie.split("="); var key = cookie.substr(0, cookie.indexOf("="));
this._cookies[decodeURIComponent(splitCookie[0])] = decodeURIComponent(splitCookie[1]); var value = cookie.substr(cookie.indexOf("=")+1);
this._cookies[key] = value;
} }
[this._observerService.addObserver(this, topic, false) for each(topic in this._observerTopics)]; [this._observerService.addObserver(this, topic, false) for each(topic in this._observerTopics)];
@ -419,7 +420,7 @@ Zotero.Connector.CookieManager.prototype = {
} }
// add cookies to be sent to this domain // add cookies to be sent to this domain
var cookies = [encodeURIComponent(key)+"="+encodeURIComponent(this._cookies[key]) var cookies = [key+"="+this._cookies[key]
for(key in this._cookies)].join("; "); for(key in this._cookies)].join("; ");
channel.setRequestHeader("Cookie", cookies, false); channel.setRequestHeader("Cookie", cookies, false);
Zotero.debug("Zotero.Connector.CookieManager: added cookies for request to "+channel.URI.spec); Zotero.debug("Zotero.Connector.CookieManager: added cookies for request to "+channel.URI.spec);
@ -444,10 +445,11 @@ Zotero.Connector.CookieManager.prototype = {
var cookies = cookieHeader.split(/; ?/); var cookies = cookieHeader.split(/; ?/);
var newCookies = {}; var newCookies = {};
for each(var cookie in cookies) { for each(var cookie in cookies) {
var splitCookie = cookie.split("="); var key = cookie.substr(0, cookie.indexOf("="));
var lcCookie = splitCookie[0].toLowerCase(); var value = cookie.substr(cookie.indexOf("=")+1);
var lcCookie = key.toLowerCase();
if(["comment", "domain", "max-age", "path", "version"].indexOf(lcCookie) != -1) { if(["comment", "domain", "max-age", "path", "version", "expires"].indexOf(lcCookie) != -1) {
// ignore cookie parameters; we are only holding cookies for a few minutes // ignore cookie parameters; we are only holding cookies for a few minutes
// with a single domain, and the path attribute doesn't allow any additional // with a single domain, and the path attribute doesn't allow any additional
// security anyway // security anyway
@ -457,7 +459,7 @@ Zotero.Connector.CookieManager.prototype = {
newCookies = {}; newCookies = {};
break; break;
} else { } else {
newCookies[decodeURIComponent(splitCookie[0])] = decodeURIComponent(splitCookie[1]); newCookies[key] = value;
} }
} }
[this._cookies[key] = newCookies[key] for(key in newCookies)]; [this._cookies[key] = newCookies[key] for(key in newCookies)];