Fix:update blue-krill version (TencentBlueKing#634)

SheepSheepChen · Aug 17, 2023 · d66b8be · d66b8be
1 parent d9b6a4a
commit d66b8be
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/apiserver/paasng/conf.yaml.tpl b/apiserver/paasng/conf.yaml.tpl
@@ -3,8 +3,8 @@
 ## 用于加密数据库内容的 Secret
 # BKKRILL_ENCRYPT_SECRET_KEY: ''
 
-## 选择加密数据库内容的算法，可选择：'FernetCipher' , 'SM4CTR'
-# ENCRYPT_CIPHER_TYPE : ''
+## 选择加密数据库内容的算法，可选择：'SHANGMI' , 'CLASSIC'，分别对应 'SM4CTR'和'Fernet' 算法
+# BK_CRYPTO_TYPE : ''
 
 ## （Django）特定 Django 安装的密钥。用于提供 加密签名，默认值为：${BKKRILL_ENCRYPT_SECRET_KEY}
 ## 更多参考：https://docs.djangoproject.com/zh-hans/3.2/ref/settings/#secret-key

diff --git a/apiserver/paasng/paasng/engine/configurations/config_var.py b/apiserver/paasng/paasng/engine/configurations/config_var.py
@@ -160,6 +160,7 @@ def generate_env_vars_for_bk_platform(config_vars_prefix: str) -> Dict[str, str]
     """Generate the platform address in the bk system"""
 
     system_envs = {
+        'BK_CRYPTO_TYPE': settings.BK_CRYPTO_TYPE,
         'BK_DOMAIN': settings.BK_DOMAIN,
         'URL': settings.BKPAAS_URL,
         # 蓝鲸桌面地址

diff --git a/apiserver/paasng/paasng/settings/__init__.py b/apiserver/paasng/paasng/settings/__init__.py
@@ -89,8 +89,9 @@
 # Django 项目使用的 SECRET_KEY，如未配置，使用 BKKRILL 的 secret key 替代
 SECRET_KEY = settings.get("SECRET_KEY") or force_str(BKKRILL_ENCRYPT_SECRET_KEY)
 
-# 选择加密数据库内容的算法，可选择：'FernetCipher' , 'SM4CTR'
-ENCRYPT_CIPHER_TYPE = settings.get('ENCRYPT_CIPHER_TYPE', 'FernetCipher')
+# 选择加密数据库内容的算法，可选择：'SHANGMI' , 'CLASSIC'
+BK_CRYPTO_TYPE = settings.get('BK_CRYPTO_TYPE', 'CLASSIC')
+ENCRYPT_CIPHER_TYPE = 'SM4CTR' if BK_CRYPTO_TYPE == 'SHANGMI' else 'FernetCipher'
 
 DEBUG = settings.get('DEBUG', False)
 

diff --git a/apiserver/poetry.lock b/apiserver/poetry.lock
diff --git a/apiserver/pyproject.toml b/apiserver/pyproject.toml
@@ -16,7 +16,7 @@ bkpaas-auth = "==2.0.6"
 apigw-manager = {version = ">=1.0.14"}
 bkstorages = {version = "==1.0.8"}
 bleach = "==2.0.0"
-blue-krill = {version = "==2.0.1"}
+blue-krill = {version = "==2.0.2"}
 bkapi-component-open = {version = ">=1.0.0"}
 boto = "==2.43.0"
 boto3 = "<1.15.0"