diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py
new file mode 100644
index 0000000000..a97a5bab1e
--- /dev/null
+++ b/synapse/config/captcha.py
@@ -0,0 +1,42 @@
+# Copyright 2014 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from ._base import Config
+
+class CaptchaConfig(Config):
+
+ def __init__(self, args):
+ super(CaptchaConfig, self).__init__(args)
+ self.recaptcha_private_key = args.recaptcha_private_key
+ self.enable_registration_captcha = args.enable_registration_captcha
+ self.captcha_ip_origin_is_x_forwarded = args.captcha_ip_origin_is_x_forwarded
+
+ @classmethod
+ def add_arguments(cls, parser):
+ super(CaptchaConfig, cls).add_arguments(parser)
+ group = parser.add_argument_group("recaptcha")
+ group.add_argument(
+ "--recaptcha-private-key", type=str, default="YOUR_PRIVATE_KEY",
+ help="The matching private key for the web client's public key."
+ )
+ group.add_argument(
+ "--enable-registration-captcha", type=bool, default=False,
+ help="Enables ReCaptcha checks when registering, preventing signup "+
+ "unless a captcha is answered. Requires a valid ReCaptcha public/private key."
+ )
+ group.add_argument(
+ "--captcha_ip_origin_is_x_forwarded", type=bool, default=False,
+ help="When checking captchas, use the X-Forwarded-For (XFF) header as the client IP "+
+ "and not the actual client IP."
+ )
\ No newline at end of file
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 76e2cdeddd..e16f2c733b 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -19,9 +19,10 @@ from .logger import LoggingConfig
from .database import DatabaseConfig
from .ratelimiting import RatelimitConfig
from .repository import ContentRepositoryConfig
+from .captcha import CaptchaConfig
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
- RatelimitConfig, ContentRepositoryConfig):
+ RatelimitConfig, ContentRepositoryConfig, CaptchaConfig):
pass
if __name__=='__main__':
|
