From 6ffc0b3b2e93e2eec9959be474d991fc38928968 Mon Sep 17 00:00:00 2001 From: schnee Date: Tue, 19 Sep 2023 11:55:45 +0800 Subject: [PATCH] feat: add LocalDataSourceIdentityInfoInitializer --- .../bkuser/apps/data_source/initializers.py | 96 ++++++++++++++ src/bk-user/bkuser/apps/sync/handlers.py | 7 + src/bk-user/bkuser/apps/sync/managers.py | 4 +- ...917_2026.py => 0003_auto_20230919_0959.py} | 31 +++-- src/bk-user/bkuser/apps/sync/models.py | 12 +- src/bk-user/bkuser/apps/sync/runners.py | 40 +++++- .../apis/web/data_source/test_data_source.py | 115 +---------------- src/bk-user/tests/apps/sync/conftest.py | 5 +- src/bk-user/tests/conftest.py | 7 +- src/bk-user/tests/fixtures/data_source.py | 120 +++++++++++++++++- 10 files changed, 291 insertions(+), 146 deletions(-) create mode 100644 src/bk-user/bkuser/apps/data_source/initializers.py rename src/bk-user/bkuser/apps/sync/migrations/{0003_auto_20230917_2026.py => 0003_auto_20230919_0959.py} (53%) diff --git a/src/bk-user/bkuser/apps/data_source/initializers.py b/src/bk-user/bkuser/apps/data_source/initializers.py new file mode 100644 index 000000000..998b03bba --- /dev/null +++ b/src/bk-user/bkuser/apps/data_source/initializers.py @@ -0,0 +1,96 @@ +# -*- coding: utf-8 -*- +""" +TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-用户管理(Bk-User) available. +Copyright (C) 2017-2021 THL A29 Limited, a Tencent company. All rights reserved. +Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. +You may obtain a copy of the License at http://opensource.org/licenses/MIT +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. +""" +import datetime + +from django.utils import timezone + +from bkuser.apps.data_source.models import DataSource, DataSourceUser, LocalDataSourceIdentityInfo +from bkuser.common.passwd import PasswordGenerator +from bkuser.plugins.local.constants import PasswordGenerateMethod +from bkuser.plugins.local.models import LocalDataSourcePluginConfig + + +class PasswordProvider: + """本地数据源用户密码""" + + def __init__(self, plugin_cfg: LocalDataSourcePluginConfig): + # assert for mypy type linter + assert plugin_cfg.password_rule is not None + assert plugin_cfg.password_initial is not None + + self.generate_method = plugin_cfg.password_initial.generate_method + self.fixed_password = plugin_cfg.password_initial.fixed_password + self.password_generator = PasswordGenerator(plugin_cfg.password_rule.to_rule()) + + def generate(self) -> str: + if self.generate_method == PasswordGenerateMethod.FIXED and self.fixed_password: + return self.fixed_password + + return self.password_generator.generate() + + +class LocalDataSourceIdentityInfoInitializer: + """本地数据源用户身份数据初始化""" + + BATCH_SIZE = 250 + + def __init__(self, data_source: DataSource): + self.data_source = data_source + self.plugin_cfg = LocalDataSourcePluginConfig(**data_source.plugin_config) + self.password_provider = PasswordProvider(self.plugin_cfg) + + def initialize(self) -> None: + if self._can_skip_initialize(): + return + + self._init_users_identity_info() + + def _can_skip_initialize(self): + """预先判断能否直接跳过""" + + # 不是本地数据源的，不需要初始化 + if not self.data_source.is_local: + return True + + # 是本地数据源，但是没开启账密登录的，不需要初始化 + if not self.plugin_cfg.enable_account_password_login: + return True + + return False + + def _init_users_identity_info(self): + exists_infos = LocalDataSourceIdentityInfo.objects.filter(data_source=self.data_source) + exists_info_user_ids = exists_infos.objects.values_list("user_id", flat=True) + # NOTE：已经存在的账密信息，不会按照最新规则重新生成！ + waiting_init_users = DataSourceUser.objects.filter( + data_source=self.data_source, + ).exclude(id__in=exists_info_user_ids) + + time_now = timezone.now() + expired_at = self._get_password_expired_at(time_now) + + waiting_create_infos = [ + LocalDataSourceIdentityInfo( + user=user, + password=self.password_provider.generate(), + password_updated_at=time_now, + password_expired_at=expired_at, + data_source=self.data_source, + username=user.username, + created_at=time_now, + updated_at=time_now, + ) + for user in waiting_init_users + ] + LocalDataSourceIdentityInfo.objects.bulk_create(waiting_create_infos, batch_size=self.BATCH_SIZE) + + def _get_password_expired_at(self, now: datetime.datetime) -> datetime.datetime: + return now + datetime.timedelta(days=self.plugin_cfg.password_rule.valid_time) # type: ignore diff --git a/src/bk-user/bkuser/apps/sync/handlers.py b/src/bk-user/bkuser/apps/sync/handlers.py index b0af75df3..0c9fbf420 100644 --- a/src/bk-user/bkuser/apps/sync/handlers.py +++ b/src/bk-user/bkuser/apps/sync/handlers.py @@ -10,12 +10,19 @@ """ from django.dispatch import receiver +from bkuser.apps.data_source.initializers import LocalDataSourceIdentityInfoInitializer from bkuser.apps.data_source.models import DataSource from bkuser.apps.sync.data_models import TenantSyncOptions from bkuser.apps.sync.managers import TenantSyncManager from bkuser.apps.sync.signals import post_sync_data_source +@receiver(post_sync_data_source) +def initialize_local_data_source_identity_info(sender, data_source: DataSource, **kwargs): + """在完成数据源同步后，需要对本地数据源的用户账密信息做初始化""" + LocalDataSourceIdentityInfoInitializer(data_source).initialize() + + @receiver(post_sync_data_source) def sync_tenant_departments_users(sender, data_source: DataSource, **kwargs): """同步租户数据（部门 & 用户）""" diff --git a/src/bk-user/bkuser/apps/sync/managers.py b/src/bk-user/bkuser/apps/sync/managers.py index d853ea014..d9b5041c8 100644 --- a/src/bk-user/bkuser/apps/sync/managers.py +++ b/src/bk-user/bkuser/apps/sync/managers.py @@ -36,7 +36,7 @@ def execute(self, context: Optional[Dict[str, Any]] = None) -> DataSourceSyncTas status=SyncTaskStatus.PENDING, trigger=self.sync_options.trigger, operator=self.sync_options.operator, - start_time=timezone.now(), + start_at=timezone.now(), extra={ "overwrite": self.sync_options.overwrite, "async_run": self.sync_options.async_run, @@ -78,7 +78,7 @@ def execute(self) -> TenantSyncTask: status=SyncTaskStatus.PENDING, trigger=self.sync_options.trigger, operator=self.sync_options.operator, - start_time=timezone.now(), + start_at=timezone.now(), extra={"async_run": self.sync_options.async_run}, ) diff --git a/src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230917_2026.py b/src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230919_0959.py similarity index 53% rename from src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230917_2026.py rename to src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230919_0959.py index cc5a7313d..166e2ed9d 100644 --- a/src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230917_2026.py +++ b/src/bk-user/bkuser/apps/sync/migrations/0003_auto_20230919_0959.py @@ -1,7 +1,8 @@ -# Generated by Django 3.2.20 on 2023-09-17 12:26 +# Generated by Django 3.2.20 on 2023-09-19 01:59 import datetime from django.db import migrations, models +import django.utils.timezone class Migration(migrations.Migration): @@ -11,24 +12,34 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AlterField( + migrations.RemoveField( model_name='datasourcesynctask', - name='duration', - field=models.DurationField(default=datetime.timedelta(0), verbose_name='任务持续时间'), + name='start_time', ), - migrations.AlterField( - model_name='datasourcesynctask', + migrations.RemoveField( + model_name='tenantsynctask', name='start_time', - field=models.DateTimeField(auto_now_add=True, verbose_name='任务开始时间'), ), - migrations.AlterField( + migrations.AddField( + model_name='datasourcesynctask', + name='start_at', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='任务开始时间'), + preserve_default=False, + ), + migrations.AddField( model_name='tenantsynctask', + name='start_at', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='任务开始时间'), + preserve_default=False, + ), + migrations.AlterField( + model_name='datasourcesynctask', name='duration', field=models.DurationField(default=datetime.timedelta(0), verbose_name='任务持续时间'), ), migrations.AlterField( model_name='tenantsynctask', - name='start_time', - field=models.DateTimeField(auto_now_add=True, verbose_name='任务开始时间'), + name='duration', + field=models.DurationField(default=datetime.timedelta(0), verbose_name='任务持续时间'), ), ] diff --git a/src/bk-user/bkuser/apps/sync/models.py b/src/bk-user/bkuser/apps/sync/models.py index 4a09c2e2d..440020543 100644 --- a/src/bk-user/bkuser/apps/sync/models.py +++ b/src/bk-user/bkuser/apps/sync/models.py @@ -32,14 +32,14 @@ class DataSourceSyncTask(TimestampedModel): status = models.CharField("任务总状态", choices=SyncTaskStatus.get_choices(), max_length=32) trigger = models.CharField("触发方式", choices=SyncTaskTrigger.get_choices(), max_length=32) operator = models.CharField("操作人", null=True, blank=True, default="", max_length=128) - start_time = models.DateTimeField("任务开始时间", auto_now_add=True) + start_at = models.DateTimeField("任务开始时间", auto_now_add=True) duration = models.DurationField("任务持续时间", default=timedelta(seconds=0)) extra = models.JSONField("扩展信息", default=dict) @property def summary(self): - # TODO 支持获取任务总结 - return "TODO" + # TODO (su) 支持获取任务总结 + return "数据同步成功" if self.status == SyncTaskStatus.SUCCESS else "数据同步失败" class DataSourceSyncStep(TimestampedModel): @@ -92,14 +92,14 @@ class TenantSyncTask(TimestampedModel): status = models.CharField("任务总状态", choices=SyncTaskStatus.get_choices(), max_length=32) trigger = models.CharField("触发方式", choices=SyncTaskTrigger.get_choices(), max_length=32) operator = models.CharField("操作人", null=True, blank=True, default="", max_length=128) - start_time = models.DateTimeField("任务开始时间", auto_now_add=True) + start_at = models.DateTimeField("任务开始时间", auto_now_add=True) duration = models.DurationField("任务持续时间", default=timedelta(seconds=0)) extra = models.JSONField("扩展信息", default=dict) @property def summary(self): - # TODO 支持获取任务总结 - return "TODO" + # TODO (su) 支持获取任务总结 + return "数据同步成功" if self.status == SyncTaskStatus.SUCCESS else "数据同步失败" class TenantSyncStep(TimestampedModel): diff --git a/src/bk-user/bkuser/apps/sync/runners.py b/src/bk-user/bkuser/apps/sync/runners.py index 7814642f6..a412d5a47 100644 --- a/src/bk-user/bkuser/apps/sync/runners.py +++ b/src/bk-user/bkuser/apps/sync/runners.py @@ -11,8 +11,10 @@ from typing import Any, Dict from django.db import transaction +from django.utils import timezone from bkuser.apps.data_source.models import DataSource +from bkuser.apps.sync.constants import SyncTaskStatus from bkuser.apps.sync.models import DataSourceSyncTask, TenantSyncTask from bkuser.apps.sync.signals import post_sync_data_source from bkuser.apps.sync.syncers import ( @@ -32,7 +34,7 @@ class DataSourceSyncTaskRunner: """ 数据源同步任务执行器 - FIXME (su) 1. 同步异常处理，2. Task 状态更新，3. 后续支持软删除后，需要重构同步逻辑 + FIXME (su) 1. 细化同步异常处理，2. 后续支持软删除后，需要重构同步逻辑 """ def __init__(self, task: DataSourceSyncTask, context: Dict[str, Any]): @@ -44,9 +46,15 @@ def __init__(self, task: DataSourceSyncTask, context: Dict[str, Any]): def run(self): with transaction.atomic(): - self._sync_departments() - self._sync_users() - self._send_signal() + try: + self._sync_departments() + self._sync_users() + self._send_signal() + except Exception: + self._update_task_status(SyncTaskStatus.FAILED) + raise + + self._update_task_status(SyncTaskStatus.SUCCESS) def _initial_plugin(self): """初始化数据源插件""" @@ -72,12 +80,18 @@ def _send_signal(self): """发送数据源同步完成信号，触发后续流程""" post_sync_data_source.send(sender=self.__class__, data_source=self.data_source) + def _update_task_status(self, status: SyncTaskStatus): + """任务正常完成后更新 task 状态""" + self.task.status = status + self.task.duration = timezone.now() - self.task.start_at + self.task.save(update_fields=["status", "duration", "updated_at"]) + class TenantSyncTaskRunner: """ 租户数据同步任务执行器 - FIXME (su) 1. 同步异常处理，2. Task 状态更新，3. 后续支持软删除后，需要重构同步逻辑 + FIXME (su) 1. 细化同步异常处理，2. 后续支持软删除后，需要重构同步逻辑 """ def __init__(self, task: TenantSyncTask): @@ -87,8 +101,14 @@ def __init__(self, task: TenantSyncTask): def run(self): with transaction.atomic(): - self._sync_departments() - self._sync_users() + try: + self._sync_departments() + self._sync_users() + except Exception: + self._update_task_status(SyncTaskStatus.FAILED) + raise + + self._update_task_status(SyncTaskStatus.SUCCESS) def _sync_departments(self): """同步部门信息""" @@ -97,3 +117,9 @@ def _sync_departments(self): def _sync_users(self): """同步用户信息""" TenantUserSyncer(self.task, self.data_source, self.tenant).sync() + + def _update_task_status(self, status: SyncTaskStatus): + """任务正常完成后更新 task 状态""" + self.task.status = status + self.task.duration = timezone.now() - self.task.start_at + self.task.save(update_fields=["status", "duration", "updated_at"]) diff --git a/src/bk-user/tests/apis/web/data_source/test_data_source.py b/src/bk-user/tests/apis/web/data_source/test_data_source.py index 04bdc9771..739a2e64e 100644 --- a/src/bk-user/tests/apis/web/data_source/test_data_source.py +++ b/src/bk-user/tests/apis/web/data_source/test_data_source.py @@ -8,17 +8,11 @@ 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 typing import Any, Dict import pytest from bkuser.apps.data_source.constants import DataSourceStatus -from bkuser.apps.data_source.models import DataSource, DataSourcePlugin +from bkuser.apps.data_source.models import DataSource from bkuser.plugins.constants import DataSourcePluginEnum -from bkuser.plugins.local.constants import ( - NotificationMethod, - NotificationScene, - PasswordGenerateMethod, -) from django.urls import reverse from rest_framework import status @@ -28,113 +22,6 @@ pytestmark = pytest.mark.django_db -@pytest.fixture() -def local_ds_plugin_config() -> Dict[str, Any]: - return { - "enable_account_password_login": True, - "password_rule": { - "min_length": 12, - "contain_lowercase": True, - "contain_uppercase": True, - "contain_digit": True, - "contain_punctuation": True, - "not_continuous_count": 5, - "not_keyboard_order": True, - "not_continuous_letter": True, - "not_continuous_digit": True, - "not_repeated_symbol": True, - "valid_time": 7, - "max_retries": 3, - "lock_time": 3600, - }, - "password_initial": { - "force_change_at_first_login": True, - "cannot_use_previous_password": True, - "reserved_previous_password_count": 3, - "generate_method": PasswordGenerateMethod.RANDOM, - "fixed_password": None, - "notification": { - "enabled_methods": [NotificationMethod.EMAIL, NotificationMethod.SMS], - "templates": [ - { - "method": NotificationMethod.EMAIL, - "scene": NotificationScene.USER_INITIALIZE, - "title": "您的账户已经成功创建", - "sender": "蓝鲸智云", - "content": "您的账户已经成功创建，请尽快修改密码", - "content_html": "

