From d6ce0791450a20fb445223f9db0a5fa13c7441f2 Mon Sep 17 00:00:00 2001 From: yunchao Date: Thu, 8 Aug 2024 14:57:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20API=E6=A0=87=E5=87=86=E5=8C=96=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=96=B9=E6=A1=88=20(closed=20#2370)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/base.py | 3 +++ common/context_processors.py | 2 +- config/default.py | 1 + env/__init__.py | 2 ++ locale/en/LC_MESSAGES/django.mo | Bin 118234 -> 118269 bytes locale/en/LC_MESSAGES/django.po | 2 +- .../0003_bk_nodeman_20200811-1145_iam.json | 2 +- .../templates/configmaps/env-configmap.yaml | 1 + 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/api/base.py b/common/api/base.py index 12d018fc6..f7886109b 100644 --- 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 index c665c6c14..81f2cb84a 100644 --- 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 index 736f0d626..e597e2f31 100644 --- 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 index 2d2a24842..f6968de6b 100644 --- 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 index c9d77437568a990266b0e8edc5fc7c3a70a20e42..5f0987a6c29a744ae50afa4cd51eb4f3cc3b1ca4 100644 GIT binary patch delta 13399 zcmXZidAyF*+Q9MW$yDZXE5epB(>9Nphqg>*7D8p%q0Awty8)q6DLD;JR5(hh6rvIt zl1Qr4AfW;Es#8+RiQeCDuXXO$;~9dX$CB$djd@C*$N@gub3{C|gzGcc2S6?CPY(3$tao|uE>aU&X`kFgQ{h)$$( zDxK(@mmqAQ(^nfMU;-Yc>FU37p?unGQz zPNeDu>D&np#4D&z!MgY|+Fx>*LOBX2(GCmbNvATf0yf9SSP{pgE4?rJZ>&IlJ38^N zu?GHzPM|{Gbn0R3gV}f-D`Wk9VWPc}ev{N#3J$mco#AqHps%85(GN57hnY7=w`der z$7z^}OXKsm(5*a)=0v3e=~OekDtZ^X<(sfF)r#S8KtqI-TjI`Jjw%6Fp?`U~y1aG~HO(dy^~8)0Gxttt3nf3!Xy{qSiti`SyZ z@)#O{LWM)UGWuQ@^t(Q>J`P>L46KCr#r8E=h5GC0f({iEe(EYSY@C| zHxkW-+1M7BMUS8ZW)=-AZGld#D|(R)!}jqukfJx$k7$-Q zEgO>WTD+Y4v{+w;b*R6A9r1hYfORhpNj3q!U>-#;ww+iU4`Dw12~E<|*qrfG^)5-L zZo<*%N)DjO^&Of6=g`oXDi=an4GU23jIOi?7QvxtB*&uPO~+EW5Dop)=-s~!J^w#r z;(%u<_+gRq;Q}g$&iHb41ubLyHFzoY;qm!D(3@=`+Tjw+i_6iyUx_Z{IW)PqML)$t z)K8Y@{2S^&XsC^sUK;i+8?BE(CvZPHp=Z&pcn!Uf4r71JTOovYFkV1?1Ulf2*d1q} z6WJM`e}zu;Xa&x{Ge1Uy7tPPu5DQlfFSJFUcfw}a6TO(`q8G>tbYi>Ekbj2e#!s=m ze5J5;b zqI*0Bo#3Nr1UI4+{Q&Lf2pak1RD2<$atLi*H1q?|+_)Qk@lmvcP3XXT&}{w>_P{T3 z6xO;dy!Q|~p{LOmZ$-Cccl0Y{fl2CD3LSZnsuK376Z+y1^xRKGw`K+Ac7)y&yU{!S zXLLmwRl|2R(Z3N}M+cx0n~3%^2VK~5EaCZom4XBAM32!ybfE9i(Eoz|ET2PHUbtGQ zmql}>I%eV^^!ZHmSk6JeUySy@98J3QmWt%zoAdvwNw z&^;Z8CeK22V$Y+$1)Fdreuho3O^vXSDd;hsh33>8beu()SojwOljJ#cz^!NmK1cWX zC_3PAG_-kZh7K!YC+aoO_s3yloPtJTHM-(g(Fweco~CWs2j8#B`L9hO^YV~n-O(S1 z3Fu7c$M#3jiEctW*opjjr1qm*_9;5hcd`A4SpOwH{~bM^d25ASD2L`ky;@1=_$nIu z($GKpJl3S1s+~^NgUiu99f%G*293-u=+E_3bb{-mTQK*Opzr+$pTsZmW}HzcB=3oY zf-5RoH=TMEFUI+}7JFlhdLeo4Lz8Vew!)9`dMut5COR31Q-2bT=sB#0m)8%u)C+f0 zpM;a}iU#S_ZJ4Z$h1w0nOjn^v^#Yo7Z=gx{0eYT)!5Ub+QAo1p*ns-YI0%>FLwFVk z;(d+7^Y5@T^|DPujtoUEyd<@Vg6Dr5dUxk<8vbs-2u+&C=+9+qbkA*Gdjj~Sl-vlP6cO0*1nRSnxw&qgOOA8X;$ z=oainLwOP%xM8bsEIXs8W*B;(jKli)EOx_BuqRf&BK&4dz{HiVrqC7-;AL2{b+8Fm zp*}D=3!T6+G$LEj``{pYCI5yd-=%HBjhKx-&%wcXH+qj8MkDoC8_vIbT&isd(WTLv z=#|+R-TSU+sP9J4`xBUntI=eA4_*1^XvfFUg`GnqP`zE)+5vba^&#km^=!K&e7J^& zPBgrZH{p4_5p&vy7x$ri_aAhH$I&e-)gc_S8t5_ZfrfqnHpK_fE!v4j@^f^-=WrM1 zPdbLZ+=okPDBUTYT86KnS81Ql;XfG6LobvAXc8Vmll6bGJ=G;drVu)@OVG&FMI&+r zx^;cf2~I*Mlsp$3_Msuqe`Q#CdGvVQfre@k8sf*%_g0|;y@6h>`_Tv;L*F}texElx zL?#0ZQO`stR0ruNNp+;)hXc`$a?qJ4=t>u&Nx23c_=D)T=zD*n9becr3{)CzuZZSK zUGx~XLi_KAE@%W6_59~ha01iOy_z3=63y1N=t|$m%kc>M8&L47FmMSRN4)}??F-NW zpT#`*D$c=;=z`jG3peTz%>Dhpoq`V@LqFVrgVX#`i6g03=@IsRKAJp_paU&MujUO{ z6+cHqe;$oMp`PLXD2Il;5!!wgx;29^F{EQDxbi!&FFuT;@dP@dt9ykN5667eN2AF% z9vyHJx&;Zkkb7f&HF|-)hK7D0`u?|QGXK(x^Y2XlqQMmvy*hMI6aAnIx-~=4_r{|i zCTK?suq!S>S9lb?C;mVuTKt;uUIseBDrin*MO$CP`FDlgXt0C9Xnhho;9cll{|MT_ zS{#I%(Uq0y9p0~pZbch3#KX}E-hwV<7G~liwBL1TPVGo2crHIjSN2CVPoL0U6rDg_ zbmrOUMEaxeUmx4Y$NFv9g!Z|y{S9j4x1u54 zg-+xkI^efx2dAQcqkCU?V0c~@-NI_IUI*RVma%>{8lmg32Ht|^)DleGt5+zv(oN`( z!bj-u`5AQYD-H^OfV9Lc>LalcF2-!!jsB>Vyf#eeDs&+OaR81($Jvgq{C#v`pIsaO z{eO&x+$)u9&y|)y_pl-w+NNlSov}F%LPNX=eQ#}iz6;w@KNu}PBs?FC{b-+z=EQDv zLLUv`{5z9_H0bwe=+2-W7a1Dr)zI_Z3eDo7SQqa`bK_++VtddDpF)pa`npiR7>7}> zf#%jd=t3V$D3~-W(E-<^9qvOrIDvNfH#)JR!@^coMJLi4{dK$nufe&PiJzhU{)vYC zqTykIWujHk97q~aXh)$tI>7xn9G}4kn0G{2c~f+P1MwD|fUfumnydw`56_EZW9l{0 zU%#Q~@g9Lr8ki(1Nt-jHoCGOFcXX15YBNubnm;PdzpjY1Cyik z&;ggC1HOUw|1O$ipP}y`&Xx0bnu066=*F-ot z*Q4Kkf*#L9cqN{|&RBm`IyC{Op~vw!miPSsL7@+p9vzZn3^t@b6Yb~)yaG3(q5BQp zs`F^lmL3yw;W9L-ve5|k!w)dQrr0Zo{{o70u@#=e#3ZP9Q~0newxHf0`{9G=u{(wi zcoq#|@v*_O=vGw3HrNV%eA7$m=ii2=6aEn$l~p*hk0mLwdnAvBm2 zW6_Y_frfrzY<~>fQ-2X%$%jTN0V&@x+R;V`_Tw}hYoZG{n08lHMG}3ldnyz_m19(MqnEH zcfeif%9mktfB)A~@cf>LFBF&-{+mxVw7oBSTqdIvTZ?wM13ji6qFa#n)^zGxEQAAb z6uMPg(1jdD?}Ojbe%eeYIX(Y7-a_HV>p?@-EqY)X8HE}*V z&?~Y237V|uu^l$MJxp*qI?xKV|5wqi+K!%rJ-5g6|8acb8+4|>qAM%FbGM`-PQxs8 zVk^-IY(e+(B$}KT+z}>L8a)Nguqn1hCom12&|Gw!#R&yNvKpPyR&0;&p#vAbGeo2U zIzU78!%papHZa!bqFeKLtgl4}dIx>)0Jlo4$qsSk?V}EcnCW1xM+e)s4v0}p8s02!(BZdJ#LH9o9k5^ zj9btNl%EqqS_3@|S?ENri1nW6pWB1cNDN0OJQbVaZ1l=~1MUA)EamzCn!+R+en$t& znH#R)sc2*p^snN1=$~9`&;bshf2tivCzQS?Y-Le&;Ob~3nqWTcj^<2nGzk-I>G_{a z!5M8uL;gPc8}L2);;(4-pT&NdF)v)LVMg813H3wIeGb;bg;)b$$HsUR+hWFjAwvDpi4H|4G8f(J6=;&ajYi~i ztd0N0+?=|fbL&cK+#k;?`m5Cz9k@rVPmj;%VixTS(GK21SN2}?H0ItH3&XEv7TVwB z=$&ZjA3$^Ku_QJ;jh@prXfl0)ULeQOi2N75s`ES$?)GZvKo6k{cp6>lE7%(MpvUf_ z2gCDA(Shrr6K{$pXVM`S2BFC_0X zI@LbbXQR)TpgHwCy1;$NcuDFYgmD$vGUIaDs($&p!nRTx0{TimpRfv;|$sUUUVA z(c}0tcEt<-8NTn0+fRjzyJ4BXhXwiXp)qDB3K!l zP_K=BaRj(LeFe=;1aOVE{NVGZnwo}OvweX=}0--SJ?A43<=WGUz0h8|199zBWP zge$Nmz7*U44_*0bG!ps#6;@mpy@2YVA?<^?IfM17PsQH2GS>gZcGPP<6(&CRDbBwg z-${eVVG$ad)o2J`#@q`ewttRS(S8(7qB_gMmStll>V46POu^N78)jj(<>8*_hps${ zF0tUvv=$BF4)kL97QHHe#OYY#>F~$p0`&NNhfeSmx@GBSLO+GD5%tRG&vHL(g_F_u z)}lG~I@ZHv2L<=)G&<8t&xUO8g?6wQ9dI4G=WnAOe1vY*VRXempzr;HM&>-4)a6!$ zpXID*V>BmPApIq&VHEt;n}pus51_x}8_^5nO*BGB(1CtOe;dxBE4plDm{=Y3y|(Bv z?uSlvBs!6au|5~wf<>77-~XSB4_-$H*n$2d^L?y~7p)2dHN!g8+oL&ib8Ju0_vWJ$ z*nn5!UUZAf{5x0`JncSifW4s-wizqe2@>F!07?h$kkH==*xe2fp{Pw45m>$z~e z7N9HHjD~a<`rTo40{=r-obh}}?yBg(9np#OeV+60#WJ3TF}Mv)qS|Xh1e&9{&=wuI zQ?z@uFPZ~GqNC6OCZLhH6J5ZA=tQ4GFS_;E0e@SQgpQlP5N6yC+w)*Bw#KD+IUd9Y znD51qOwG_O=#Ea{R&?Tb;`O)?jpQ%*D3)0pBD4mL%yx9k4kr{mX1}7@UgD*Ye2uX- z^@(UMEXC&dEP6~2p%+$>m&1yyqFdMmJw~D!4r_q>+vv3?PMI%-4)zID;dr|L)UPvo&0Dg|1{|2w+{{MxN z)Bp-5!&_)1K1KKJH#8!})`yTaMB96ydpjDP&@{}%XVBxf9o>pA@J2k2!?F8@aO1sz z1F3(Bo&5c8vN42cCc3Ay(LGv=UNrCFAp9?S$9H`_Of&~w$vtTM3+P3*7c=n(G}#Jm zN~hM~RX7pPpj(@>nfE;Zizyho^)}!UY=P-F!WOi``qT$tW1NTG@l7-b3ceX4Q5n66 zdZN!~VHezuZL#=U;r|D4b@WM0ys1u5sDbsjFmRfGRALY6i{1_w$dTwN%tw3Ptsw#h z(NNb!L*E2Frrn}_;`701a*jcd;Y4)7|Jcg;_kvhOgT5Ah2mPJ@5IrW}pf}wabbt%C zg$@g%TU83(ihAg|?u#9933?wKM87|YPT)*5&pVudUnurYSV1QCq23hT%LV8PS79@J z6+7WcG&vh=4>{5o{n43$Ch>eUNmrp;v>sjHUbMf1=zVe`q2T#0w{kY^cXHhll((;!pUD0%*Mj+h8Z`H zUWsl&fAqo_6a6QSrT#8D@y5H;xk=j!UGWecieu3g??$iiPtnkSiLLMi68R)m^}TR4 zHbM8WN32iAp49J+?O&i5PijwizYMx{bUW^0U^cpy_hTi- zPrXFJneRte^cmL2?=d$w_J$QyMzgyCdJLzaSv@m42TisI(f(GUD_@J|&=&Lt{RTPZ zx&K=?d(c1A7i`YEuHxWR#nOMSD>3%?1sCww-r4ar?^{>%><#6r_pRG;(#R20a&Eb~ qZl@7bMz+jsSifPTy7imYZCF3ELGzZ4Thy-Kyng)+^Gc_CzyAMPM*gAz delta 13366 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 MZeM>*vdhl@2jTSlLI3~& diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 1ad6d8cd0..565352b32 100644 --- 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 index 725e316b6..70f657503 100644 --- 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 index 68d6a9c93..81f43da32 100644 --- 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 }}"