The tokenserver returns an opaque "api_endpoint" url which the client is supposed to use directly to access the service. It makes no guarantees about the internal structure of this url. Firefox currently appears to be parsing this URL and re-constructing its own version. So if the tokenserver sends an api_endpoint that looks like this: https://sync1.dev.lcip.org/1.5/8 Then Firefox re-interprets it as a sync1.1 clusterURL and tries to sync at: https://sync1.dev.lcip.rg/1.1/8 (See Bug 960816 for a concrete example of this happening) I guess this is because that's how the internals of the current sync client code work, e.g clusterURL doesn't include the path component. But it's technically against the spec we're committing to in the new server infrastructure. Ideal solution: use the url verbatim as returned by tokenserver Workable temporary solution: remember the version number component from the url and put it back in as you found it

Comment on attachment 8367684 [details] [diff] [review] 0001-prepare-for-storage-endpoints-return-by-1.5-token-se.patch Review of attachment 8367684 [details] [diff] [review]: ----------------------------------------------------------------- lgtm ::: services/sync/modules/browserid_identity.js @@ +481,5 @@ > + let endpoint = token.endpoint; > + // For Sync 1.5 storage endpoints, we use the base endpoint verbatim. > + // However, it should end in "/" because we will extend it with > + // well known path components. So we add a "/" if it's missing. > + if (endpoint.charAt(endpoint.length-1) !== "/") { if (!endpoint.endsWith("/")) { ::: services/sync/modules/service.js @@ +154,5 @@ > > return Utils.catch.call(this, func, lockExceptions); > }, > > + get userBaseURL() this._clusterManager ? this._clusterManager.getUserBaseURL() : null, Multi-line with early return would be clearer, I think.

Backed out in https://hg.mozilla.org/integration/fx-team/rev/bf49e4428906 along with the patch from bug 965461 because one or both of them broke xpcshell tests: https://tbpl.mozilla.org/php/getParsedLog.php?id=33785490&tree=Fx-Team

relanded with test_error_handler disabled - see bug 965698 https://hg.mozilla.org/integration/fx-team/rev/6f10f2e4ef13

backed out this change in https://tbpl.mozilla.org/?tree=Fx-Team&rev=5a3bc41cd6f1 for causing broken XPCshell tests like https://tbpl.mozilla.org/php/getParsedLog.php?id=33794976&tree=Fx-Team

Re-landed since this patch wasn't the bustinator (I ran xpcshell locally). https://hg.mozilla.org/integration/fx-team/rev/a4638840181d