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

Merge pull request #411 from aurimasv/webdav-ssl

Browse source 
Do not show SSL error message for other network errors
This commit is contained in:
Dan Stillman 2013-11-07 23:14:03 -08:00
commit ee37b0ff65
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -579,7 +579,18 @@ Zotero.Sync.Storage.WebDAV = (function () {
var channel = req.channel;
if (!channel instanceof Ci.nsIChannel) {
Zotero.Sync.Storage.EventManager.error('No HTTPS channel available');
return;
}
// Check if the error we encountered is really an SSL error
// Logic borrowed from https://developer.mozilla.org/en-US/docs/How_to_check_the_security_state_of_an_XMLHTTPRequest_over_SSL
// and http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ssl/sslerr.h
var sslErrLimit = Ci.nsINSSErrorsService.NSS_SSL_ERROR_LIMIT - Ci.nsINSSErrorsService.NSS_SSL_ERROR_BASE;
var sslErr = Math.abs(Ci.nsINSSErrorsService.NSS_SSL_ERROR_BASE) - (channel.status & 0xffff);
if(sslErr < 0 || sslErr > sslErrLimit) {
return;
}
var secInfo = channel.securityInfo;
if (secInfo instanceof Ci.nsITransportSecurityInfo) {
secInfo.QueryInterface(Ci.nsITransportSecurityInfo);