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

Show redirect URL in the sync stream listener (for file downloads)

Browse source 
Also consolidate the display-URL-password-hiding logic in http.js
This commit is contained in:
Dan Stillman 2014-02-21 19:04:57 -05:00
parent 79cd7197ff
commit 62e779beec
2 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
chrome/content/zotero/xpcom/http.js
View file

@ -68,12 +68,8 @@ Zotero.HTTP = new function() {
this.promise = function promise(method, url, options) { this.promise = function promise(method, url, options) {
if (url instanceof Components.interfaces.nsIURI) { if (url instanceof Components.interfaces.nsIURI) {
// Don't display password in console // Don't display password in console
var dispURL = url.clone(); var dispURL = this.getDisplayURI(url).spec;
if (dispURL.password) {
dispURL.password = "********";
}
url = url.spec; url = url.spec;
dispURL = dispURL.spec;
} }
else { else {
var dispURL = url; var dispURL = url;
@ -212,10 +208,7 @@ Zotero.HTTP = new function() {
this.doGet = function(url, onDone, responseCharset, cookieSandbox) { this.doGet = function(url, onDone, responseCharset, cookieSandbox) {
if (url instanceof Components.interfaces.nsIURI) { if (url instanceof Components.interfaces.nsIURI) {
// Don't display password in console // Don't display password in console
var disp = url.clone(); var disp = this.getDisplayURI(url);
if (disp.password) {
disp.password = "********";
}
Zotero.debug("HTTP GET " + disp.spec); Zotero.debug("HTTP GET " + disp.spec);
url = url.spec; url = url.spec;
} }
@ -276,10 +269,7 @@ Zotero.HTTP = new function() {
this.doPost = function(url, body, onDone, headers, responseCharset, cookieSandbox) { this.doPost = function(url, body, onDone, headers, responseCharset, cookieSandbox) {
if (url instanceof Components.interfaces.nsIURI) { if (url instanceof Components.interfaces.nsIURI) {
// Don't display password in console // Don't display password in console
var disp = url.clone(); var disp = this.getDisplayURI(url);
if (disp.password) {
disp.password = "********";
}
url = url.spec; url = url.spec;
} }
@ -363,10 +353,7 @@ Zotero.HTTP = new function() {
this.doHead = function(url, onDone, requestHeaders, cookieSandbox) { this.doHead = function(url, onDone, requestHeaders, cookieSandbox) {
if (url instanceof Components.interfaces.nsIURI) { if (url instanceof Components.interfaces.nsIURI) {
// Don't display password in console // Don't display password in console
var disp = url.clone(); var disp = this.getDisplayURI(url);
if (disp.password) {
disp.password = "********";
}
Zotero.debug("HTTP HEAD " + disp.spec); Zotero.debug("HTTP HEAD " + disp.spec);
url = url.spec; url = url.spec;
} }
@ -424,10 +411,7 @@ Zotero.HTTP = new function() {
*/ */
this.doOptions = function (uri, callback) { this.doOptions = function (uri, callback) {
// Don't display password in console // Don't display password in console
var disp = uri.clone(); var disp = this.getDisplayURI(uri);
if (disp.password) {
disp.password = "********";
}
Zotero.debug("HTTP OPTIONS for " + disp.spec); Zotero.debug("HTTP OPTIONS for " + disp.spec);
if (Zotero.HTTP.browserIsOffline()){ if (Zotero.HTTP.browserIsOffline()){
@ -619,10 +603,7 @@ Zotero.HTTP = new function() {
} }
// Don't display password in console // Don't display password in console
var disp = uri.clone(); var disp = this.getDisplayURI(uri);
if (disp.password) {
disp.password = "********";
}
var bodyStart = body.substr(0, 1024); var bodyStart = body.substr(0, 1024);
Zotero.debug("HTTP " + method + " " Zotero.debug("HTTP " + method + " "
@ -672,10 +653,7 @@ Zotero.HTTP = new function() {
*/ */
this.WebDAV.doMkCol = function (uri, callback) { this.WebDAV.doMkCol = function (uri, callback) {
// Don't display password in console // Don't display password in console
var disp = uri.clone(); var disp = this.getDisplayURI(uri);
if (disp.password) {
disp.password = "********";
}
Zotero.debug("HTTP MKCOL " + disp.spec); Zotero.debug("HTTP MKCOL " + disp.spec);
if (Zotero.HTTP.browserIsOffline()) { if (Zotero.HTTP.browserIsOffline()) {
@ -709,10 +687,7 @@ Zotero.HTTP = new function() {
*/ */
this.WebDAV.doPut = function (uri, body, callback) { this.WebDAV.doPut = function (uri, body, callback) {
// Don't display password in console // Don't display password in console
var disp = uri.clone(); var disp = this.getDisplayURI(uri);
if (disp.password) {
disp.password = "********";
}
var bodyStart = "'" + body.substr(0, 1024) + "'"; var bodyStart = "'" + body.substr(0, 1024) + "'";
Zotero.debug("HTTP PUT " Zotero.debug("HTTP PUT "
@ -754,10 +729,7 @@ Zotero.HTTP = new function() {
*/ */
this.WebDAV.doDelete = function (uri, callback) { this.WebDAV.doDelete = function (uri, callback) {
// Don't display password in console // Don't display password in console
var disp = uri.clone(); var disp = this.getDisplayURI(uri);
if (disp.password) {
disp.password = "********";
}
Zotero.debug("WebDAV DELETE to " + disp.spec); Zotero.debug("WebDAV DELETE to " + disp.spec);
@ -785,6 +757,15 @@ Zotero.HTTP = new function() {
} }
this.getDisplayURI = function (uri) {
var disp = uri.clone();
if (disp.password) {
disp.password = "********";
}
return disp;
}
/** /**
* Get the Authorization header used by a channel * Get the Authorization header used by a channel
* *

3
chrome/content/zotero/xpcom/storage/streamListener.js
View file

@ -141,6 +141,9 @@ Zotero.Sync.Storage.StreamListener.prototype = {
// nsIHttpEventSink // nsIHttpEventSink
onRedirect: function (oldChannel, newChannel) { onRedirect: function (oldChannel, newChannel) {
Zotero.debug('onRedirect'); Zotero.debug('onRedirect');
var newURL = Zotero.HTTP.getDisplayURI(newChannel.URI).spec;
Zotero.debug("Redirecting to " + newURL);
}, },