Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: 登录时，支持密码明文进行加密处理 #532

Merged
merged 7 commits into from
Jul 11, 2022
Merged

feature: 登录时，支持密码明文进行加密处理 #532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
079150b
feature: 登录时，支持密码明文进行加密处理
neronkl Jul 4, 2022
3968d1b
refactor: general-envs-configmap.yaml 及helm的values.yaml需要增加对应的环境变量；cr…
neronkl Jul 5, 2022
6c391f4
Merge remote-tracking branch 'upstream/development' into password_wit…
neronkl Jul 6, 2022
c4ec5e2
refactor: 增加环境变量
neronkl Jul 7, 2022
c4e619c
bugfix: rsa第三方库 安装缺失
neronkl Jul 8, 2022
5c65131
Merge branch 'development' of github.com:TencentBlueKing/bk-user into…
neronkl Jul 11, 2022
bb65d27
refactor: print语句删除
neronkl Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deploy/helm/bk-user/charts/login/templates/general-envs-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ data:
SENTRY_DSN: "{{ .Values.global.sentryDsn }}"
# Login API Auth Enabled 登录是否开启了 API 认证
BK_LOGIN_API_AUTH_ENABLED: "{{ .Values.bkLoginApiAuthEnabled }}"
# Rsa 登录密码加密
ENABLE_PASSWORD_RSA_ENCRYPTED: "{{ .Values.EnablePasswordRSAEncrypted }}"
PASSWORD_RSA_PUBLIC_KEY: "{{ .Values.PasswordRSAPublicKey }}"
PASSWORD_RSA_PRIVATE_KEY: "{{ .Values.PasswordRSAPrivateKey }}"
5 changes: 5 additions & 0 deletions deploy/helm/bk-user/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ global:
## sentry dsn
sentryDsn: ""

# rsa 登录密码明文加密
enablePasswordRSAEncrypted: false
passwordRSAPublicKey: ""
passwordRSAPrivateKey: ""

hostAliases: []
# - ip: ""
# hostnames:
Expand Down
8 changes: 4 additions & 4 deletions src/login/bklogin/config/common/django_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@
# RSA
# ==============================================================================

ENABLE_PASSWORD_RSA_ENCRYPTED = os.getenv("ENABLE_PASSWORD_RSA_ENCRYPTED", "True").lower() == "true"
PASSWORD_RSA_PUBLIC_KEY = os.getenv("BK_PASSWORD_RSA_PUBLIC_KEY", "")
PASSWORD_RSA_PRIVATE_KEY = os.getenv("BK_PASSWORD_RSA_PRIVATE_KEY", "")
ENABLE_PASSWORD_RSA_ENCRYPTED = env.bool("ENABLE_PASSWORD_RSA_ENCRYPTED", False)
PASSWORD_RSA_PUBLIC_KEY = env.str("BK_PASSWORD_RSA_PUBLIC_KEY", "")
PASSWORD_RSA_PRIVATE_KEY = env.str("BK_PASSWORD_RSA_PRIVATE_KEY", "")

if ENABLE_PASSWORD_RSA_ENCRYPTED:
message = "enable password rsa encrypted"
Expand All @@ -154,4 +154,4 @@
)
message = f"password rsa encrypted is enabled, but b64decode fail, {rsa_key_info}"
logger.error(message)
raise Exception
raise e
2 changes: 1 addition & 1 deletion src/login/bklogin/templates/account/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{% endif %}
</script>

<script src="{{STATIC_URL}}assets/jsencrypt-3.2.1.min.js"></script>
<script src="{{STATIC_URL}}assets/jsencrypt-3.2.1.min.js?v={{STATIC_VERSION}}"></script>
<script type="text/javascript">
PASSWORD_RSA_PUBLIC_KEY = "{{ PASSWORD_RSA_PUBLIC_KEY }}"
ENABLE_PASSWORD_RSA_ENCRYPTED = "{{ ENABLE_PASSWORD_RSA_ENCRYPTED }}" === "true"
Expand Down
2 changes: 1 addition & 1 deletion src/login/bklogin/templates/account/login_ce.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
{% endif %}
</script>

<script src="{{STATIC_URL}}assets/jsencrypt-3.2.1.min.js"></script>
<script src="{{STATIC_URL}}assets/jsencrypt-3.2.1.min.js?v={{STATIC_VERSION}}"></script>
<script type="text/javascript">
PASSWORD_RSA_PUBLIC_KEY = "{{ PASSWORD_RSA_PUBLIC_KEY }}"
ENABLE_PASSWORD_RSA_ENCRYPTED = "{{ ENABLE_PASSWORD_RSA_ENCRYPTED }}" === "true"
Expand Down