feat: API标准化认证方案 (closed #2370)

TencentBlueKing · Aug 12, 2024 · d6ce079 · d6ce079
1 parent 56cd18a
commit d6ce079
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 3 deletions.
diff --git a/common/api/base.py b/common/api/base.py
@@ -436,6 +436,9 @@ def _send(self, params: Dict, headers: Dict, use_admin: bool = False):
             auth_value = params.get(auth_key)
             if auth_value:
                 api_auth_params[auth_key] = auth_value
+                if not settings.BKAPP_LEGACY_AUTH:
+                    # 未开启情况下删除请求参数中的验证信息
+                    params.pop(auth_key)
         session.headers.update({"X-Bkapi-Authorization": get_request_api_headers(api_auth_params)})
 
         url = self.build_actual_url(params)

diff --git a/common/context_processors.py b/common/context_processors.py
@@ -42,7 +42,7 @@ def get_docs_center_url():
 
 
 def get_title():
-    return _("节点管理 | 腾讯蓝鲸智云")
+    return _("节点管理 | 蓝鲸智云")
 
 
 @FuncCacheDecorator(cache_time=60 * constants.TimeUnit.SECOND)

diff --git a/config/default.py b/config/default.py
@@ -362,6 +362,7 @@
 SCRIPT_HOOKS = env.BKAPP_SCRIPT_HOOKS
 
 BKPAAS_SHARED_RES_URL = env.BKPAAS_SHARED_RES_URL
+BKAPP_LEGACY_AUTH = env.BKAPP_LEGACY_AUTH
 
 # 敏感参数
 SENSITIVE_PARAMS = ["app_code", "app_secret", "bk_app_code", "bk_app_secret", "auth_info"]

diff --git a/env/__init__.py b/env/__init__.py
@@ -63,6 +63,7 @@
     # Agent安装前置脚本
     "BKAPP_SCRIPT_HOOKS",
     "BKPAAS_SHARED_RES_URL",
+    "BKAPP_LEGACY_AUTH",
 ]
 
 # ===============================================================================
@@ -186,3 +187,4 @@
 
 BK_DOCS_CENTER_HOST = get_type_env(key="BK_DOCS_CENTER_HOST", default="", _type=str)
 BKPAAS_SHARED_RES_URL = get_type_env(key="BKPAAS_SHARED_RES_URL", default="", _type=str)
+BKAPP_LEGACY_AUTH = get_type_env(key="BKAPP_LEGACY_AUTH", default=False, _type=bool)
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
@@ -5842,7 +5842,7 @@ msgid "标准运维"
 msgstr "BK-SOPS"
 
 #: common/context_processors.py:44
-msgid "节点管理 | 腾讯蓝鲸智云"
+msgid "节点管理 | 蓝鲸智云"
 msgstr "NodeMan | Tencent Blueking"
 
 #: pipeline/component_framework/models.py:42

diff --git a/support-files/bkiam/0003_bk_nodeman_20200811-1145_iam.json b/support-files/bkiam/0003_bk_nodeman_20200811-1145_iam.json
@@ -6,7 +6,7 @@
             "data": {
                 "id": "bk_nodeman",
                 "name": "节点管理",
-                "name_en": "nodeman",
+                "name_en": "Nodeman",
                 "description": "",
                 "description_en": "",
                 "clients": "bk_nodeman,bk_bknodeman",

diff --git a/support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml b/support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml
@@ -129,3 +129,4 @@ data:
 
   BKAPP_SCRIPT_HOOKS: "{{ .Values.config.bkAppScriptHooks }}"
   BKPAAS_SHARED_RES_URL: "{{ .Values.bkSharedResUrl }}"
+  BKAPP_LEGACY_AUTH: "{{ .Values.config.bkAppLegacyAuth }}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -129,3 +129,4 @@ data:

		BKAPP_SCRIPT_HOOKS: "{{ .Values.config.bkAppScriptHooks }}"
		BKPAAS_SHARED_RES_URL: "{{ .Values.bkSharedResUrl }}"
		BKAPP_LEGACY_AUTH: "{{ .Values.config.bkAppLegacyAuth }}"