您的账户已经成功创建，请尽快修改密码

", - }, - { - "method": NotificationMethod.EMAIL, - "scene": NotificationScene.RESET_PASSWORD, - "title": "登录密码重置", - "sender": "蓝鲸智云", - "content": "点击以下链接以重置代码", - "content_html": "

点击以下链接以重置代码

", - }, - { - "method": NotificationMethod.SMS, - "scene": NotificationScene.USER_INITIALIZE, - "sender": "蓝鲸智云", - "content": "您的账户已经成功创建，请尽快修改密码", - "content_html": "

您的账户已经成功创建，请尽快修改密码

", - }, - { - "method": NotificationMethod.SMS, - "scene": NotificationScene.RESET_PASSWORD, - "sender": "蓝鲸智云", - "content": "点击以下链接以重置代码", - "content_html": "

点击以下链接以重置代码

", - }, - ], - }, - }, - "password_expire": { - "remind_before_expire": [1, 7], - "notification": { - "enabled_methods": [NotificationMethod.EMAIL, NotificationMethod.SMS], - "templates": [ - { - "method": NotificationMethod.EMAIL, - "scene": NotificationScene.PASSWORD_EXPIRING, - "title": "【蓝鲸智云】密码即将到期提醒！", - "sender": "蓝鲸智云", - "content": "您的密码即将到期！", - "content_html": "

您的密码即将到期！

", - }, - { - "method": NotificationMethod.EMAIL, - "scene": NotificationScene.PASSWORD_EXPIRED, - "title": "【蓝鲸智云】密码到期提醒！", - "sender": "蓝鲸智云", - "content": "点击以下链接以重置代码", - "content_html": "

您的密码已到期！

", - }, - { - "method": NotificationMethod.SMS, - "scene": NotificationScene.PASSWORD_EXPIRING, - "sender": "蓝鲸智云", - "content": "您的密码即将到期！", - "content_html": "

您的密码即将到期！

", - }, - { - "method": NotificationMethod.SMS, - "scene": NotificationScene.PASSWORD_EXPIRED, - "sender": "蓝鲸智云", - "content": "您的密码已到期！", - "content_html": "

您的密码已到期！

", - }, - ], - }, - }, - } - - -@pytest.fixture() -def local_ds_plugin() -> DataSourcePlugin: - return DataSourcePlugin.objects.get(id=DataSourcePluginEnum.LOCAL) - - @pytest.fixture() def data_source(request, local_ds_plugin, local_ds_plugin_config): # 支持检查是否使用 random_tenant fixture 以生成不属于默认租户的数据源 diff --git a/src/bk-user/tests/apps/sync/conftest.py b/src/bk-user/tests/apps/sync/conftest.py index 4bedef1cf..3d7d68783 100644 --- a/src/bk-user/tests/apps/sync/conftest.py +++ b/src/bk-user/tests/apps/sync/conftest.py @@ -15,6 +15,7 @@ from bkuser.apps.sync.models import DataSourceSyncTask, TenantSyncTask from bkuser.plugins.models import RawDataSourceDepartment, RawDataSourceUser from django.utils import timezone + from tests.test_utils.helpers import generate_random_string @@ -26,7 +27,7 @@ def data_source_sync_task(bare_local_data_source) -> DataSourceSyncTask: status=SyncTaskStatus.PENDING, trigger=SyncTaskTrigger.MANUAL, operator="admin", - start_time=timezone.now(), + start_at=timezone.now(), extra={"overwrite": True, "async_run": False}, ) @@ -40,7 +41,7 @@ def tenant_sync_task(bare_local_data_source, default_tenant) -> TenantSyncTask: status=SyncTaskStatus.PENDING, trigger=SyncTaskTrigger.MANUAL, operator="admin", - start_time=timezone.now(), + start_at=timezone.now(), extra={"async_run": False}, ) diff --git a/src/bk-user/tests/conftest.py b/src/bk-user/tests/conftest.py index b7d2d85f9..dc814c0ef 100644 --- a/src/bk-user/tests/conftest.py +++ b/src/bk-user/tests/conftest.py @@ -12,7 +12,12 @@ from bkuser.apps.tenant.models import Tenant from bkuser.auth.models import User -from tests.fixtures.data_source import bare_local_data_source, full_local_data_source # noqa: F401 +from tests.fixtures.data_source import ( # noqa: F401 + bare_local_data_source, + full_local_data_source, + local_ds_plugin, + local_ds_plugin_config, +) from tests.fixtures.tenant import tenant_user_custom_fields # noqa: F401 from tests.test_utils.auth import create_user from tests.test_utils.helpers import generate_random_string diff --git a/src/bk-user/tests/fixtures/data_source.py b/src/bk-user/tests/fixtures/data_source.py index f38bbad5b..492800ecf 100644 --- a/src/bk-user/tests/fixtures/data_source.py +++ b/src/bk-user/tests/fixtures/data_source.py @@ -8,6 +8,8 @@ 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 typing import Any, Dict + import pytest from bkuser.apps.data_source.models import ( DataSource, @@ -19,29 +21,139 @@ DataSourceUserLeaderRelation, ) from bkuser.plugins.constants import DataSourcePluginEnum +from bkuser.plugins.local.constants import NotificationMethod, NotificationScene, PasswordGenerateMethod from tests.test_utils.helpers import generate_random_string from tests.test_utils.tenant import DEFAULT_TENANT @pytest.fixture() -def bare_local_data_source() -> DataSource: +def local_ds_plugin_config() -> Dict[str, Any]: + return { + "enable_account_password_login": True, + "password_rule": { + "min_length": 12, + "contain_lowercase": True, + "contain_uppercase": True, + "contain_digit": True, + "contain_punctuation": True, + "not_continuous_count": 5, + "not_keyboard_order": True, + "not_continuous_letter": True, + "not_continuous_digit": True, + "not_repeated_symbol": True, + "valid_time": 7, + "max_retries": 3, + "lock_time": 3600, + }, + "password_initial": { + "force_change_at_first_login": True, + "cannot_use_previous_password": True, + "reserved_previous_password_count": 3, + "generate_method": PasswordGenerateMethod.RANDOM, + "fixed_password": None, + "notification": { + "enabled_methods": [NotificationMethod.EMAIL, NotificationMethod.SMS], + "templates": [ + { + "method": NotificationMethod.EMAIL, + "scene": NotificationScene.USER_INITIALIZE, + "title": "您的账户已经成功创建", + "sender": "蓝鲸智云", + "content": "您的账户已经成功创建，请尽快修改密码", + "content_html": "

您的账户已经成功创建，请尽快修改密码

", + }, + { + "method": NotificationMethod.EMAIL, + "scene": NotificationScene.RESET_PASSWORD, + "title": "登录密码重置", + "sender": "蓝鲸智云", + "content": "点击以下链接以重置代码", + "content_html": "

点击以下链接以重置代码

", + }, + { + "method": NotificationMethod.SMS, + "scene": NotificationScene.USER_INITIALIZE, + "sender": "蓝鲸智云", + "content": "您的账户已经成功创建，请尽快修改密码", + "content_html": "

您的账户已经成功创建，请尽快修改密码

", + }, + { + "method": NotificationMethod.SMS, + "scene": NotificationScene.RESET_PASSWORD, + "sender": "蓝鲸智云", + "content": "点击以下链接以重置代码", + "content_html": "

点击以下链接以重置代码

", + }, + ], + }, + }, + "password_expire": { + "remind_before_expire": [1, 7], + "notification": { + "enabled_methods": [NotificationMethod.EMAIL, NotificationMethod.SMS], + "templates": [ + { + "method": NotificationMethod.EMAIL, + "scene": NotificationScene.PASSWORD_EXPIRING, + "title": "【蓝鲸智云】密码即将到期提醒！", + "sender": "蓝鲸智云", + "content": "您的密码即将到期！", + "content_html": "

