From 13b69d1b293e45095cc57f5a6dae6fd82221c31d Mon Sep 17 00:00:00 2001 From: alex-smile <443677891@qq.com> Date: Mon, 17 Jul 2023 15:54:47 +0800 Subject: [PATCH] =?UTF-8?q?bk=5Flogin=20is=5Flogin/get=5Fuser=20send=20hea?= =?UTF-8?q?der=20x-verified-bk-app-code=20to=20back=E2=80=A6=20(#98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bk_login is_login/get_user send header x-verified-bk-app-code to backend api * upgrade bkpaas-auth to 2.0.4 --- src/dashboard/apigateway/requirements.txt | 2 +- src/dashboard/apigateway/requirements_dev.txt | 2 +- src/dashboard/poetry.lock | 8 +++----- src/dashboard/pyproject.toml | 3 +-- .../esb/components/bk/apisv2/bk_login/get_user.py | 5 ++++- .../esb/components/bk/apisv2/bk_login/is_login.py | 5 ++++- .../bk/apisv2/bk_login/toolkit/tools.py | 15 +++++++++------ 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/dashboard/apigateway/requirements.txt b/src/dashboard/apigateway/requirements.txt index 62f69b631..6c6ac48a2 100644 --- a/src/dashboard/apigateway/requirements.txt +++ b/src/dashboard/apigateway/requirements.txt @@ -15,7 +15,7 @@ bkapi-client-core==1.1.8 ; python_full_version >= "3.6.6" and python_version < " bkapi-client-generator==0.1.28 ; python_full_version >= "3.6.6" and python_version < "3.8" bkapi-component-open==1.1.0 ; python_full_version >= "3.6.6" and python_version < "3.8" bkapi-paasv3==1.0.1 ; python_full_version >= "3.6.6" and python_version < "3.8" -bkpaas-auth==2.0.3 ; python_full_version >= "3.6.6" and python_version < "3.8" +bkpaas-auth==2.0.4 ; python_full_version >= "3.6.6" and python_version < "3.8" blue-krill==1.2.3 ; python_full_version >= "3.6.6" and python_version < "3.8" cachetools==4.2.4 ; python_full_version >= "3.6.6" and python_version < "3.8" cattrs==1.0.0 ; python_full_version >= "3.6.6" and python_full_version < "3.7.0" diff --git a/src/dashboard/apigateway/requirements_dev.txt b/src/dashboard/apigateway/requirements_dev.txt index 606ca75ee..6fad2e985 100644 --- a/src/dashboard/apigateway/requirements_dev.txt +++ b/src/dashboard/apigateway/requirements_dev.txt @@ -18,7 +18,7 @@ bkapi-client-core==1.1.8 ; python_full_version >= "3.6.6" and python_version < " bkapi-client-generator==0.1.28 ; python_full_version >= "3.6.6" and python_version < "3.8" bkapi-component-open==1.1.0 ; python_full_version >= "3.6.6" and python_version < "3.8" bkapi-paasv3==1.0.1 ; python_full_version >= "3.6.6" and python_version < "3.8" -bkpaas-auth==2.0.3 ; python_full_version >= "3.6.6" and python_version < "3.8" +bkpaas-auth==2.0.4 ; python_full_version >= "3.6.6" and python_version < "3.8" black==21.12b0 ; python_full_version >= "3.6.6" and python_version < "3.8" blue-krill==1.2.3 ; python_full_version >= "3.6.6" and python_version < "3.8" cachetools==4.2.4 ; python_full_version >= "3.6.6" and python_version < "3.8" diff --git a/src/dashboard/poetry.lock b/src/dashboard/poetry.lock index 037c760b6..9a7cdc0c1 100644 --- a/src/dashboard/poetry.lock +++ b/src/dashboard/poetry.lock @@ -240,7 +240,6 @@ reference = "tencent" name = "bk-iam" version = "1.3.4" description = "bk-iam python sdk" -category = "main" optional = false python-versions = "*" files = [ @@ -380,13 +379,12 @@ reference = "tencent" [[package]] name = "bkpaas-auth" -version = "2.0.3" +version = "2.0.4" description = "User authentication django app for blueking internal projects" optional = false python-versions = ">=3.6,<4.0" files = [ - {file = "bkpaas-auth-2.0.3.tar.gz", hash = "sha256:402ae9ebb105bbd81473c2b1828d7bb1c2748ac8e8127711f49c6a0ce32e5bb4"}, - {file = "bkpaas_auth-2.0.3-py3-none-any.whl", hash = "sha256:a78c46bc6edf91426282fe93ad075bc7fa8aa3d2a819994a24b56dd4f424c835"}, + {file = "bkpaas-auth-2.0.4.tar.gz", hash = "sha256:dfc9a1fb2a86cedfbcfda7e7e91e3f64f754fa29b6ca677956a545016fe9abe7"}, ] [package.dependencies] @@ -4583,4 +4581,4 @@ reference = "tencent" [metadata] lock-version = "2.0" python-versions = "~3.6.6 || ~3.7" -content-hash = "b880ff3196d07cab9e5400f4695d773e8e735d7a29ef886ba820315225b1731f" +content-hash = "03c316325158a30e9342e9222c037ef88b93d7c494e4c99034fc4ddc6de39f96" diff --git a/src/dashboard/pyproject.toml b/src/dashboard/pyproject.toml index 0f1e76949..d22252e85 100644 --- a/src/dashboard/pyproject.toml +++ b/src/dashboard/pyproject.toml @@ -37,7 +37,7 @@ typing_extensions = "4.1.1" jsonfield = "3.1.0" importlib-metadata = "4.8.3" greenlet = "2.0.2" -bkpaas-auth = "2.0.3" +bkpaas-auth = "2.0.4" blue-krill = "1.2.3" bk-iam = "1.3.4" cryptography = "3.4.8" @@ -213,4 +213,3 @@ max-complexity = 12 relative-imports-order = "closest-to-furthest" # [tool.ruff.pep8-naming] - diff --git a/src/esb/esb/components/bk/apisv2/bk_login/get_user.py b/src/esb/esb/components/bk/apisv2/bk_login/get_user.py index 46207fded..960869fab 100644 --- a/src/esb/esb/components/bk/apisv2/bk_login/get_user.py +++ b/src/esb/esb/components/bk/apisv2/bk_login/get_user.py @@ -27,7 +27,7 @@ class GetUser(Component): suggest_method = HTTP_METHOD.GET - label = u"获取用户信息" + label = "获取用户信息" label_en = "get user" sys_name = configs.SYSTEM_NAME @@ -43,4 +43,7 @@ def handle(self): host=configs.host, path="/login/api/v2/get_user/", params=self.form_data, + headers={ + "x-verified-bk-app-code": self.request.app_code, + }, ) diff --git a/src/esb/esb/components/bk/apisv2/bk_login/is_login.py b/src/esb/esb/components/bk/apisv2/bk_login/is_login.py index 5dafef23c..323c546d4 100644 --- a/src/esb/esb/components/bk/apisv2/bk_login/is_login.py +++ b/src/esb/esb/components/bk/apisv2/bk_login/is_login.py @@ -27,7 +27,7 @@ class IsLogin(Component): suggest_method = HTTP_METHOD.GET - label = u"用户登录态验证" + label = "用户登录态验证" label_en = "check is login" sys_name = configs.SYSTEM_NAME @@ -42,4 +42,7 @@ def handle(self): host=configs.host, path="/login/api/v2/is_login/", params=self.form_data, + headers={ + "x-verified-bk-app-code": self.request.app_code, + }, ) diff --git a/src/esb/esb/components/bk/apisv2/bk_login/toolkit/tools.py b/src/esb/esb/components/bk/apisv2/bk_login/toolkit/tools.py index 640ad3dd0..cf710bf01 100644 --- a/src/esb/esb/components/bk/apisv2/bk_login/toolkit/tools.py +++ b/src/esb/esb/components/bk/apisv2/bk_login/toolkit/tools.py @@ -26,22 +26,25 @@ class LOGINClient(object): def __init__(self, http_client): self.http_client = http_client - def request(self, method, host, path, data=None, params=None): + def request(self, method, host, path, data=None, params=None, headers=None): + headers = headers or {} + headers.update(configs.headers) + result = self.http_client.request( method=method, host=host, path=path, data=data, params=params, - headers=configs.headers, + headers=headers, ) return self.format_result(result) - def post(self, host, path, data=None): - return self.request(method="POST", host=host, path=path, data=data) + def post(self, host, path, data=None, headers=None): + return self.request(method="POST", host=host, path=path, data=data, headers=headers) - def get(self, host, path, params=None): - return self.request(method="GET", host=host, path=path, params=params) + def get(self, host, path, params=None, headers=None): + return self.request(method="GET", host=host, path=path, params=params, headers=headers) def format_result(self, result): if result["bk_error_code"] == 0: