From 0ee5588101f9584134b004322bc8ace53c94d4d1 Mon Sep 17 00:00:00 2001 From: Ryan Kelly Date: Fri, 2 May 2014 12:39:46 +1000 Subject: [PATCH] Expose tokenserver's allow_new_users setting at top-level server config. --- requirements.txt | 2 +- syncserver.ini | 4 ++++ syncserver/__init__.py | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d8bb8c4..f08e4d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ simplejson==3.4 SQLAlchemy==0.9.4 unittest2==0.5.1 http://github.com/mozilla-services/mozservices/archive/825cae97e99d1128a07ad8c73dcdc5764562b536.zip -https://github.com/mozilla-services/tokenserver/archive/31eaa57797283b5cd4da5a93450638be9059d1dc.zip +https://github.com/mozilla-services/tokenserver/archive/02f565379d5af04d23c46d35f3733decd1cab98d.zip http://github.com/mozilla-services/server-syncstorage/archive/1.5.3.zip diff --git a/syncserver.ini b/syncserver.ini index b3073b8..de9c7da 100644 --- a/syncserver.ini +++ b/syncserver.ini @@ -22,3 +22,7 @@ public_url = http://localhost:5000/ # # If not specified then the server will generate a temporary one at startup. #secret = INSERT_SECRET_KEY_HERE + +# Set this to "false" to disable new-user signups on the server. +# Only request by existing accounts will be honoured. +# allow_new_users = false diff --git a/syncserver/__init__.py b/syncserver/__init__.py index d403554..2561d2c 100644 --- a/syncserver/__init__.py +++ b/syncserver/__init__.py @@ -52,6 +52,10 @@ def includeme(config): # Default to a single fixed signing secret settings["tokenserver.secrets.backend"] = "mozsvc.secrets.FixedSecrets" settings["tokenserver.secrets.secrets"] = [secret] + if "tokenserver.allow_new_users" not in settings: + allow_new_users = settings.get("syncserver.allow_new_users") + if allow_new_users is not None: + settings["tokenserver.allow_new_users"] = allow_new_users if "hawkauth.secrets.backend" not in settings: # Default to the same secrets backend as the tokenserver for key in settings.keys():