paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrations: Avoid triggering backend initalization in migration 0209.

Browse Source 
Fixes #13528.
The email_auth_enabled check caused all enabled backends to get
initialized, and thus if LDAP was enabled the check_ldap_config()
check would cause an error if LDAP was misconfigured
(for example missing the new settings).
This commit is contained in:
Mateusz Mandera
2019-12-13 17:57:03 +01:00
committed by Tim Abbott
parent dc4181beec
commit cd926b8aae
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/migrations/0209_user_profile_no_empty_password.py
View File

@@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_backends
from django.db import migrations from django.db import migrations
from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
from django.db.migrations.state import StateApps from django.db.migrations.state import StateApps
@@ -13,7 +12,6 @@ from django.utils.timezone import now as timezone_now
from zerver.lib.cache import cache_delete, user_profile_by_api_key_cache_key from zerver.lib.cache import cache_delete, user_profile_by_api_key_cache_key
from zerver.lib.queue import queue_json_publish from zerver.lib.queue import queue_json_publish
from zerver.lib.utils import generate_api_key from zerver.lib.utils import generate_api_key
from zproject.backends import EmailAuthBackend
from typing import Any, Set, Union from typing import Any, Set, Union
@@ -159,8 +157,7 @@ def ensure_no_empty_passwords(apps: StateApps, schema_editor: DatabaseSchemaEdit
# If Zulip's built-in password authentication is not enabled on # If Zulip's built-in password authentication is not enabled on
# the server level, then we plan to skip resetting any users' API # the server level, then we plan to skip resetting any users' API
# keys, since the bug requires EmailAuthBackend. # keys, since the bug requires EmailAuthBackend.
email_auth_enabled = any(isinstance(backend, EmailAuthBackend) email_auth_enabled = 'zproject.backends.EmailAuthBackend' in settings.AUTHENTICATION_BACKENDS
for backend in get_backends())
# A quick note: This query could in theory exclude users with # A quick note: This query could in theory exclude users with
# is_active=False, is_bot=True, or realm__deactivated=True here to # is_active=False, is_bot=True, or realm__deactivated=True here to