Add restrictions by default to open registration in Synapse (#12091)
This commit is contained in:
parent
7ca8ee67a5
commit
3c41d87b67
|
@ -0,0 +1 @@
|
||||||
|
Refuse to start if registration is enabled without email, captcha, or token-based verification unless new config flag `enable_registration_without_verification` is set.
|
|
@ -38,6 +38,7 @@ for port in 8080 8081 8082; do
|
||||||
printf '\n\n# Customisation made by demo/start.sh\n\n'
|
printf '\n\n# Customisation made by demo/start.sh\n\n'
|
||||||
echo "public_baseurl: http://localhost:$port/"
|
echo "public_baseurl: http://localhost:$port/"
|
||||||
echo 'enable_registration: true'
|
echo 'enable_registration: true'
|
||||||
|
echo 'enable_registration_without_verification: true'
|
||||||
echo ''
|
echo ''
|
||||||
|
|
||||||
# Warning, this heredoc depends on the interaction of tabs and spaces.
|
# Warning, this heredoc depends on the interaction of tabs and spaces.
|
||||||
|
|
|
@ -1218,10 +1218,18 @@ oembed:
|
||||||
# Registration can be rate-limited using the parameters in the "Ratelimiting"
|
# Registration can be rate-limited using the parameters in the "Ratelimiting"
|
||||||
# section of this file.
|
# section of this file.
|
||||||
|
|
||||||
# Enable registration for new users.
|
# Enable registration for new users. Defaults to 'false'. It is highly recommended that if you enable registration,
|
||||||
|
# you use either captcha, email, or token-based verification to verify that new users are not bots. In order to enable registration
|
||||||
|
# without any verification, you must also set `enable_registration_without_verification`, found below.
|
||||||
#
|
#
|
||||||
#enable_registration: false
|
#enable_registration: false
|
||||||
|
|
||||||
|
# Enable registration without email or captcha verification. Note: this option is *not* recommended,
|
||||||
|
# as registration without verification is a known vector for spam and abuse. Defaults to false. Has no effect
|
||||||
|
# unless `enable_registration` is also enabled.
|
||||||
|
#
|
||||||
|
#enable_registration_without_verification: true
|
||||||
|
|
||||||
# Time that a user's session remains valid for, after they log in.
|
# Time that a user's session remains valid for, after they log in.
|
||||||
#
|
#
|
||||||
# Note that this is not currently compatible with guest logins.
|
# Note that this is not currently compatible with guest logins.
|
||||||
|
|
|
@ -108,6 +108,12 @@ for more information and instructions on how to fix a database with incorrect va
|
||||||
|
|
||||||
# Upgrading to v1.55.0
|
# Upgrading to v1.55.0
|
||||||
|
|
||||||
|
## Open registration without verification is now disabled by default
|
||||||
|
|
||||||
|
Synapse will refuse to start if registration is enabled without email, captcha, or token-based verification unless the new config
|
||||||
|
flag `enable_registration_without_verification` is set to "true".
|
||||||
|
|
||||||
|
|
||||||
## `synctl` script has been moved
|
## `synctl` script has been moved
|
||||||
|
|
||||||
The `synctl` script
|
The `synctl` script
|
||||||
|
|
|
@ -351,6 +351,23 @@ def setup(config_options: List[str]) -> SynapseHomeServer:
|
||||||
if config.server.gc_seconds:
|
if config.server.gc_seconds:
|
||||||
synapse.metrics.MIN_TIME_BETWEEN_GCS = config.server.gc_seconds
|
synapse.metrics.MIN_TIME_BETWEEN_GCS = config.server.gc_seconds
|
||||||
|
|
||||||
|
if (
|
||||||
|
config.registration.enable_registration
|
||||||
|
and not config.registration.enable_registration_without_verification
|
||||||
|
):
|
||||||
|
if (
|
||||||
|
not config.captcha.enable_registration_captcha
|
||||||
|
and not config.registration.registrations_require_3pid
|
||||||
|
and not config.registration.registration_requires_token
|
||||||
|
):
|
||||||
|
|
||||||
|
raise ConfigError(
|
||||||
|
"You have enabled open registration without any verification. This is a known vector for "
|
||||||
|
"spam and abuse. If you would like to allow public registration, please consider adding email, "
|
||||||
|
"captcha, or token-based verification. Otherwise this check can be removed by setting the "
|
||||||
|
"`enable_registration_without_verification` config option to `true`."
|
||||||
|
)
|
||||||
|
|
||||||
hs = SynapseHomeServer(
|
hs = SynapseHomeServer(
|
||||||
config.server.server_name,
|
config.server.server_name,
|
||||||
config=config,
|
config=config,
|
||||||
|
|
|
@ -33,6 +33,10 @@ class RegistrationConfig(Config):
|
||||||
str(config["disable_registration"])
|
str(config["disable_registration"])
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self.enable_registration_without_verification = strtobool(
|
||||||
|
str(config.get("enable_registration_without_verification", False))
|
||||||
|
)
|
||||||
|
|
||||||
self.registrations_require_3pid = config.get("registrations_require_3pid", [])
|
self.registrations_require_3pid = config.get("registrations_require_3pid", [])
|
||||||
self.allowed_local_3pids = config.get("allowed_local_3pids", [])
|
self.allowed_local_3pids = config.get("allowed_local_3pids", [])
|
||||||
self.enable_3pid_lookup = config.get("enable_3pid_lookup", True)
|
self.enable_3pid_lookup = config.get("enable_3pid_lookup", True)
|
||||||
|
@ -207,10 +211,18 @@ class RegistrationConfig(Config):
|
||||||
# Registration can be rate-limited using the parameters in the "Ratelimiting"
|
# Registration can be rate-limited using the parameters in the "Ratelimiting"
|
||||||
# section of this file.
|
# section of this file.
|
||||||
|
|
||||||
# Enable registration for new users.
|
# Enable registration for new users. Defaults to 'false'. It is highly recommended that if you enable registration,
|
||||||
|
# you use either captcha, email, or token-based verification to verify that new users are not bots. In order to enable registration
|
||||||
|
# without any verification, you must also set `enable_registration_without_verification`, found below.
|
||||||
#
|
#
|
||||||
#enable_registration: false
|
#enable_registration: false
|
||||||
|
|
||||||
|
# Enable registration without email or captcha verification. Note: this option is *not* recommended,
|
||||||
|
# as registration without verification is a known vector for spam and abuse. Defaults to false. Has no effect
|
||||||
|
# unless `enable_registration` is also enabled.
|
||||||
|
#
|
||||||
|
#enable_registration_without_verification: true
|
||||||
|
|
||||||
# Time that a user's session remains valid for, after they log in.
|
# Time that a user's session remains valid for, after they log in.
|
||||||
#
|
#
|
||||||
# Note that this is not currently compatible with guest logins.
|
# Note that this is not currently compatible with guest logins.
|
||||||
|
|
|
@ -11,14 +11,16 @@
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
import synapse.app.homeserver
|
||||||
from synapse.config import ConfigError
|
from synapse.config import ConfigError
|
||||||
from synapse.config.homeserver import HomeServerConfig
|
from synapse.config.homeserver import HomeServerConfig
|
||||||
|
|
||||||
from tests.unittest import TestCase
|
from tests.config.utils import ConfigFileTestCase
|
||||||
from tests.utils import default_config
|
from tests.utils import default_config
|
||||||
|
|
||||||
|
|
||||||
class RegistrationConfigTestCase(TestCase):
|
class RegistrationConfigTestCase(ConfigFileTestCase):
|
||||||
def test_session_lifetime_must_not_be_exceeded_by_smaller_lifetimes(self):
|
def test_session_lifetime_must_not_be_exceeded_by_smaller_lifetimes(self):
|
||||||
"""
|
"""
|
||||||
session_lifetime should logically be larger than, or at least as large as,
|
session_lifetime should logically be larger than, or at least as large as,
|
||||||
|
@ -76,3 +78,19 @@ class RegistrationConfigTestCase(TestCase):
|
||||||
HomeServerConfig().parse_config_dict(
|
HomeServerConfig().parse_config_dict(
|
||||||
{"session_lifetime": "31m", "refresh_token_lifetime": "31m", **config_dict}
|
{"session_lifetime": "31m", "refresh_token_lifetime": "31m", **config_dict}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_refuse_to_start_if_open_registration_and_no_verification(self):
|
||||||
|
self.generate_config()
|
||||||
|
self.add_lines_to_config(
|
||||||
|
[
|
||||||
|
" ",
|
||||||
|
"enable_registration: true",
|
||||||
|
"registrations_require_3pid: []",
|
||||||
|
"enable_registration_captcha: false",
|
||||||
|
"registration_requires_token: false",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test that allowing open registration without verification raises an error
|
||||||
|
with self.assertRaises(ConfigError):
|
||||||
|
synapse.app.homeserver.setup(["-c", self.config_file])
|
||||||
|
|
Loading…
Reference in New Issue