From e623f63fcfd1c6dc43498ef721d9db2ae0ea3e51 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 16 Jun 2021 13:20:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit perf: 优化命令告警，优化翻译 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76320 -> 76354 bytes apps/locale/zh/LC_MESSAGES/django.po | 120 +++++++++++++++------------ apps/notifications/notifications.py | 6 +- apps/terminal/notifications.py | 6 +- 4 files changed, 71 insertions(+), 61 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index f1e5b13b4213a15171250e3f370260565640b52d..1b069d824b17c9817a57928bd1c01b86af131099 100644 GIT binary patch delta 22094 zcmZA91$f#PzJohV{}N?&T-P3*uQbVMoU~ zM_dfAV2VzTlNujlN_09qP7(;lWEf`VHj80W@-Y~KH8GU)JFTcB!mlwYx~K`pm@`lV z7Nd4#Gp4{_QR9wU{w!*zu3$QRfSM<;i{m85RH*)87>wD_4W&|)idJ6LtdF{)FHsYA z$2>R)b;V1uJ8rS|yj>k9fVd>)#oqZU>bweS|G3mS;QI1x2p9BRHz7Q6eY zXhl~n@t4IxJ-yc_9MjXD1vNow%!sv7C+KYL-&p%h%dbJ*^W7MPzoTyTNz^U9j@kA8 zKcu3EFLf{P{mg`V2CAWUq5fyfSQqhY4LhZmC)W8I>UOo+GCC-G(S3q4!ZPW={p>Dxf);_|V zin{W}sGZn=I?oQ&t=fm0$Gu<;4^R_6M-2=Z;0*}H^u*z)*Q*$6@HJOOIl4+HRNAMfauzYNGO}h15b_S!>k9oiI1{$9x!v z`SA#9p>I(O)J3VkJ}xCOJ!)s`pzrlWEo=z7I`JGTTG1kNEo!1)Pz%|IxT-TAf{(6R%x8t?N0pEEi2tsXnC`Muy48j=H{MFRX z`JEo)weTKBW2x`GThR%V5)VNw zbS!EIrhU);Yo&`xXiMW!Z^JR`c*A^PzQ9DZ|BHDr;aG26G$tXgf!evos4rXxOpL>< zeJpArGf)dyG?x9>(;aUe?xI%s4D;bXmd`!T``xez29R%r+Nq|fEsizkqE7HDYDW)Y zay*H8D6eA*{2MhckvrbIqP(aNOkvax)I@b?i5f5*li_644$Md0ie=_%)WUy8Enqw9 z)*e7D;4*55{iU3qoX1++jdXcXqaS?Ie(m_+aYAu1_pIE$(94(i9`Ys;sc?7hDcs4J>~T1XAl zLK~qL-p=fbIzeyL_v0JXd?Qe|Y__=oGwc0dN=2{PUex=1(|m{eAf=t+O^^>$6IVn% zEA=rHd!TO32#e>KYf%@r7q#Fss0Cd^^}mI_KmY$jr7($9Q@yRNjG@FeEN+Fm^3JFU z`l0#{!uC<=E4f76Ldg-?1y?w2B2?V)I8%XKNWS}xzpKyZRrXUy5jAqXW#^C z!kgCdIqJ&%W_VYS8A}jnLrvTib;4E{f}K#$z+j6&VvD&8wX#E~ zD?E={*mF#aiD!Bzj6_YC3)Nm2HSwpY_q{f1AzxrR>}ih1oWyY$jP3!eT(Ay*Vk8X# zv%IG}J4O)~LG4Uyvkz*AMxh?Y>6iiIQCD^tb%N98ZB+kPm>m<%_B{ixli#a2g;7^f z5_JU?F(cMO-J(tw55h3w8K{YV#`Jg|wSd2{04AH`ecDT-#&<`3Pllo%!bRx&^Z#-x zTJZ+d0)9a)U?1upo<_Ys*HJt0C#wHDRR08Xy<3w4!-;dC`p2N!t6SUvb<4g)?L;Rm ztoJ{biY8u#xp4_ z2Mb}`54`{Cc#4Fc?i;8N${W-|a?ST{MKoq2E{DD=Hd~_>)Csk~-l%z8)QP5{?)4nh z!?*x7ejVy9+dSX(9*(^vG|_p~72iPJqsQpGV$^~XFYw~js0qR?&Vzbpidb9`we{63 zUk^3DCHn3?>cV4POMHh~*-Uf3<(HzK>W!!!IF6O^F@|B$IB!9{}F17Kf#<>9ktcHP&?KS zHEt+sp7E%ioq(5Ub7>4?mN2A&+qjsR7*%Gzj zE~qX43bo~fQ41So@kDE%g&MyU-2_zDQPCA`Lapo|YJ&5a3;)1KOtRE7A8N;{qrP}; zQ41bw&P6?}n^3Ra87zi(Fe_$S=Ium+UVlLc>1@J27#pKKR zM=C67PQ#AG&oKhOSmFJ69*oV1H((5gtn{9th8RUWb|w2?hRSvl{qQxm#hyQUCpw4G z!~v_kr@ScY%9>(!?2o##d8mG;FdrsZ%~uZ#p?>_jsE2nt*1;pl|2dKF8n44q)O&sh zwUvH9*~5s*iL+xc7Dhb_l~B({Bg=O|JsX2CGmf|XYSj20sGUBHN$~CoA3O~WfpZO?Zdn}1NQP134 z3}Jf5Z@u?0r9o{~LDV<=6V!^EV@m9VT6rvL!6U7G3Ou>|#-Xz)omUtY~V3AGU4pc?;uW2?!o!|@9PIN>) z%wJ50pr=Btky-*yZ8A4H`e2`ylVITMQ!uSIR`9n?dUaI5!BBttDI1D40^ zsCn9;`gKKZaWB-f6N}oZ(WncUgj(plt?YkiD$7XdeGc8`t*jJkqUxvtbx{lY0;6#X zro}y|E4hTafXAqZGtqWisF?xFk7@RqENjsEj-j^f3~It_sC)SqwZ+MHdf$g|)Uyzcny)-+Co7}gs?V&w8FC@6)0v7U8jR)q z_;TT6JhF=`!C&?;IiB6?eNu1k(s3)TNe z%!})>FkZt<7;@748Bz$fgN-p#SJI1$224S9+=0dMGIDWF=qXmM7`0OqPkRqv9O^ya zZ0I?eZ^gH9lDNqk#7`p0^)f%GAvSw9O$A*{&n_Juq^(@4q#t%n5bQ3LJ zVeK1H<9{>vn@3UO&YWTYRk=YTH9kR29B|hAA(9+*;^No@tE1YNq9$I8xp0$t%?vu{ zwMS!3+Dl*&9Em#L77W3C=h%Nuc#%YUyk#B!HIttA+S8*3W;LVCvSwAYq1hVs7W6>9 z9WLqu$6FkSy0CR>P-Q=6#w+GK)PV2{UV9YkA^h0lMrK!Y7>3b4)8h5!LG!w`zp^;w zqIbb=9x7U44C)H&nqQ)}xQn&-LM?EZ#c>v|Lwz}qqb}s7wI{pe%^Pm!N41wV>w3CQ z2P(Q3gHb1(gt`?o&2^{~AGG*Bh7ku`_WDJbB~jz+pl)en)P=ROxF=>I9*DZod6--8 z|4K`oGOwGDP!qnj*#C+*FePe1;TD%cov;dO;dLBqLe#_elexp%kC>;;OXz$5Z&2~QeyA%5 zxaOTO9CanxP*<1>(_tahiL0W-KZZG7Q0-wByIHB|SE(p#D2+LZD_VyRW*^iE zhoTlZ$?}WMb>^a)Py6=$>w}>73xG= z%)^$yhT6G@7AL&x%@blqqUJAP7DZRDQyD5+QB`aB9JPQJm<79<0iyGGe)xX(2`}yC|8v3FZGRQiNHD{SiF&phaV<|jm`PBEli6hLM zs1p=0OPil!4Eg#NPruLpYo&`wMB_$OeAnW)s2$4xr+0$Vs2!<@T4-y__d<<}HOHc^ zcs^<&n^9N3*W$w#UvQ~J&~V)v{2q7@O$y9TK0W5gk5CKjg!&%L#+-Np)8cE?34KkmqcYE2X>LNTc#nAqHQ=Phmr*CUiJI^gYG*l*55-t1Fx|T7J1Cy^Wq3xgIS+= zJ95JO6E%O}Q*QyO(D(QM=`E4Nmteb5TUiQqg>^08*6fM80v9vkNYwXX5$dPo4%7nA zqWaxIo%j(Z!M7GC{EL2i|3g&4Y^VW6%+jcV6;TVSiMj>tt^F&rAF7{gevf*lW}^CU zw)`&Cd5)Ra(A5c_PzlCYm;r;Hc>}YeKXHCD3iY8Xj0vy`hGR`kft@i5W6c#?>XS;maPiu9|B)o={v!?UOp1-$fjBrWPh z*(}a$mO$OA$}ib}ZCx`G+NzGI0lmyva|q@o|1IiU9*;qI0#o5d48@12@&2#8c@vvy z&1|TLI@;m}E)}h~73%frV-3^M_fTN~`5ma8+J%vL8Pnpwm=x3e?VT_SYQBP~{uM3X z6t(aUs0$s1Y0#ZWMFW;%dfZ~3wEP3qfd9V5Tp>+MW(EKZyg$76HU7Cyu<4EV?UL`R_F+E@g;SUexq ze;eupcS3o+|8Fdj_MLa)au`j%Ci?CXYQm|gtzL_I$bK>RSpE=dr_Q4;=!WHAqWTB? z>*bS}nb7s!GfPxLU3o*Zo#p#tX7b-*dR%7yh8lmt;)kdOCj8Gc1a;y_)XwHY^{l{{Ki}*0DQa97%#3|eCz^^{z%p|UYJnTf zU5@MLyQjxUv_W9_reW#)R+iFcX@EPo6&?`89e zOGOg}_BI=*xE< zHBmsIcMpS6aTIEzvKCiIP53!#qCTh{8fWcO%{X%ns{b~N&!PI?^2IKHYi$j$QCprc zfp_9?)QR($rBDm4it5)H_0SGMJ)BcfukCi!!XKf=zeSxeX+kfb8Wl&N@4x@gsS1f` zv$RS94`jvDYi>I5rM3s`S%v-~d9+i}?PcTiXU$l`y^1VP>clcDCx5aj2*|B=>^ z*DPUHHtV3a{0r0-_eL#f6l$W0s4Jg=WpFX-o?o~2cc@QyU}CRd8Pq&g67&A+%hZ&F zCK_oS#-dI*%kn>&8&N0z1$Dyxs2w_O@pIHXeo4F&1flwcnYmH@i=lR?zH5~>s1x=^ z4H#|t>6n~&DeC9^dh<8)uz4PJ>u#YYeu7%4lhiYb8H##nGou#j7Pd+$)QKygwx$N^ z;cI~%u)oEBpeBB6CgAVpH7+G;!f@2Xm(B9|Q70^g`pu^XYTlk+yX%bcD$WdZvAGU4 z;SP)UqJHT-iJIWNwf|+lM&A`D_jVu&YDY4nepci_%~#Lbn_zmrKTaoKg}>QEO)v-b zo-e`jxF2o(~gF4|;)CvDK69jv4YBR#jZ3B7B0k3@EMlE(joTRqWX=-(zp&w;zQJjC}*fQUkvJDY=ez(l1pVMmHSu}yQc9L z5Qq9697L`By2VdXCrXso&xyn+)Iw{ce)#l6?bJfl>$VN`DZh@BFgTreYZsdC2CE!E z-Q!EBExL_5@iS`=;NRl(Or%BS^H^L8^)y$vd^^J}|V-TT9+ zoxNv1!&u^X=zIVBW%iz07u9hB>Q}5;7OzEJ!B*7P??mm)3G*@P;Y}9dEi4K(z6xr- zFHslP(d=suLsy^32~^~4)QOg0C0vENw@)pfG}4ueu(&B|o(>id zL5&}Wns*-Ryvwq>UdOE@%91#RnJ`s0Z{jGkENWm?)XvmH?bLMCw|<_r$DtPVqqT1~ ze>L}E7ut`Y7Ffp3?yaOgYG8Ydd!w#sl(`-?;D-4R>S0Th!&^X6)B;PQ=83^-SPQk# z*{JVB9Ol52sPBgRn#w{dVL81|=nm9Vdja)SzeH_aST1j&`A}cXa+nv}TYeH2Azq9c zf8O#hP;X68Zf{&>)B-<67Unwjsqk@fnqoE@dgk%2Xd3E@W})uYB6A~Zg5OaKJB#Xf z2X&=SQMcr8)I;_Us$XzkZy}MW-=vD8uceMZe>x$dqu%5}71Fu;8J~^pE0)!SY*Feu zmScU|R$6?D`akrULwu6<^p+n?y&CoD8pP3oJ|*dUj$AyYBxM9S9bL%l;5PV)+d16bV?BML|cHGx|18^&j$7&8BHm}1Row% zh&N0g5)fG`I3=uJ8#B?CpTZ9vr!g+3l%jr|l9u*wh^JCNWT)sztmAi^ z<5P?Eo9h&-m!$q!59aqj{Y`G^*+?AF!goX^b+(V zUZDn#i`IV*^+?J|TLM+5D*c9I4*Z6EYioOnF#&u@;;4*cf*_ntSxD!)bncJyCtt4= zlBpBf&14Q^E3!E$1sTzUvUPH*${{X4FMWUW{w=;g_|E;GV<4mdqpTwTJEbY5JF$)c zQ}yxW^+Qz0-_&))dpMOWR@jIYC1czof1Wx0tkO}R4%bQ6qVZGettefoKlotaC_7m+ zxmfDS@jiWaQ{FJgZ`gs-mHZ9gto-E*v5wl52Gqa7nwI<1pZk}BiJnrj*yObPj^0f2 zS~c>|sL!WtVc!{bZ{BlfBS<5_ynI|1(GNnI7zl!PTq4Rh4>P}l4)=@vnpu3bSl+Ubf7;RIj zx8?+UaS&}fvfv4F&1pYPte+{dl#JBZk<+n)__);-FC#9^xMkF@@~ePTk)S2kq3CEt z=Z~q6#zdA={;2xleFYr-Xum;uOP@`&=_pS8H7+7PNWK`wKhW3Y`=1y5?^gQgIDzhP z3(jC=2F+xEj<3wJxSD)AN;B)*p7yrHpV8JHbu6K+wO4f#QNK(50A&z;x>2f9=huh- z9SOa;KJ)!%@*fQYn5Z#HFV9a$a^KQ@(u9ag9MzvC-%6Y2j1pEGtgE!~OBTi;u_kz5?P%e3nl zi*JZS^*C>&!`CEM(Qww+?ETMJI-I8M2@at>JN2cM4-bA1bcWNe<0~_f8Aabsw2#EK zk{nXAy20B3)q|r3IsPgpsR38BDoHt|H}*wW<9ltN+T3)#&pt zaT!WIV*S#se?pv0X++sPg_5)>ibWIOAza* zY?h{;)3u2%Vg|}l2FF{6i*!g#?h)}HmTOMDje1V{J*IwzK6*gDrT#r-C8Z~AHSi){ z!tFMes`In{hl4*1IHRfiu75g}StM@Lz&|lLMTy%pIFej(NKKCEXycc6-``&>C-*zK-Q>pWXZ>FU&1eiIF^a~2iFXkn!!G3N zkoy&9P-3ZXBfl7@ViEd9V=Bsga=qwtf%y!# z|96}v9!}hJ@}3$g-K<3Vq1BEN+o^A&Uoq-m;istMCgnGqAt|}jAIx@}xUR1kuL1SX zXS(ZF#~aa+(U^-%)>OgU=HG zK+)l1UCL1FJBmJ~i0@OH)4r2@MPE<;RhC>QVn3WlE~D;&jx`KQNJCy4ex~U78(Wjx zLVXGCA=Hyw+f(8x0cRs4pX@_Mz_2#F;5NuHnC4)tP4f&Jho`u}`cml6ZvW-jZ|Y6MRgin|1h+ z!L6)=rJTQszqDKtOQs=SYbPqi$#+xFV|_-@X9Hyn`C!aMTTg4-KyE#`<=$BD`UjKT zLsCZt>V2(qQQ~0YKb2=dUh=P~pQrwU{A+ALIYvD(Zl|pheGX7hYICHZ{t4|mJ~Nl$ z4%(mV8=Q(DicUICc=-Nnsom74({>CeQRY&n5-&v^!Ay`C6O-#msY=nYnKHmv<9p4# zUCH;LZ*EF2@;7lG`A*c&>D8M>hZtMHcQ#3Nizg9}x5+-S+#}-ZOp+J-P}b9@G$j%B z;*|HtS?hlk8`59LSP$o8J5Te;G-jr81*H^?4QP03oi^J9Us~svvz|WUkLPbt|N^VDN83GXGwuHm$fd1X)Q$gjW_{4@-h4> z@p|gDtWPNM97-PIF|_ZcO~)2|MsA_?YfJ1;zlqkqk3N}byI}1a6Qqyc20HynkR5l> zc?BKHQh!FS0QFkx$eK6F}N7Mjz8VtYDD(7{o1zf)4OB$Zca?g-mN=CwrSa|ecPUqt-E*a+Ok`l z$d+B&_Us*hyiblqDgM9QY-x|C2-pu81UJr-Aa6C<;+_nN8H@8VB^+gemw&=RtWa1nP}tE JbbkF)|37mA@BaV* delta 22066 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 Qm3J3z*|a|*U|`t)0pSq-tN;K2 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 0acdf61d9..e817639af 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-11 11:06+0800\n" +"POT-Creation-Date: 2021-06-16 13:26+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -184,7 +184,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: users/templates/users/_select_user_modal.html:14 #: xpack/plugins/change_auth_plan/models.py:47 #: xpack/plugins/change_auth_plan/models.py:278 -#: xpack/plugins/cloud/serializers.py:65 +#: xpack/plugins/cloud/serializers.py:51 msgid "Username" msgstr "用户名" @@ -304,7 +304,7 @@ msgid "Cluster" msgstr "集群" #: applications/serializers/attrs/application_category/db.py:11 -#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:63 +#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:49 msgid "Host" msgstr "主机" @@ -314,7 +314,7 @@ msgstr "主机" #: applications/serializers/attrs/application_type/oracle.py:11 #: applications/serializers/attrs/application_type/pgsql.py:11 #: assets/models/asset.py:188 assets/models/domain.py:53 -#: xpack/plugins/cloud/serializers.py:64 +#: xpack/plugins/cloud/serializers.py:50 msgid "Port" msgstr "端口" @@ -344,7 +344,7 @@ msgstr "目标URL" #: xpack/plugins/change_auth_plan/models.py:68 #: xpack/plugins/change_auth_plan/models.py:190 #: xpack/plugins/change_auth_plan/models.py:285 -#: xpack/plugins/cloud/serializers.py:67 +#: xpack/plugins/cloud/serializers.py:53 msgid "Password" msgstr "密码" @@ -396,7 +396,7 @@ msgstr "系统用户(动态)" #: assets/backends/db.py:232 assets/models/asset.py:196 #: assets/models/cluster.py:19 assets/models/user.py:67 templates/_nav.html:44 -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:160 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:146 msgid "Admin user" msgstr "管理用户" @@ -715,7 +715,7 @@ msgstr "ssh私钥" #: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:158 -#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:161 +#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:147 msgid "Node" msgstr "节点" @@ -1227,17 +1227,29 @@ msgid "SSO" msgstr "" #: audits/signals_handler.py:60 +#, fuzzy +#| msgid "Private Token" +msgid "Auth Token" +msgstr "SSH密钥" + +#: audits/signals_handler.py:61 #: authentication/templates/authentication/login.html:210 #: notifications/backends/__init__.py:12 msgid "WeCom" msgstr "企业微信" -#: audits/signals_handler.py:61 +#: audits/signals_handler.py:62 #: authentication/templates/authentication/login.html:215 #: notifications/backends/__init__.py:13 msgid "DingTalk" msgstr "钉钉" +#: authentication/api/connection_token.py:249 +#, fuzzy +#| msgid "Invalid" +msgid "Invalid token" +msgstr "无效" + #: authentication/api/mfa.py:60 msgid "Code is invalid" msgstr "Code无效" @@ -1715,7 +1727,7 @@ msgstr "对象" msgid "The file content overflowed (The maximum length `{}` bytes)" msgstr "文件内容太大 (最大长度 `{}` 字节)" -#: common/drf/parsers/base.py:148 +#: common/drf/parsers/base.py:153 msgid "Parse file error: {}" msgstr "解析文件错误: {}" @@ -1846,7 +1858,7 @@ msgstr "邮件" #: notifications/backends/__init__.py:14 msgid "Site message" -msgstr "" +msgstr "站内信" #: ops/api/celery.py:61 ops/api/celery.py:76 msgid "Waiting task start" @@ -1993,7 +2005,7 @@ msgstr "任务结束" #: ops/notifications.py:13 msgid "Server performance" -msgstr "" +msgstr "监控告警" #: ops/notifications.py:20 msgid "Disk used more than 80%: {} => {}" @@ -2535,100 +2547,100 @@ msgstr "启用企业微信认证" msgid "Enable DingTalk Auth" msgstr "启用钉钉认证" -#: settings/utils/ldap.py:411 +#: settings/utils/ldap.py:417 msgid "Host or port is disconnected: {}" msgstr "主机或端口不可连接: {}" -#: settings/utils/ldap.py:413 +#: settings/utils/ldap.py:419 msgid "The port is not the port of the LDAP service: {}" msgstr "端口不是LDAP服务端口: {}" -#: settings/utils/ldap.py:415 +#: settings/utils/ldap.py:421 msgid "Please add certificate: {}" msgstr "请添加证书" -#: settings/utils/ldap.py:417 settings/utils/ldap.py:444 -#: settings/utils/ldap.py:474 settings/utils/ldap.py:502 +#: settings/utils/ldap.py:423 settings/utils/ldap.py:450 +#: settings/utils/ldap.py:480 settings/utils/ldap.py:508 msgid "Unknown error: {}" msgstr "未知错误: {}" -#: settings/utils/ldap.py:431 +#: settings/utils/ldap.py:437 msgid "Bind DN or Password incorrect" msgstr "绑定DN或密码错误" -#: settings/utils/ldap.py:438 +#: settings/utils/ldap.py:444 msgid "Please enter Bind DN: {}" msgstr "请输入绑定DN: {}" -#: settings/utils/ldap.py:440 +#: settings/utils/ldap.py:446 msgid "Please enter Password: {}" msgstr "请输入密码: {}" -#: settings/utils/ldap.py:442 +#: settings/utils/ldap.py:448 msgid "Please enter correct Bind DN and Password: {}" msgstr "请输入正确的绑定DN和密码: {}" -#: settings/utils/ldap.py:460 +#: settings/utils/ldap.py:466 msgid "Invalid User OU or User search filter: {}" msgstr "不合法的用户OU或用户过滤器: {}" -#: settings/utils/ldap.py:491 +#: settings/utils/ldap.py:497 msgid "LDAP User attr map not include: {}" msgstr "LDAP属性映射没有包含: {}" -#: settings/utils/ldap.py:498 +#: settings/utils/ldap.py:504 msgid "LDAP User attr map is not dict" msgstr "LDAP属性映射不合法" -#: settings/utils/ldap.py:517 +#: settings/utils/ldap.py:523 msgid "LDAP authentication is not enabled" msgstr "LDAP认证没有启用" -#: settings/utils/ldap.py:535 +#: settings/utils/ldap.py:541 msgid "Error (Invalid LDAP server): {}" msgstr "错误 （不合法的LDAP服务器地址）: {}" -#: settings/utils/ldap.py:537 +#: settings/utils/ldap.py:543 msgid "Error (Invalid Bind DN): {}" msgstr "错误（不合法的绑定DN）: {}" -#: settings/utils/ldap.py:539 +#: settings/utils/ldap.py:545 msgid "Error (Invalid LDAP User attr map): {}" msgstr "错误（不合法的LDAP属性映射）: {}" -#: settings/utils/ldap.py:541 +#: settings/utils/ldap.py:547 msgid "Error (Invalid User OU or User search filter): {}" msgstr "错误（不合法的用户OU或用户过滤器）: {}" -#: settings/utils/ldap.py:543 +#: settings/utils/ldap.py:549 msgid "Error (Not enabled LDAP authentication): {}" msgstr "错误（没有启用LDAP认证）: {}" -#: settings/utils/ldap.py:545 +#: settings/utils/ldap.py:551 msgid "Error (Unknown): {}" msgstr "错误（未知）: {}" -#: settings/utils/ldap.py:548 +#: settings/utils/ldap.py:554 msgid "Succeed: Match {} s user" msgstr "成功匹配 {} 个用户" -#: settings/utils/ldap.py:581 +#: settings/utils/ldap.py:587 msgid "Authentication failed (configuration incorrect): {}" msgstr "认证失败（配置错误）: {}" -#: settings/utils/ldap.py:583 +#: settings/utils/ldap.py:589 msgid "Authentication failed (before login check failed): {}" msgstr "认证失败（登录前检查失败）: {}" -#: settings/utils/ldap.py:585 +#: settings/utils/ldap.py:591 msgid "Authentication failed (username or password incorrect): {}" msgstr "认证失败 (用户名或密码不正确): {}" -#: settings/utils/ldap.py:587 +#: settings/utils/ldap.py:593 msgid "Authentication failed (Unknown): {}" msgstr "认证失败: (未知): {}" -#: settings/utils/ldap.py:590 +#: settings/utils/ldap.py:596 msgid "Authentication success: {}" msgstr "认证成功: {}" @@ -2817,7 +2829,7 @@ msgstr "数据库应用" msgid "Perms" msgstr "权限管理" -#: templates/_nav.html:97 +#: templates/_nav.html:97 terminal/notifications.py:15 msgid "Sessions" msgstr "会话管理" @@ -2841,7 +2853,7 @@ msgstr "Web终端" msgid "File manager" msgstr "文件管理" -#: templates/_nav.html:110 terminal/apps.py:9 terminal/notifications.py:15 +#: templates/_nav.html:110 terminal/apps.py:9 #: terminal/serializers/session.py:40 msgid "Terminal" msgstr "终端" @@ -3273,8 +3285,8 @@ msgid "Replay storage" msgstr "录像存储" #: terminal/notifications.py:35 -msgid "Terminal command alert" -msgstr "终端命令告警" +msgid "Danger command alert" +msgstr "危险命令告警" #: terminal/notifications.py:44 #, python-format @@ -3314,8 +3326,8 @@ msgid "" msgstr "危险命令告警: [%(name)s->%(login_from)s@%(remote_addr)s] $%(command)s" #: terminal/notifications.py:97 -msgid "Batch command alert" -msgstr "批量命令告警" +msgid "Batch danger command alert" +msgstr "批量危险命令告警" #: terminal/notifications.py:108 #, python-format @@ -4051,7 +4063,7 @@ msgid "Security token validation" msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78 -#: xpack/plugins/cloud/serializers.py:159 +#: xpack/plugins/cloud/serializers.py:145 msgid "Account" msgstr "账户" @@ -4792,7 +4804,7 @@ msgstr "云服务商" msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:140 +#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:126 msgid "Regions" msgstr "地域" @@ -4800,7 +4812,7 @@ msgstr "地域" msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:163 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:149 msgid "Always update" msgstr "总是更新" @@ -4992,24 +5004,20 @@ msgstr "" msgid "Subscription ID" msgstr "" -#: xpack/plugins/cloud/serializers.py:49 -msgid "This field is required" -msgstr "这个字段是必填项" - -#: xpack/plugins/cloud/serializers.py:138 +#: xpack/plugins/cloud/serializers.py:124 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers.py:139 +#: xpack/plugins/cloud/serializers.py:125 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers.py:162 +#: xpack/plugins/cloud/serializers.py:148 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行" -#: xpack/plugins/cloud/utils.py:65 +#: xpack/plugins/cloud/utils.py:64 msgid "Account unavailable" msgstr "账户无效" @@ -5096,3 +5104,9 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:77 msgid "Community edition" msgstr "社区版" + +#~ msgid "Terminal command alert" +#~ msgstr "终端命令告警" + +#~ msgid "This field is required" +#~ msgstr "这个字段是必填项" diff --git a/apps/notifications/notifications.py b/apps/notifications/notifications.py index 8563fd214..4c4db11d9 100644 --- a/apps/notifications/notifications.py +++ b/apps/notifications/notifications.py @@ -108,11 +108,7 @@ class Message(metaclass=MessageType): } def get_site_msg_msg(self) -> dict: - msg = self.get_common_msg() - return { - 'subject': msg, - 'message': msg - } + return self.get_email_msg() class SystemMessage(Message): diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index eac9c2f7d..7a87d56a6 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -12,7 +12,7 @@ logger = get_logger(__name__) __all__ = ('CommandAlertMessage', 'CommandExecutionAlert') CATEGORY = 'terminal' -CATEGORY_LABEL = _('Terminal') +CATEGORY_LABEL = _('Sessions') class CommandAlertMixin: @@ -32,7 +32,7 @@ class CommandAlertMixin: class CommandAlertMessage(CommandAlertMixin, SystemMessage): category = CATEGORY category_label = CATEGORY_LABEL - message_type_label = _('Terminal command alert') + message_type_label = _('Danger command alert') def __init__(self, command): self.command = command @@ -94,7 +94,7 @@ class CommandAlertMessage(CommandAlertMixin, SystemMessage): class CommandExecutionAlert(CommandAlertMixin, SystemMessage): category = CATEGORY category_label = CATEGORY_LABEL - message_type_label = _('Batch command alert') + message_type_label = _('Batch danger command alert') def __init__(self, command): self.command = command From a3d02decd6ff13b00657d8f72d9f96043bd62764 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 16 Jun 2021 14:27:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76354 -> 76536 bytes apps/locale/zh/LC_MESSAGES/django.po | 43 +++++++++++++-------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 1b069d824b17c9817a57928bd1c01b86af131099..1d8a1aee15b464cdb4d3878e9273f85ee60990e4 100644 GIT binary patch delta 22332 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 V^hbyEaf6>-i(c=i59*id{{SWBmhk`p diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index e817639af..26a121717 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-16 13:26+0800\n" +"POT-Creation-Date: 2021-06-16 14:26+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -184,7 +184,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: users/templates/users/_select_user_modal.html:14 #: xpack/plugins/change_auth_plan/models.py:47 #: xpack/plugins/change_auth_plan/models.py:278 -#: xpack/plugins/cloud/serializers.py:51 +#: xpack/plugins/cloud/serializers.py:65 msgid "Username" msgstr "用户名" @@ -304,7 +304,7 @@ msgid "Cluster" msgstr "集群" #: applications/serializers/attrs/application_category/db.py:11 -#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:49 +#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:63 msgid "Host" msgstr "主机" @@ -314,7 +314,7 @@ msgstr "主机" #: applications/serializers/attrs/application_type/oracle.py:11 #: applications/serializers/attrs/application_type/pgsql.py:11 #: assets/models/asset.py:188 assets/models/domain.py:53 -#: xpack/plugins/cloud/serializers.py:50 +#: xpack/plugins/cloud/serializers.py:64 msgid "Port" msgstr "端口" @@ -344,7 +344,7 @@ msgstr "目标URL" #: xpack/plugins/change_auth_plan/models.py:68 #: xpack/plugins/change_auth_plan/models.py:190 #: xpack/plugins/change_auth_plan/models.py:285 -#: xpack/plugins/cloud/serializers.py:53 +#: xpack/plugins/cloud/serializers.py:67 msgid "Password" msgstr "密码" @@ -396,7 +396,7 @@ msgstr "系统用户(动态)" #: assets/backends/db.py:232 assets/models/asset.py:196 #: assets/models/cluster.py:19 assets/models/user.py:67 templates/_nav.html:44 -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:146 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:160 msgid "Admin user" msgstr "管理用户" @@ -715,7 +715,7 @@ msgstr "ssh私钥" #: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:158 -#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:147 +#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:161 msgid "Node" msgstr "节点" @@ -1227,10 +1227,8 @@ msgid "SSO" msgstr "" #: audits/signals_handler.py:60 -#, fuzzy -#| msgid "Private Token" msgid "Auth Token" -msgstr "SSH密钥" +msgstr "认证令牌" #: audits/signals_handler.py:61 #: authentication/templates/authentication/login.html:210 @@ -1245,10 +1243,8 @@ msgid "DingTalk" msgstr "钉钉" #: authentication/api/connection_token.py:249 -#, fuzzy -#| msgid "Invalid" msgid "Invalid token" -msgstr "无效" +msgstr "无效的令牌" #: authentication/api/mfa.py:60 msgid "Code is invalid" @@ -4063,7 +4059,7 @@ msgid "Security token validation" msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78 -#: xpack/plugins/cloud/serializers.py:145 +#: xpack/plugins/cloud/serializers.py:159 msgid "Account" msgstr "账户" @@ -4804,7 +4800,7 @@ msgstr "云服务商" msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:126 +#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:140 msgid "Regions" msgstr "地域" @@ -4812,7 +4808,7 @@ msgstr "地域" msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:149 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:163 msgid "Always update" msgstr "总是更新" @@ -5004,20 +5000,24 @@ msgstr "" msgid "Subscription ID" msgstr "" -#: xpack/plugins/cloud/serializers.py:124 +#: xpack/plugins/cloud/serializers.py:49 +msgid "This field is required" +msgstr "这个字段是必填项" + +#: xpack/plugins/cloud/serializers.py:138 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers.py:125 +#: xpack/plugins/cloud/serializers.py:139 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers.py:148 +#: xpack/plugins/cloud/serializers.py:162 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行" -#: xpack/plugins/cloud/utils.py:64 +#: xpack/plugins/cloud/utils.py:65 msgid "Account unavailable" msgstr "账户无效" @@ -5107,6 +5107,3 @@ msgstr "社区版" #~ msgid "Terminal command alert" #~ msgstr "终端命令告警" - -#~ msgid "This field is required" -#~ msgstr "这个字段是必填项" From c4af78c9f0fa49de146c4d7a5a9bd49c22e6573c Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 16 Jun 2021 14:41:00 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9AuthBook=E5=88=A0?= =?UTF-8?q?=E9=99=A4raise=E5=BC=82=E5=B8=B8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/backends/db.py | 5 +++-- apps/assets/models/authbook.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/assets/backends/db.py b/apps/assets/backends/db.py index aa3e1ef78..0e5d288b9 100644 --- a/apps/assets/backends/db.py +++ b/apps/assets/backends/db.py @@ -4,6 +4,7 @@ from django.utils.translation import ugettext as _ from functools import reduce from django.db.models import F, CharField, Value, IntegerField, Q, Count from django.db.models.functions import Concat +from rest_framework.exceptions import PermissionDenied from common.utils import get_object_or_none from orgs.utils import current_org @@ -250,7 +251,7 @@ class AdminUserBackend(DBBackend): ) def _perform_delete_by_union_id(self, union_id_cleaned): - raise PermissionError(_("Could not remove asset admin user")) + raise PermissionDenied(_("Could not remove asset admin user")) def all(self): qs = self.model.objects.all().annotate( @@ -314,7 +315,7 @@ class AuthbookBackend(DBBackend): authbook_id, asset_id = union_id_cleaned authbook = get_object_or_none(AuthBook, pk=authbook_id) if authbook.is_latest: - raise PermissionError(_("Latest version could not be delete")) + raise PermissionDenied(_("Latest version could not be delete")) AuthBook.objects.filter(id=authbook_id).delete() def all(self): diff --git a/apps/assets/models/authbook.py b/apps/assets/models/authbook.py index 35b7e3894..3a17df7b7 100644 --- a/apps/assets/models/authbook.py +++ b/apps/assets/models/authbook.py @@ -4,6 +4,7 @@ from django.db import models, transaction from django.db.models import Max from django.utils.translation import ugettext_lazy as _ +from rest_framework.exceptions import PermissionDenied from orgs.mixins.models import OrgManager from .base import BaseUser @@ -14,7 +15,7 @@ __all__ = ['AuthBook'] class AuthBookQuerySet(models.QuerySet): def delete(self): if self.count() > 1: - raise PermissionError(_("Bulk delete deny")) + raise PermissionDenied(_("Bulk delete deny")) return super().delete() From 1999cfdfeb185a44dc18006d9bf8e7cf9fe3653d Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 16 Jun 2021 15:13:42 +0800 Subject: [PATCH 4/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=92=89?= =?UTF-8?q?=E9=92=89=E5=91=BD=E4=BB=A4=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/notifications.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 7a87d56a6..0d7203ed2 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -16,6 +16,11 @@ CATEGORY_LABEL = _('Sessions') class CommandAlertMixin: + def get_dingtalk_msg(self) -> str: + msg = self._get_message() + msg = msg.replace('
', '') + return msg + @classmethod def post_insert_to_db(cls, subscription: SystemMsgSubscription): """ From 8f35fcd6f9ebd79ffeaf87a9b100f7c4f78149be Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 16 Jun 2021 14:38:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/notifications.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 0d7203ed2..53eeff392 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -6,6 +6,7 @@ from common.utils import get_logger, reverse from notifications.notifications import SystemMessage from terminal.models import Session, Command from notifications.models import SystemMsgSubscription +from notifications.backends import BACKEND logger = get_logger(__name__) @@ -24,14 +25,21 @@ class CommandAlertMixin: @classmethod def post_insert_to_db(cls, subscription: SystemMsgSubscription): """ - 兼容操作，试图用 `settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER` 的邮件地址找到 + 兼容操作，试图用 `settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER` 的邮件地址assets_systemuser_assets找到 用户，把用户设置为默认接收者 """ - emails = settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER.split(',') - emails = [email.strip() for email in emails] + from settings.models import Setting + db_setting = Setting.objects.filter(name='SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER').first() + if db_setting: + emails = db_setting.value + emails = emails or settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER + emails = emails.split(',') + emails = [email.strip().strip('"') for email in emails] users = User.objects.filter(email__in=emails) subscription.users.add(*users) + subscription.receive_backends = [BACKEND.EMAIL] + subscription.save() class CommandAlertMessage(CommandAlertMixin, SystemMessage): From f6273450bbbb135b6c6fc08c378db920b5d9f896 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 16 Jun 2021 18:00:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=8D=B1=E9=99=A9=E5=91=BD=E4=BB=A4=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 76536 -> 76419 bytes apps/locale/zh/LC_MESSAGES/django.po | 63 +++++++++++++-------------- apps/terminal/notifications.py | 1 - 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 1d8a1aee15b464cdb4d3878e9273f85ee60990e4..c34d92992fb7de8358c9c4c934ca9d7ac1701dd9 100644 GIT binary patch delta 18103 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 26a121717..0df73a8ea 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-16 14:26+0800\n" +"POT-Creation-Date: 2021-06-16 17:47+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -119,7 +119,7 @@ msgstr "系统用户" #: acls/models/login_asset_acl.py:22 #: applications/serializers/attrs/application_category/remote_app.py:33 -#: assets/models/asset.py:355 assets/models/authbook.py:26 +#: assets/models/asset.py:355 assets/models/authbook.py:27 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:34 #: assets/serializers/asset_user.py:48 assets/serializers/asset_user.py:91 #: assets/serializers/system_user.py:202 audits/models.py:38 @@ -184,7 +184,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. " #: users/templates/users/_select_user_modal.html:14 #: xpack/plugins/change_auth_plan/models.py:47 #: xpack/plugins/change_auth_plan/models.py:278 -#: xpack/plugins/cloud/serializers.py:65 +#: xpack/plugins/cloud/serializers.py:51 msgid "Username" msgstr "用户名" @@ -233,7 +233,7 @@ msgstr "所有复核人都不属于组织 `{}`" #: applications/const.py:9 #: applications/serializers/attrs/application_category/db.py:14 #: applications/serializers/attrs/application_type/mysql_workbench.py:26 -#: assets/backends/db.py:278 +#: assets/backends/db.py:279 msgid "Database" msgstr "数据库" @@ -304,7 +304,7 @@ msgid "Cluster" msgstr "集群" #: applications/serializers/attrs/application_category/db.py:11 -#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:63 +#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:49 msgid "Host" msgstr "主机" @@ -314,7 +314,7 @@ msgstr "主机" #: applications/serializers/attrs/application_type/oracle.py:11 #: applications/serializers/attrs/application_type/pgsql.py:11 #: assets/models/asset.py:188 assets/models/domain.py:53 -#: xpack/plugins/cloud/serializers.py:64 +#: xpack/plugins/cloud/serializers.py:50 msgid "Port" msgstr "端口" @@ -344,7 +344,7 @@ msgstr "目标URL" #: xpack/plugins/change_auth_plan/models.py:68 #: xpack/plugins/change_auth_plan/models.py:190 #: xpack/plugins/change_auth_plan/models.py:285 -#: xpack/plugins/cloud/serializers.py:67 +#: xpack/plugins/cloud/serializers.py:53 msgid "Password" msgstr "密码" @@ -376,7 +376,7 @@ msgstr "不能删除根节点 ({})" msgid "Deletion failed and the node contains assets" msgstr "删除失败，节点包含资产" -#: assets/backends/db.py:109 assets/models/user.py:304 audits/models.py:39 +#: assets/backends/db.py:110 assets/models/user.py:304 audits/models.py:39 #: perms/models/application_permission.py:31 #: perms/models/asset_permission.py:101 templates/_nav.html:45 #: terminal/backends/command/models.py:20 @@ -390,21 +390,21 @@ msgstr "删除失败，节点包含资产" msgid "System user" msgstr "系统用户" -#: assets/backends/db.py:180 +#: assets/backends/db.py:181 msgid "System user(Dynamic)" msgstr "系统用户(动态)" -#: assets/backends/db.py:232 assets/models/asset.py:196 +#: assets/backends/db.py:233 assets/models/asset.py:196 #: assets/models/cluster.py:19 assets/models/user.py:67 templates/_nav.html:44 -#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:160 +#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:146 msgid "Admin user" msgstr "管理用户" -#: assets/backends/db.py:253 +#: assets/backends/db.py:254 msgid "Could not remove asset admin user" msgstr "不能移除资产的管理用户账号" -#: assets/backends/db.py:317 +#: assets/backends/db.py:318 msgid "Latest version could not be delete" msgstr "最新版本的不能被删除" @@ -538,19 +538,19 @@ msgstr "创建者" msgid "Date created" msgstr "创建日期" -#: assets/models/authbook.py:17 +#: assets/models/authbook.py:18 msgid "Bulk delete deny" msgstr "拒绝批量删除" -#: assets/models/authbook.py:27 +#: assets/models/authbook.py:28 msgid "Latest version" msgstr "最新版本" -#: assets/models/authbook.py:28 +#: assets/models/authbook.py:29 msgid "Version" msgstr "版本" -#: assets/models/authbook.py:37 +#: assets/models/authbook.py:38 msgid "AuthBook" msgstr "" @@ -715,7 +715,7 @@ msgstr "ssh私钥" #: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:158 -#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:161 +#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:147 msgid "Node" msgstr "节点" @@ -3329,7 +3329,6 @@ msgstr "批量危险命令告警" #, python-format msgid "" "\n" -"
\n" " Assets: %(assets)s\n" "
\n" " User: %(user)s\n" @@ -3345,7 +3344,6 @@ msgid "" " " msgstr "" "\n" -"
\n" " 资产: %(assets)s\n" "
\n" " 用户: %(user)s\n" @@ -3358,10 +3356,10 @@ msgstr "" " ----------------- 命令 ----------------
\n" " " -#: terminal/notifications.py:134 +#: terminal/notifications.py:133 #, python-format msgid "Insecure Web Command Execution Alert: [%(name)s]" -msgstr "Web页面-> 命令执行 告警: [%(name)s]" +msgstr "批量危险命令告警: [%(name)s]" #: terminal/serializers/session.py:33 msgid "User ID" @@ -4059,7 +4057,7 @@ msgid "Security token validation" msgstr "安全令牌验证" #: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78 -#: xpack/plugins/cloud/serializers.py:159 +#: xpack/plugins/cloud/serializers.py:145 msgid "Account" msgstr "账户" @@ -4800,7 +4798,7 @@ msgstr "云服务商" msgid "Cloud account" msgstr "云账号" -#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:140 +#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:126 msgid "Regions" msgstr "地域" @@ -4808,7 +4806,7 @@ msgstr "地域" msgid "Hostname strategy" msgstr "主机名策略" -#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:163 +#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:149 msgid "Always update" msgstr "总是更新" @@ -5000,24 +4998,20 @@ msgstr "" msgid "Subscription ID" msgstr "" -#: xpack/plugins/cloud/serializers.py:49 -msgid "This field is required" -msgstr "这个字段是必填项" - -#: xpack/plugins/cloud/serializers.py:138 +#: xpack/plugins/cloud/serializers.py:124 msgid "History count" msgstr "执行次数" -#: xpack/plugins/cloud/serializers.py:139 +#: xpack/plugins/cloud/serializers.py:125 msgid "Instance count" msgstr "实例个数" -#: xpack/plugins/cloud/serializers.py:162 +#: xpack/plugins/cloud/serializers.py:148 #: xpack/plugins/gathered_user/serializers.py:20 msgid "Periodic display" msgstr "定时执行" -#: xpack/plugins/cloud/utils.py:65 +#: xpack/plugins/cloud/utils.py:64 msgid "Account unavailable" msgstr "账户无效" @@ -5105,5 +5099,8 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "This field is required" +#~ msgstr "这个字段是必填项" + #~ msgid "Terminal command alert" #~ msgstr "终端命令告警" diff --git a/apps/terminal/notifications.py b/apps/terminal/notifications.py index 53eeff392..088e8ecc0 100644 --- a/apps/terminal/notifications.py +++ b/apps/terminal/notifications.py @@ -119,7 +119,6 @@ class CommandExecutionAlert(CommandAlertMixin, SystemMessage): assets = ', '.join([str(asset) for asset in command['assets']]) message = _(""" -
Assets: %(assets)s
User: %(user)s From 1a30675a868d9cc9627d2a829fba80e040866852 Mon Sep 17 00:00:00 2001 From: xinwen Date: Tue, 15 Jun 2021 20:20:47 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api/command.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/terminal/api/command.py b/apps/terminal/api/command.py index b43910e26..9e3065e99 100644 --- a/apps/terminal/api/command.py +++ b/apps/terminal/api/command.py @@ -204,8 +204,6 @@ class InsecureCommandAlertAPI(generics.CreateAPIView): serializer.is_valid(raise_exception=True) commands = serializer.validated_data for command in commands: - if command['risk_level'] >= settings.SECURITY_INSECURE_COMMAND_LEVEL and \ - settings.SECURITY_INSECURE_COMMAND and \ - settings.SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER: + if command['risk_level'] >= settings.SECURITY_INSECURE_COMMAND_LEVEL: CommandAlertMessage(command).publish_async() return Response()