perso/syncserver
perso/syncserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that default "audience" URL has no path component.

Browse Source
This commit is contained in:
Ryan Kelly 2014-05-15 10:20:05 +10:00
parent 988a23c051
commit 28851e3c22
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncserver/__init__.py
View File

@ -3,7 +3,7 @@
# You can obtain one at http://mozilla.org/MPL/2.0/. # You can obtain one at http://mozilla.org/MPL/2.0/.
import os import os
from urlparse import urlparse from urlparse import urlparse, urlunparse
from pyramid.response import Response from pyramid.response import Response
from pyramid.events import NewRequest, subscriber from pyramid.events import NewRequest, subscriber
@ -68,9 +68,10 @@ def includeme(config):
settings["storage.sqluri"] = sqluri settings["storage.sqluri"] = sqluri
settings["storage.create_tables"] = True settings["storage.create_tables"] = True
if "browserid.backend" not in settings: if "browserid.backend" not in settings:
# Default to remote verifier, with public_url as only audience # Default to remote verifier, with base of public_url as only audience
audience = urlunparse(urlparse(public_url)._replace(path=""))
settings["browserid.backend"] = "tokenserver.verifiers.RemoteVerifier" settings["browserid.backend"] = "tokenserver.verifiers.RemoteVerifier"
settings["browserid.audiences"] = public_url settings["browserid.audiences"] = audience
if "metlog.backend" not in settings: if "metlog.backend" not in settings:
# Default to sending metlog output to stdout. # Default to sending metlog output to stdout.
settings["metlog.backend"] = "mozsvc.metrics.MetlogPlugin" settings["metlog.backend"] = "mozsvc.metrics.MetlogPlugin"