diff --git a/src/dashboard/apigateway/requirements.txt b/src/dashboard/apigateway/requirements.txt index 75006f7df..93eec51c5 100644 --- a/src/dashboard/apigateway/requirements.txt +++ b/src/dashboard/apigateway/requirements.txt @@ -14,7 +14,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 bb8323a0c..3f85fefe9 100644 --- a/src/dashboard/apigateway/requirements_dev.txt +++ b/src/dashboard/apigateway/requirements_dev.txt @@ -17,7 +17,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 9a9b5946b..e8364c8e1 100644 --- a/src/dashboard/poetry.lock +++ b/src/dashboard/poetry.lock @@ -376,14 +376,13 @@ reference = "tencent" [[package]] name = "bkpaas-auth" -version = "2.0.3" +version = "2.0.4" description = "User authentication django app for blueking internal projects" category = "main" 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] @@ -4771,4 +4770,4 @@ reference = "tencent" [metadata] lock-version = "2.0" python-versions = "~3.6.6 || ~3.7" -content-hash = "d403fdf4b085a7a4f1baa654e86aea294251b884a5b85c57317dab0b87b13b83" +content-hash = "add2fd852b56c0e7344738e72f3fb18132abe1610e85c7b260c577a4e0013376" diff --git a/src/dashboard/pyproject.toml b/src/dashboard/pyproject.toml index 18d04a06c..0fc829dad 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" cryptography = "3.4.8" apigw-manager = "1.1.7" 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 03f7c101a..54594b741 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 @@ -28,7 +28,7 @@ class GetUser(Component): suggest_method = HTTP_METHOD.GET - label = u"获取用户信息" + label = "获取用户信息" label_en = "get user" sys_name = configs.SYSTEM_NAME @@ -44,4 +44,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 7db5d0008..2c77f7e8e 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 @@ -28,7 +28,7 @@ class IsLogin(Component): suggest_method = HTTP_METHOD.GET - label = u"用户登录态验证" + label = "用户登录态验证" label_en = "check is login" sys_name = configs.SYSTEM_NAME @@ -43,4 +43,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: