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

Don't include "Zotero" in User-Agent sent to non-Zotero sites

Browse source
This commit is contained in:
Dan Stillman 2018-08-15 22:06:51 -04:00
parent 65bdef42a1
commit bcf94942f9
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/zotero.js
View file

@ -2627,8 +2627,7 @@ Zotero.VersionHeader = {
}, },
/** /**
* Add Firefox/[version] to the default user agent and replace Zotero/[version] with * Replace Zotero/[version] with Firefox/[version] in the default user agent
* Zotero/[major.minor] (except for requests to zotero.org, where we include the full version)
* *
* @param {String} domain * @param {String} domain
* @param {String} ua - User Agent * @param {String} ua - User Agent
@ -2640,17 +2639,12 @@ Zotero.VersionHeader = {
var appName = testAppName || info.name; var appName = testAppName || info.name;
var pos = ua.indexOf(appName + '/'); var pos = ua.indexOf(appName + '/');
var appPart = ua.substr(pos);
// Default UA // Default UA (not a faked UA from the connector
if (pos != -1) { if (pos != -1) {
ua = ua.slice(0, pos) + `Firefox/${info.platformVersion.match(/^\d+/)[0]}.0 ` ua = ua.slice(0, pos) + `Firefox/${info.platformVersion.match(/^\d+/)[0]}.0`
+ appName + '/';
} }
// Fake UA from connector
else {
ua += ' ' + appName + '/';
}
ua += Zotero.version.replace(/(\d+\.\d+).*/, '$1');
return ua; return ua;
}, },

15
test/tests/zoteroTest.js
View file

@ -36,14 +36,21 @@ describe("Zotero", function() {
majorMinorVersion = Zotero.version.replace(/(\d+\.\d+).*/, '$1'); majorMinorVersion = Zotero.version.replace(/(\d+\.\d+).*/, '$1');
}); });
it("should add Zotero/[major.minor] to Chrome user agent", function () { it("should replace app name with Firefox", function () {
var platformVersion = Services.appinfo.platformVersion.match(/^\d+/)[0] + '.0';
var ua1 = `Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 ${Zotero.clientName}/${Zotero.version}`;
var ua2 = `Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/${platformVersion}`;
assert.equal(Zotero.VersionHeader.update('example.com', ua1, ZOTERO_CONFIG.CLIENT_NAME), ua2);
});
it("should show Chrome user agent unchanged", function () {
var ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36'; var ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36';
assert.equal(Zotero.VersionHeader.update('example.com', ua, ZOTERO_CONFIG.CLIENT_NAME), ua + ` Zotero/${majorMinorVersion}`); assert.equal(Zotero.VersionHeader.update('example.com', ua, ZOTERO_CONFIG.CLIENT_NAME), ua);
}); });
it("should add Zotero/[major.minor] to Firefox user agent", function () { it("should show Firefox user agent unchanged", function () {
var ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0'; var ua = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0';
assert.equal(Zotero.VersionHeader.update('example.com', ua, ZOTERO_CONFIG.CLIENT_NAME), ua + ` Zotero/${majorMinorVersion}`); assert.equal(Zotero.VersionHeader.update('example.com', ua, ZOTERO_CONFIG.CLIENT_NAME), ua);
}); });
}); });
}); });