diff options
| author | dave@33eels.com <dave@33eels.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2009-06-10 11:58:39 (GMT) |
|---|---|---|
| committer | dave@33eels.com <dave@33eels.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2009-06-10 11:58:39 (GMT) |
| commit | ee62ee62b44b5e41f199b86a5717dda5fbee0aff (patch) | |
| tree | 46922b91ea42912bd589602bf88bbc8cd47fb66a | |
| parent | 24db8431c73227ab3bebf087a60ca1346fdd72df (diff) | |
Fix for bug 496612 ("Issues with logging in")
- Extension is now checking for invalid auth tokens.
git-svn-id: http://svn.mozilla.org/addons/trunk@27449 4eb1ac78-321c-0410-a911-ec516a8615a5
| -rw-r--r-- | bandwagon/content/scripts/rpc/event.js | 8 | ||||
| -rw-r--r-- | bandwagon/content/scripts/rpc/service.js | 14 |
2 files changed, 16 insertions, 6 deletions
diff --git a/bandwagon/content/scripts/rpc/event.js b/bandwagon/content/scripts/rpc/event.js index a388f3a..ae8e165 100644 --- a/bandwagon/content/scripts/rpc/event.js +++ b/bandwagon/content/scripts/rpc/event.js @@ -39,16 +39,16 @@ Bandwagon.RPC.Event = function(type, result, response) { this.Bandwagon = Bandwagon; - // public instance variables + // public instance variables this._type = type; - this._result = result; - this._response = response; + this._result = result; + this._response = response; this.error = null; } Bandwagon.RPC.Event.prototype.isError = function() { - return this._result != this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_SUCCESS; + return this._result != this.Bandwagon.RPC.Constants.BANDWAGON_RPC_NET_SUCCESS; } Bandwagon.RPC.Event.prototype.setError = function(error) diff --git a/bandwagon/content/scripts/rpc/service.js b/bandwagon/content/scripts/rpc/service.js index a444e7a..8cb8f90 100644 --- a/bandwagon/content/scripts/rpc/service.js +++ b/bandwagon/content/scripts/rpc/service.js @@ -232,9 +232,19 @@ Bandwagon.RPC.Service.prototype.authenticate = function(login, password, callbac { event.authToken = event.getData().attribute("value"); - service._logger.debug("Bandwagon.RPC.Service.authenticate: have an auth token: " + event.authToken); + if (!event.authToken.match(/.*\w.*/)) + { + // invalid auth token (bug 496612) + service._logger.error("Bandwagon.RPC.Service.authenticate: invalid auth token: '" + event.authToken + "'"); + + event._result = service.Bandwagon.RPC.Constants.BANDWAGON_RPC_SERVICE_ERROR_UNEXPECTED_XML; + } + else + { + service._logger.debug("Bandwagon.RPC.Service.authenticate: have an auth token: " + event.authToken); - service.Bandwagon.Preferences.setPreference(service.Bandwagon.PREF_AUTH_TOKEN, event.authToken); + service.Bandwagon.Preferences.setPreference(service.Bandwagon.PREF_AUTH_TOKEN, event.authToken); + } } if (callback) |