mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-03 00:15:20 +00:00
Config (#3502)
* [Update] 修改config * [Update] 移动存储设置到到terminal中 * [Update] 修改permission 查看 * [Update] pre merge * [Update] 录像存储 * [Update] 命令存储 * [Update] 添加存储测试可连接性 * [Update] 修改 meta 值的 key 为大写 * [Update] 修改 Terminal 相关 Storage 配置 * [Update] 删除之前获取录像/命令存储的代码 * [Update] 修改导入失败 * [Update] 迁移文件添加default存储 * [Update] 删除之前代码,添加help_text信息 * [Update] 删除之前代码 * [Update] 删除之前代码 * [Update] 抽象命令/录像存储 APIView * [Update] 抽象命令/录像存储 APIView 1 * [Update] 抽象命令/录像存储 DictField * [Update] 抽象命令/录像存储列表页面 * [Update] 修复CustomDictField的bug * [Update] RemoteApp 页面添加 hidden * [Update] 用户页面添加用户关联授权 * [Update] 修改存储测试可连接性 target * [Update] 修改配置 * [Update] 修改存储前端 Form 渲染逻辑 * [Update] 修改存储细节 * [Update] 统一存储类型到 const 文件 * [Update] 修改迁移文件及Model,创建默认存储 * [Update] 修改迁移文件及Model初始化默认数据 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 修改迁移文件 * [Update] 限制删除默认存储配置,只允许创建扩展的存储类型 * [Update] 修改ip字段长度 * [Update] 修改ip字段长度 * [Update] 修改一些css * [Update] 修改关联 * [Update] 添加操作日志定时清理 * [Update] 修改记录syslog的instance encoder * [Update] 忽略登录产生的操作日志 * [Update] 限制更新存储时不覆盖原有AK SK 等字段 * [Update] 修改迁移文件添加comment字段 * [Update] 修改迁移文件 * [Update] 添加 comment 字段 * [Update] 修改默认存储no -> null * [Update] 修改细节 * [Update] 更新翻译(存储配置 * [Update] 修改定时任务注册,修改系统用户资产、节点关系api * [Update] 添加监控磁盘任务 * [Update] 修改session * [Update] 拆分serializer * [Update] 还原setting原来的manager
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
import json
|
||||
|
||||
from django.db import models
|
||||
from django.core.cache import cache
|
||||
from django.db.utils import ProgrammingError, OperationalError
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
|
||||
from common.utils import get_signer
|
||||
|
||||
@@ -34,12 +33,28 @@ class Setting(models.Model):
|
||||
comment = models.TextField(verbose_name=_("Comment"))
|
||||
|
||||
objects = SettingManager()
|
||||
cache_key_prefix = '_SETTING_'
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def __getattr__(self, item):
|
||||
return cache.get(item)
|
||||
@classmethod
|
||||
def get(cls, item):
|
||||
cached = cls.get_from_cache(item)
|
||||
if cached is not None:
|
||||
return cached
|
||||
instances = cls.objects.filter(name=item)
|
||||
if len(instances) == 1:
|
||||
s = instances[0]
|
||||
s.refresh_setting()
|
||||
return s.cleaned_value
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def get_from_cache(cls, item):
|
||||
key = cls.cache_key_prefix + item
|
||||
cached = cache.get(key)
|
||||
return cached
|
||||
|
||||
@property
|
||||
def cleaned_value(self):
|
||||
@@ -64,44 +79,6 @@ class Setting(models.Model):
|
||||
except json.JSONDecodeError as e:
|
||||
raise ValueError("Json dump error: {}".format(str(e)))
|
||||
|
||||
@classmethod
|
||||
def save_storage(cls, name, data):
|
||||
"""
|
||||
:param name: TERMINAL_REPLAY_STORAGE or TERMINAL_COMMAND_STORAGE
|
||||
:param data: {}
|
||||
:return: Setting object
|
||||
"""
|
||||
obj = cls.objects.filter(name=name).first()
|
||||
if not obj:
|
||||
obj = cls()
|
||||
obj.name = name
|
||||
obj.encrypted = True
|
||||
obj.cleaned_value = data
|
||||
else:
|
||||
value = obj.cleaned_value
|
||||
if value is None:
|
||||
value = {}
|
||||
value.update(data)
|
||||
obj.cleaned_value = value
|
||||
obj.save()
|
||||
return obj
|
||||
|
||||
@classmethod
|
||||
def delete_storage(cls, name, storage_name):
|
||||
"""
|
||||
:param name: TERMINAL_REPLAY_STORAGE or TERMINAL_COMMAND_STORAGE
|
||||
:param storage_name: ""
|
||||
:return: bool
|
||||
"""
|
||||
obj = cls.objects.filter(name=name).first()
|
||||
if not obj:
|
||||
return False
|
||||
value = obj.cleaned_value
|
||||
value.pop(storage_name, '')
|
||||
obj.cleaned_value = value
|
||||
obj.save()
|
||||
return True
|
||||
|
||||
@classmethod
|
||||
def refresh_all_settings(cls):
|
||||
try:
|
||||
@@ -112,16 +89,8 @@ class Setting(models.Model):
|
||||
pass
|
||||
|
||||
def refresh_setting(self):
|
||||
setattr(settings, self.name, self.cleaned_value)
|
||||
if self.name == "AUTH_LDAP":
|
||||
if self.cleaned_value and settings.AUTH_LDAP_BACKEND not in settings.AUTHENTICATION_BACKENDS:
|
||||
old_setting = settings.AUTHENTICATION_BACKENDS
|
||||
old_setting.insert(0, settings.AUTH_LDAP_BACKEND)
|
||||
settings.AUTHENTICATION_BACKENDS = old_setting
|
||||
elif not self.cleaned_value and settings.AUTH_LDAP_BACKEND in settings.AUTHENTICATION_BACKENDS:
|
||||
old_setting = settings.AUTHENTICATION_BACKENDS
|
||||
old_setting.remove(settings.AUTH_LDAP_BACKEND)
|
||||
settings.AUTHENTICATION_BACKENDS = old_setting
|
||||
key = self.cache_key_prefix + self.name
|
||||
cache.set(key, self.cleaned_value, None)
|
||||
|
||||
class Meta:
|
||||
db_table = "settings_setting"
|
||||
|
Reference in New Issue
Block a user