您的密码即将到期！

", + }, + { + "method": NotificationMethod.EMAIL, + "scene": NotificationScene.PASSWORD_EXPIRED, + "title": "【蓝鲸智云】密码到期提醒！", + "sender": "蓝鲸智云", + "content": "点击以下链接以重置代码", + "content_html": "

您的密码已到期！

", + }, + { + "method": NotificationMethod.SMS, + "scene": NotificationScene.PASSWORD_EXPIRING, + "sender": "蓝鲸智云", + "content": "您的密码即将到期！", + "content_html": "

您的密码即将到期！

", + }, + { + "method": NotificationMethod.SMS, + "scene": NotificationScene.PASSWORD_EXPIRED, + "sender": "蓝鲸智云", + "content": "您的密码已到期！", + "content_html": "

您的密码已到期！

", + }, + ], + }, + }, + } + + +@pytest.fixture() +def local_ds_plugin() -> DataSourcePlugin: + return DataSourcePlugin.objects.get(id=DataSourcePluginEnum.LOCAL) + + +@pytest.fixture() +def bare_local_data_source(local_ds_plugin_config, local_ds_plugin) -> DataSource: """裸本地数据源（没有用户，部门等数据）""" return DataSource.objects.create( name=generate_random_string(), owner_tenant_id=DEFAULT_TENANT, - plugin=DataSourcePlugin.objects.get(id=DataSourcePluginEnum.LOCAL.value), + plugin=local_ds_plugin, + plugin_config=local_ds_plugin_config, ) @pytest.fixture() -def full_local_data_source() -> DataSource: +def full_local_data_source(local_ds_plugin_config, local_ds_plugin) -> DataSource: """携带用户，部门信息的本地数据源""" # 数据源 ds = DataSource.objects.create( name=generate_random_string(), owner_tenant_id=DEFAULT_TENANT, - plugin=DataSourcePlugin.objects.get(id=DataSourcePluginEnum.LOCAL.value), + plugin=local_ds_plugin, + plugin_config=local_ds_plugin_config, ) # 数据源用户