diff --git a/.env.sample b/.env.sample index a417299..acb4109 100644 --- a/.env.sample +++ b/.env.sample @@ -73,6 +73,13 @@ RETENTION_MAX_LIFETIME=4w #MEDIA_RETENTION_LOCAL_LIFETIME=30d #MEDIA_RETENTION_REMOTE_LIFETIME=14d +## Ratelimit + +#LOGIN_LIMIT_IP_PER_SECOND=5 +#LOGIN_LIMIT_IP_BURST=15 +#LOGIN_LIMIT_ACCOUNT_PER_SECOND=1 +#LOGIN_LIMIT_ACCOUNT_BURST=10 + ## Keycloak SSO #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml" diff --git a/abra.sh b/abra.sh index 1367097..eea2087 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ export DISCORD_BRIDGE_YAML_VERSION=v2 export ENTRYPOINT_CONF_VERSION=v1 -export HOMESERVER_YAML_VERSION=v26 +export HOMESERVER_YAML_VERSION=v27 export LOG_CONFIG_VERSION=v2 export SHARED_SECRET_AUTH_VERSION=v1 export SIGNAL_BRIDGE_YAML_VERSION=v4 diff --git a/compose.yml b/compose.yml index e815242..f3cf793 100644 --- a/compose.yml +++ b/compose.yml @@ -27,7 +27,7 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=5.0.3+v1.100.0" + - "coop-cloud.${STACK_NAME}.version=5.0.4+v1.100.0" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" healthcheck: test: curl -f http://synapse:8008/health || exit 1 @@ -72,6 +72,10 @@ services: - USER_IPS_MAX_AGE - VIRTUAL_HOST=${DOMAIN} - VIRTUAL_PORT=8008 + - LOGIN_LIMIT_IP_PER_SECOND=${LOGIN_LIMIT_IP_PER_SECOND:-0.003} + - LOGIN_LIMIT_IP_BURST=${LOGIN_LIMIT_IP_BURST:-5} + - LOGIN_LIMIT_ACCOUNT_PER_SECOND=${LOGIN_LIMIT_ACCOUNT_PER_SECOND:-0.003} + - LOGIN_LIMIT_ACCOUNT_BURST=${LOGIN_LIMIT_ACCOUNT_BURST:-5} networks: - internal entrypoint: /docker-entrypoint.sh diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl index 45dc224..d3ad0d5 100644 --- a/homeserver.yaml.tmpl +++ b/homeserver.yaml.tmpl @@ -267,3 +267,12 @@ forget_rooms_on_leave: true # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#opentracing-1 opentracing: enabled: false + +# https://matrix-org.github.io/synapse/develop/usage/configuration/config_documentation.html#ratelimiting +rc_login: + address: + per_second: {{ env "LOGIN_LIMIT_IP_PER_SECOND" }} + burst_count: {{ env "LOGIN_LIMIT_IP_BURST" }} + account: + per_second: {{ env "LOGIN_LIMIT_ACCOUNT_PER_SECOND" }} + burst_count: {{ env "LOGIN_LIMIT_ACCOUNT_BURST" }} diff --git a/release/next b/release/5.0.4+v1.100.0 similarity index 100% rename from release/next rename to release/5.0.4+v1.100.0