From 41a5a691643c955367c7dedaa2b723dda82fe836 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Fri, 14 Jun 2019 10:36:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E9=82=AE=E4=BB=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=9A?= =?UTF-8?q?=E5=8F=91=E9=80=81=E8=B4=A6=E5=8F=B7=20(#2795)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/tasks.py | 3 +- apps/jumpserver/settings.py | 1 + apps/locale/zh/LC_MESSAGES/django.mo | Bin 76615 -> 76824 bytes apps/locale/zh/LC_MESSAGES/django.po | 140 ++++++++++++++------------- apps/settings/api.py | 4 +- apps/settings/forms.py | 9 +- apps/settings/serializers.py | 1 + 7 files changed, 89 insertions(+), 69 deletions(-) diff --git a/apps/common/tasks.py b/apps/common/tasks.py index dec738921..465f46eb1 100644 --- a/apps/common/tasks.py +++ b/apps/common/tasks.py @@ -24,7 +24,8 @@ def send_mail_async(*args, **kwargs): if len(args) == 3: args = list(args) args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0] - args.insert(2, settings.EMAIL_HOST_USER) + email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER + args.insert(2, email_from) args = tuple(args) try: diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index d43006c85..7f88e980a 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -353,6 +353,7 @@ EMAIL_HOST = 'smtp.jumpserver.org' EMAIL_PORT = 25 EMAIL_HOST_USER = 'noreply@jumpserver.org' EMAIL_HOST_PASSWORD = '' +EMAIL_FROM = '' EMAIL_USE_SSL = False EMAIL_USE_TLS = False EMAIL_SUBJECT_PREFIX = '[JMS] ' diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 917c82326cd56a05150003ba3b137214597fefd1..4d24e37a15f6f9752e44d095855d013808ab31ba 100644 GIT binary patch delta 18915 zcmYk^2Y6M*y2kOffe=DMNPrM9Kms9z7P@o~(t9tWf;1yddRK5$6a<2ZOAt^|qzF<4 zr6ZlA0tzY$C?FWRN=KyL|GVeA_qlnVeSY)J%$oUTX04T?p8x)wZSJvb!Bcs%&Gz_; z&*piB@TVlt8x`hx8Ff|bd3~PoycyURU%`Ly!z`XRw6o_;BaV6A^Ty-*_+x-Ex_Dj! z?bo^zQy%gFWvKUGrt#2As&mM2B?Zzu|6hYW7O95 zK_xO2wL>#eTe}o<;ATv~-KZ@-g-Yy}wRI(}oVe3GfU(3sV{W{N?6P+kwbJK%dtM3bi#nROaS(3l&HfLgP`Z!jwZjG2 z9O`KX;*h?;0As{cyVJ+T>eL|>az!5 zW;Img!JJqPH9$Q~!?qZK>KBDmQT^wjj%F+B=nkUpp^K=q_XhApL4MScR5a_N#&3(+ zG1%Q2dSeO|qfi-th)QTVYKy->U9btY@*Nn3dr=b}vHAF&N#c)0UJ1J=EzD5oBJ1X;kLLEFWFxX8Hf!diE)Cvn>K`e(c*aQpUv#1>#iW+C6 zIo_ORzAN?oFQA~Ca2dwn=cqT?Zq&*iU^r$S;#L%i>Ysq>UmSJTPokdhHmJmgp%R#Z zgRK<7JC3YIM;B%<)ufN9rYr=a}D5EUIx=`T1i#Z(KWy%Y-{mQ)b&AB|2I+d%tR&dp4Bf>2W9vf>VjR?;al@( ztU~=+tbp<3-Goh033No=ti4b>GXgcy8>qx)U_qRZI`c13_te)|2!n?xD5J}$o9qrM z5pRNI*3}~ujb#V!~(B#Lt!-Xgn3_MVXXg#TR;y~;{8x79c=Lk)Xuz$I+_)z1+T|w z=J&Qy&`J-OM^RgN8kNX()CJilJ9D8D&X2k`ileT77WEYMLT&v()Pi2I`l(j`E^54w zF<6GeatbBzC~ANQs1<}yaj()STuEFQ2jaJw6>GfdCVC3BLrpPsPhc2vI%>TBm>ox= z5+8@U>8HQR{;R_$ROkh<3UlBdiw~mi>a(Z|ZlETJnCb>BfZ@c6sQOe?B2`g0ZGF@W z?HSZg4#Q$N8P$LJRQ6vNY@$M2whxui5!4EQ!xa1-wW93PTzeF%e>`gElC8cOMi6(z z9N5j`KGr@ImB=_$0&fQ?D1ncx!%Az|h+4sZ)MIx7wS_mV{a@5wo@2U8v@~j^DV&QMKe(HMR`4?_vxle^$7Hw+tD;`f4N(bnGP`0V@r$UP8H_rr zk*KF)GHT+*=61|S{4?sPuORnW&ws4d@* zx@ixicH$^%#n(~&?pb^ITW&|AFpHl5;uJJMDr(}2s0&-6R{jj;#6GAk9fq3V4b+4S zt$itKCq75*)J9bQuTbM0#wYL$X2Ay-uIK+T1x*k>(;Y<~RK_(>N74wR@mbUs_QBjZ z4%Kf4R>t|Lr{O!)(fo|s(X*%p-9g>dk5T=yzRmt?f=CK#D1u6)80vyFvnpz$I+zPv zpjQ4IYQ^19D^5pU|1#?OQK-bnV|kp3x_$>Lu|sdO|0CXmfNxtW;M)B zeG^o_&KQe>QP1;4a|vp~udy8dg0YzW9cKa5IHfTLYrez&>nxj7A$y~?W|BGGI{K)U zE;c_yCB7Dw@LtqCbP~1l3#hZchPvA$eRq^au?}$+OvT|r3dJdWfY0GB)CGm!bwANm z!aT&?uo4bMt!xSE2!29Mc-%aT+Ttsyd*ENxg2HCImFGhBFKh-&P*CROQD;{JwM7k3 z6Lvst;S|(_^DrMSz~;CfwSdQ%h{fl)d!Yg9o@s7&M(toaYQFx+5d^&v6m;`UMs4K` zRK`nD&;M%FSsg-c=_%Ae|DvvYjOw5LJ(p-Ssy+#IFQlS&qAF_QdZ-1qz!*LMT_~vI z0Mu5GMXhiqCgWn%z40~b)tZS)>=DLc;koYau8f+f7izpgSQ1}DCG;ukh*w*C#60>j zzgK{QR+Ng$Fb$PJHLQp&Py@b(`Edr8#l@&s?GdZLiaOiu^W8m=8@1BH7>{YF{tZzH z^}^8a|NX3DFzSp)p%NL3N^COf{g8pW@NLxDzK80!7aTf7yu!o8>+`U#cbADD!fQ3*tTU^{`j zm(s8x{^tYsUn}Ws4e6MdcqD4TX{g6(9%_Z3TD%T5&`#8fkD$gmiKX!}>iW13-FU@O zTVEYpV<*&gOM?`&RqId#>_e^S2h>rV#R7N%8=$wq-HZ)UXW9d`V`ET>PC`8mvrq}l zGnb)m){Us~525a{;7RLn1GVzNM{cX*Py-b~C04@X%GO>Bb#F94CD07Dq7JAd=x%Xu z)B=W~b}R$6lOH1eg5EL;I@>j_!rNr-Ky}=Y%J>K>p);tJUb6Tf)Jh+t9=GU^-Og1* z^{b8A;bvx6e1do|#_Rc?PC+YNgj&g3RHj={H_rjoicX?-C=<1ncd;-=FLWy}i|St; zn_)AHXQLAM6mQ}d)cC7EVP59;&80H+@0+POd$RV zE8sQ!42$wVCGa5XMRF6%VXhS}(b{G@D$%#F8g9TE__xI+gDc%#-5s;h&gHgBub!01$fxH}Fy7qXCAWlSGUkdZ!lNgIlP~$y^ zIraSapb$gF%c!#+hjBO$^`cmVn&4a10LM`YTtN+d7mHvd=cAREM&14OP*2sfs6={W z91cT`J5}v^{ufiw1nbOQs0j{ZX*`L#Cvt3bk569IfXS$Y%3FP1)B@UK5)Qz8_!cVB zMHr78FgJdOp}+r~qM(5;qXvF}+UgveoH1CNxBzNvJ7RzAhMM32>Ii>FU4IU>^6RJ- zKSnJuZnGP&IBEyVZf5_rvc^>Cf_9jW-LVYrN44KT4g3%_P{bB@6Ba<-d@WG@x}%P= zKWaf^u>ih>TJfi-aW-1KXAAqU3x1@c31*^Jn6}j=R1K9#L)64WP%n`2sD6u4Te}*c zz+I?`e?ukqH|D@B+uYViqVAPs48wXs3fiJ3sE#k7GVN_0MxpN3ai}AC9hFE1YJ&Gs z*R4U_Gn-H=+=oi=i1{n(sLr7hzK07jm}@(~u~JxrI>R1cxq)6XhoKS}k2P=#mcw0G z6t7`Z%(H`?4Dd+eNa6uIJ@0AE#JZTW%RSb;u@Z5AWG92(0tyLK>_!cA3bmCbce|ab zk6Q7ws6_f;p#VQ#qXx>@;}Y6|iNt@SRvx|A9c=;Bj+VknSOYcQc1+Uqe~^OC>@RD0 zj4hcUdY{r`Mf>?H2mXd#v#^@~^5YiqN8j*^Cl>sc?WX?+7@)o9L2fYWU;NG`Q0RMi zbEcuTzB*>Z<`}67+ECCLc0nbQj=CpCnKMu;TZHPj2TS8Y^B=5CTrql_wgX2&? zpv=YbxB(ktwIgna#$oUf6;mka=IQu@vnOh+2ca?^Y4uaBevZW-nxB~)&AsLk)HtV5 zM{>^UubK~jV1xC1M*Qd|E{3|GJm$fwm>Zi~`?Kat7QKlui~sE67tO_}$1W3So) zw&n|Fe`_C&N>u%a;v{RoV`lx$B^HDFewd7UW0b=wUyxro%s6;NI2KdYT#|)fw^^s;AY9|scE`e2uE4ccgmu?L&qt0riYw#wcGM#}+ zXg((3DvQ5CCGZ>SK|7CCG4hm~u%6iz)vpa|yyvXGcSz2EAcYb%jKG2T0jgu88z>4jaY2hq zp$4dms(%WVP)pRry-+J2jOzD_IRRDwCaT{%7*vOkD9EL#hE*1C!CJ(-EPjYuX|^-& zE{{jWRZ-V9wYZbn*XqYwJQbC|2dIRXp5gh|mTj{R$4~=ZG4GmTXWc}3Q0*yZC9AJv zaXX8X#XnK#VGW>lujyr5YY)xQpEg)J;jH;0-* z)c6?|`xXa3rl5EJr>M-nw1$1Cfe)I;&GY6>)PUYOXE@FyjJ9|g>iRY2Hmm;zHP2xe z2fg2|!v*se>L>!|orSRmaSfc0!%zc9UvLvAn8i@_rBD-8wYU-1ByNwo>E5#X#h6Dw z=6z0~0u6gZ75vg|agK{_f*R)2W@C({e=97C-BCBwL{tK^F*|;OF}NIc?`*O9y{LW% z6f?hfj6yP=wuY>i+yyb%n))ZOB=$r7^yi}n_{uzhn(&x;8Y76$qxxO5`iB;0yX^YM zVo)n7KtUIjwuUOG3u{^21hvA}R^JoVe~>u_mB1u(nmG$~Q_i*cbJVz-%zc;H|5Pe| zprRb!vxZVvT*s=Yv#f7%d(=eTE$)qliHD;mddJ#VU}@rYs0mMEPP}aGx2^uc74}~@ zTg0F4jh2GCpaE*)wx|hvpw7AvYA2>)6n==B_%qaw>_PQEWd3CJzoN!FXZ5#H2|Wl> z&;a3oxxaxVnaQXfDPeZRuEeinLp+Q1u;kyK{^ee;KPs^wPzju~_)m-?evC>W>Zjdh$N2q?0H`I^w z&qHB46)D&OKgX?&S3C7TG&29Eyg`L)L1U0}Z z)bo2Cbrgl}xC@fZil{{Dp?0PP>fY#rRk0sx+=ZBe>nuKoTF@obj^z1=^Uq5m@gKJ( zmCc%{4s|VVWp+d**u@-VPDCX#+gyU$;xDaz8^#fTk2<1r=A)n$;_teK3aE*jq9*EO zabMJcBT;Y6ai|?wVy-baV}9!Qpmy#AYP?fe9Isd$^RF8}SeSw`uYd*cY4cgsghNpS zj4>x$y^l(8K5DC1S^O2M{}J<)c?C;Qf7jx~d!g%tURerCppL8XTB8Q&X%50V#A8tj zZL|74=3&%MoV54?s^2ZttNp&k@%P=hMa(i7`nN!wD#-|*m3SZFE0gMSQd3N)<9j*QXQ}>>gE}V>X%{l^DJJ6 z>c7L{@6F#Zf%;2k*h9ClqGm}9YQXXoWNm9`YH=IX3cFf7*c^vSXqvTuZ1w9=H|I_) zf)`P*;P6N8n^q}QqJvQF!ACs*ns@;fdQMlM?$RTuBe;V)+lOZOV;9Go38?E+P>EJT zUDwd+TcBQ4&!WcZY4tB-5#lkAgKmJiROrGbsDV~uJKTYKVdU`wp?}?^7HXguP!snt zN1(2sXzf!`EA_2@5$Y&Evv?0G0sdvrKxo2CR`CFJVM4$SSjMb`ny`k&jVx|yK4w$&EhgEjY^~`R>Ws5o^HO6x^4w(<$G}w9zZ49I;*n_ zs=Y62=LVz3eFdvBzc-D7F4%?2{5#aU{|st^sBD4I&6a{1s1~Y!J+rm7cQJ>e`n_q+ zH0PKfq7qpgii7+vW({AW2Hs|VWBzRZVO~Qe`p}FCbJrzf73wQsDNINGj5pJqZ!R&{ zV(7mD+e$$h9Y8$=M=ic@hGlo{xlt=Ch=nl;mGFPe=4NM9g6S5Iw)hQmuGO!=&_4y< zL_q_8Z4KX>znPcJJE$Yc8tx`8gqo-ns=hWhz>d~FA9dEBTD;NXy{P$q3J(+sUHB^% zeW7O2B(9}#e`s28ZvTKc0>d=)j|yQst#paxuFu0wqT-fZ!9RR6sgjo(@QNi);D zf*S7z>K*$yA{Yq$LxZ@SuHgyP%2UmnsDxUYFQEnqni;76^URf~M0Z%cAJzXjYMk>H zKeqO$U}PZlm+M5-K%>lQ_y_Ta7Eg$B1HFq{=|YQFn48Rf<`3p+^H1|%GkY$#Q^C9x zwDrX>bY`fGYhWR4WN|NZusP10hPv)Oix-$HF!UROwVyz}?9X5^%o!ar=%rE6*0eGE zq9&e*O5`Kd&a5 z7i@@0`2wNu{4b%-{w>s&&&ALV;UMCbxDN}(1-!X<7PXVF z<`0Da1~V7++vGP`79-<%Md|n4>J&8LtN0}D#n2YvQ^aiwxE**4I}oQ7421qe)K~CX z;*Cp?<_@gX%xX45AXAiJJHWi`Q8DHq?z!S)nOEBf@zoo=c6WAggWz8sK; zW#*Tt_rY$|_192uKrh+#D~75sk2=~qiuL?=w1#xlgdH%ydRVCFzUC+Tc|{Gl=b`7tr=M5FR5ET@TPyXZvB)4N}Ml7{=YB&4&iOI`tn)$ zp5#AOFWB{6tC?a(;eWa6GmC$<5q5KhzIIZ7Ol`#f@HtNV0X{ELwTt>p4CgbNy6b+y z`l+$kY$PhZHhk{+ZR@v>`pZIBR{;iol7h+9D4 zJ+$lVAfI+z6YY0xkecf#EqbTwYllCpLABT;)bK;B7iQz0^N%-33@rEmZID=S3vG>Q z)240YvtF0+^}w&#FtOM_vCo;oN|F4cJZ;rpKc|stM zf3kVwv=P?!4E>(uGmIR*qwWam|F@(B<>h#a&tt!Bi^Ra!{*V?4ft>z~7KyR9sck}! z(u}I-dXc}K+N|VvliEFe^flH0t400%V~DO1&14pR{iZmJ->7A!z!(0QmSy6yaTz~y zdCO`1-7bCPZ*G|o$m<_%S-Hkc>W1*qPc9z)^v&T03Fxaf^>^{GU8lOav?cM`?$>P< zA90tKFoS2ze^u+$u#2?*?H_O5yyB~r-skfrJ?=1mQOf#1kI6^8mw1Ye&5Or7PumH< zW1GZ4j6b4Ha?{zw`Z~*}Jnc1!*YHW2oSrD(t7 zpJ|g2yN{YX)NI1H_$>2twe218Ev1jRZk#`^ZG7-CrApMq@(D2d`^5U1&nW!(>^)C; zJZ<_qz-K?@DEjHEw)ItcJbn2o_y4{Y(KedC`iY^7)h{G|M17`>$ItD4-gbopSNw|Y zx~08M?PMGA4?JVNMw(k0={WW8V9?**u3I3^FWkO<;9tK-`-GO)X-VbtA3hK53MIpD zNuj@ss{9J|f8jRz=#MoktY0zW0+jdiX+{4W{x|KD!(J!)#lOxByZt9S^bchC3p>Qe zou&3B*B;@smA;?z`N2Qbp?+YUAKNi+_Di&TS^d%->!mDJk*_<*w?VH6(`?|Qud&v) z(x25aK5*Ax-Z3HYslTsdV(fHUM$!9MdVRuYn}54wYQXmkcd8#Yfwn*W^iGuvzecH- zjivGaEDzpwB9QJa{$>C_D9(f8$~9=&=E8ZmHq*`ycKU+OX9 z<>5)~TXtykzqLs{h9wQ}lb$q8-L0qBq3_^fHIw|RAC+9cd`=&bl;y!o@F^o}0Pxy+Szxdp1Tz1d^j$T-`SRT&U^N#MPNwH@FU0w`E+~I``u0 w#hKf8TzGd`XlB=vl)3$b%uQR|C9cXlKlAMii?=Y)d#7^*(l(Zg4;0DwKaFU2hX4Qo delta 18733 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\n" "Language-Team: Jumpserver team\n" @@ -742,7 +742,7 @@ msgstr "密码或密钥密码" #: authentication/forms.py:13 #: authentication/templates/authentication/login.html:67 #: authentication/templates/authentication/new_login.html:93 -#: settings/forms.py:103 users/forms.py:15 users/forms.py:27 +#: settings/forms.py:110 users/forms.py:15 users/forms.py:27 #: users/templates/users/reset_password.html:53 #: users/templates/users/user_password_authentication.html:18 #: users/templates/users/user_password_update.html:43 @@ -809,7 +809,7 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" #: assets/templates/assets/user_asset_list.html:45 #: assets/templates/assets/user_asset_list.html:167 #: audits/templates/audits/login_log_list.html:54 -#: perms/templates/perms/asset_permission_asset.html:55 settings/forms.py:133 +#: perms/templates/perms/asset_permission_asset.html:55 settings/forms.py:140 #: users/templates/users/user_granted_asset.html:45 #: users/templates/users/user_group_granted_asset.html:45 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:51 @@ -826,7 +826,7 @@ msgstr "IP" #: assets/templates/assets/user_asset_list.html:44 #: assets/templates/assets/user_asset_list.html:166 #: perms/templates/perms/asset_permission_asset.html:54 -#: perms/templates/perms/asset_permission_list.html:77 settings/forms.py:132 +#: perms/templates/perms/asset_permission_list.html:77 settings/forms.py:139 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:50 @@ -2633,7 +2633,7 @@ msgstr "等待任务开始" msgid "Interval" msgstr "间隔" -#: ops/models/adhoc.py:38 settings/forms.py:151 +#: ops/models/adhoc.py:38 settings/forms.py:158 msgid "Units: seconds" msgstr "单位: 秒" @@ -2970,7 +2970,7 @@ msgstr "命令执行" msgid "Organization" msgstr "组织管理" -#: perms/const.py:18 settings/forms.py:136 +#: perms/const.py:18 settings/forms.py:143 msgid "All" msgstr "全部" @@ -3229,29 +3229,29 @@ msgstr "远程应用授权远程应用列表" msgid "Test mail sent to {}, please check" msgstr "邮件已经发送{}, 请检查" -#: settings/api.py:52 +#: settings/api.py:54 msgid "Test ldap success" msgstr "连接LDAP成功" -#: settings/api.py:89 +#: settings/api.py:91 msgid "Match {} s users" msgstr "匹配 {} 个用户" -#: settings/api.py:158 +#: settings/api.py:160 msgid "succeed: {} failed: {} total: {}" msgstr "成功：{} 失败：{} 总数：{}" -#: settings/api.py:180 settings/api.py:216 +#: settings/api.py:182 settings/api.py:218 msgid "" "Error: Account invalid (Please make sure the information such as Access key " "or Secret key is correct)" msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）" -#: settings/api.py:186 settings/api.py:222 +#: settings/api.py:188 settings/api.py:224 msgid "Create succeed" msgstr "创建成功" -#: settings/api.py:204 settings/api.py:242 +#: settings/api.py:206 settings/api.py:244 #: settings/templates/settings/terminal_setting.html:154 msgid "Delete succeed" msgstr "删除成功" @@ -3292,56 +3292,64 @@ msgstr "SMTP账号" msgid "SMTP password" msgstr "SMTP密码" -#: settings/forms.py:83 -msgid "Some provider use token except password" -msgstr "一些邮件提供商需要输入的是Token" +#: settings/forms.py:84 +msgid "Tips: Some provider use token except password" +msgstr "提示：一些邮件提供商需要输入的是Token" -#: settings/forms.py:86 +#: settings/forms.py:87 +msgid "Send user" +msgstr "发送账号" + +#: settings/forms.py:89 +msgid "Tips: Send mail account, default SMTP account as the send account" +msgstr "提示：发送邮件账号，默认使用 SMTP账号 作为发送账号" + +#: settings/forms.py:93 msgid "Use SSL" msgstr "使用SSL" -#: settings/forms.py:87 +#: settings/forms.py:94 msgid "If SMTP port is 465, may be select" msgstr "如果SMTP端口是465，通常需要启用SSL" -#: settings/forms.py:90 +#: settings/forms.py:97 msgid "Use TLS" msgstr "使用TLS" -#: settings/forms.py:91 +#: settings/forms.py:98 msgid "If SMTP port is 587, may be select" msgstr "如果SMTP端口是587，通常需要启用TLS" -#: settings/forms.py:97 +#: settings/forms.py:104 msgid "LDAP server" msgstr "LDAP地址" -#: settings/forms.py:100 +#: settings/forms.py:107 msgid "Bind DN" msgstr "绑定DN" -#: settings/forms.py:107 +#: settings/forms.py:114 msgid "User OU" msgstr "用户OU" -#: settings/forms.py:108 +#: settings/forms.py:115 msgid "Use | split User OUs" msgstr "使用|分隔各OU" -#: settings/forms.py:112 +#: settings/forms.py:119 msgid "User search filter" msgstr "用户过滤器" -#: settings/forms.py:113 +#: settings/forms.py:120 #, python-format msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)" msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)" -#: settings/forms.py:116 +#: settings/forms.py:123 msgid "User attr map" msgstr "LDAP属性映射" -#: settings/forms.py:118 +#: settings/forms.py:125 msgid "" "User attr map present how to map LDAP user attr to jumpserver, username,name," "email is jumpserver attr" @@ -3349,39 +3357,39 @@ msgstr "" "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name," "email 是jumpserver的属性" -#: settings/forms.py:127 +#: settings/forms.py:134 msgid "Enable LDAP auth" msgstr "启用LDAP认证" -#: settings/forms.py:137 +#: settings/forms.py:144 msgid "Auto" msgstr "自动" -#: settings/forms.py:144 +#: settings/forms.py:151 msgid "Password auth" msgstr "密码认证" -#: settings/forms.py:147 +#: settings/forms.py:154 msgid "Public key auth" msgstr "密钥认证" -#: settings/forms.py:150 +#: settings/forms.py:157 msgid "Heartbeat interval" msgstr "心跳间隔" -#: settings/forms.py:154 +#: settings/forms.py:161 msgid "List sort by" msgstr "资产列表排序" -#: settings/forms.py:157 +#: settings/forms.py:164 msgid "List page size" msgstr "资产分页每页数量" -#: settings/forms.py:160 +#: settings/forms.py:167 msgid "Session keep duration" msgstr "会话保留时长" -#: settings/forms.py:161 +#: settings/forms.py:168 msgid "" "Units: days, Session, record, command will be delete if more than duration, " "only in database" @@ -3389,62 +3397,62 @@ msgstr "" "单位：天。 会话、录像、命令记录超过该时长将会被删除(仅影响数据库存储, oss等不" "受影响)" -#: settings/forms.py:165 +#: settings/forms.py:172 msgid "Telnet login regex" msgstr "Telnet 成功正则表达式" -#: settings/forms.py:166 +#: settings/forms.py:173 msgid "ex: Last\\s*login|success|成功" msgstr "" "登录telnet服务器成功后的提示正则表达式，如: Last\\s*login|success|成功 " -#: settings/forms.py:177 +#: settings/forms.py:184 msgid "MFA Secondary certification" msgstr "MFA 二次认证" -#: settings/forms.py:179 +#: settings/forms.py:186 msgid "" "After opening, the user login must use MFA secondary authentication (valid " "for all users, including administrators)" msgstr "开启后，用户登录必须使用MFA二次认证（对所有用户有效，包括管理员）" -#: settings/forms.py:185 +#: settings/forms.py:192 msgid "Batch execute commands" msgstr "批量命令" -#: settings/forms.py:186 +#: settings/forms.py:193 msgid "Allow user batch execute commands" msgstr "允许用户批量执行命令" -#: settings/forms.py:191 +#: settings/forms.py:198 msgid "Limit the number of login failures" msgstr "限制登录失败次数" -#: settings/forms.py:195 +#: settings/forms.py:202 msgid "No logon interval" msgstr "禁止登录时间间隔" -#: settings/forms.py:197 +#: settings/forms.py:204 msgid "" "Tip: (unit/minute) if the user has failed to log in for a limited number of " "times, no login is allowed during this time interval." msgstr "" "提示：（单位：分）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录" -#: settings/forms.py:204 +#: settings/forms.py:211 msgid "Connection max idle time" msgstr "SSH最大空闲时间" -#: settings/forms.py:206 +#: settings/forms.py:213 msgid "" "If idle time more than it, disconnect connection(only ssh now) Unit: minute" msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）" -#: settings/forms.py:212 +#: settings/forms.py:219 msgid "Password expiration time" msgstr "密码过期时间" -#: settings/forms.py:214 +#: settings/forms.py:221 msgid "" "Tip: (unit: day) If the user does not update the password during the time, " "the user password will expire failure;The password expiration reminder mail " @@ -3454,81 +3462,81 @@ msgstr "" "提示：（单位：天）如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期" "提醒邮件将在密码过期前5天内由系统（每天）自动发送给用户" -#: settings/forms.py:223 +#: settings/forms.py:230 msgid "Password minimum length" msgstr "密码最小长度 " -#: settings/forms.py:227 +#: settings/forms.py:234 msgid "Must contain capital letters" msgstr "必须包含大写字母" -#: settings/forms.py:229 +#: settings/forms.py:236 msgid "" "After opening, the user password changes and resets must contain uppercase " "letters" msgstr "开启后，用户密码修改、重置必须包含大写字母" -#: settings/forms.py:234 +#: settings/forms.py:241 msgid "Must contain lowercase letters" msgstr "必须包含小写字母" -#: settings/forms.py:235 +#: settings/forms.py:242 msgid "" "After opening, the user password changes and resets must contain lowercase " "letters" msgstr "开启后，用户密码修改、重置必须包含小写字母" -#: settings/forms.py:240 +#: settings/forms.py:247 msgid "Must contain numeric characters" msgstr "必须包含数字字符" -#: settings/forms.py:241 +#: settings/forms.py:248 msgid "" "After opening, the user password changes and resets must contain numeric " "characters" msgstr "开启后，用户密码修改、重置必须包含数字字符" -#: settings/forms.py:246 +#: settings/forms.py:253 msgid "Must contain special characters" msgstr "必须包含特殊字符" -#: settings/forms.py:247 +#: settings/forms.py:254 msgid "" "After opening, the user password changes and resets must contain special " "characters" msgstr "开启后，用户密码修改、重置必须包含特殊字符" -#: settings/forms.py:254 +#: settings/forms.py:261 msgid "Create user email subject" msgstr "创建用户邮件的主题" -#: settings/forms.py:255 +#: settings/forms.py:262 msgid "" "Tips: When creating a user, send the subject of the email (eg:Create account " "successfully)" msgstr "提示: 创建用户时，发送设置密码邮件的主题 (例如: 创建用户成功)" -#: settings/forms.py:259 +#: settings/forms.py:266 msgid "Create user honorific" msgstr "创建用户邮件的敬语" -#: settings/forms.py:260 +#: settings/forms.py:267 msgid "Tips: When creating a user, send the honorific of the email (eg:Hello)" msgstr "提示: 创建用户时，发送设置密码邮件的敬语 (例如: 您好)" -#: settings/forms.py:265 +#: settings/forms.py:272 msgid "Create user email content" msgstr "创建用户邮件的内容" -#: settings/forms.py:266 +#: settings/forms.py:273 msgid "Tips:When creating a user, send the content of the email" msgstr "提示: 创建用户时，发送设置密码邮件的内容" -#: settings/forms.py:269 +#: settings/forms.py:276 msgid "Signature" msgstr "署名" -#: settings/forms.py:270 +#: settings/forms.py:277 msgid "Tips: Email signature (eg:jumpserver)" msgstr "提示: 邮件的署名 (例如: jumpserver)" diff --git a/apps/settings/api.py b/apps/settings/api.py index 29986637e..d399d207c 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -30,6 +30,7 @@ class MailTestingAPI(APIView): def post(self, request): serializer = self.serializer_class(data=request.data) if serializer.is_valid(): + email_from = serializer.validated_data["EMAIL_FROM"] email_host_user = serializer.validated_data["EMAIL_HOST_USER"] for k, v in serializer.validated_data.items(): if k.startswith('EMAIL'): @@ -37,7 +38,8 @@ class MailTestingAPI(APIView): try: subject = "Test" message = "Test smtp setting" - send_mail(subject, message, email_host_user, [email_host_user]) + email_from = email_from or email_host_user + send_mail(subject, message, email_from, [email_host_user]) except Exception as e: return Response({"error": str(e)}, status=401) diff --git a/apps/settings/forms.py b/apps/settings/forms.py index 228abb7ec..78fab4801 100644 --- a/apps/settings/forms.py +++ b/apps/settings/forms.py @@ -80,7 +80,14 @@ class EmailSettingForm(BaseForm): ) EMAIL_HOST_PASSWORD = FormEncryptCharField( max_length=1024, label=_("SMTP password"), widget=forms.PasswordInput, - required=False, help_text=_("Some provider use token except password") + required=False, + help_text=_("Tips: Some provider use token except password") + ) + EMAIL_FROM = forms.CharField( + max_length=128, label=_("Send user"), initial='', required=False, + help_text=_( + "Tips: Send mail account, default SMTP account as the send account" + ) ) EMAIL_USE_SSL = forms.BooleanField( label=_("Use SSL"), initial=False, required=False, diff --git a/apps/settings/serializers.py b/apps/settings/serializers.py index 731823df9..e0fdb0383 100644 --- a/apps/settings/serializers.py +++ b/apps/settings/serializers.py @@ -6,6 +6,7 @@ class MailTestSerializer(serializers.Serializer): EMAIL_PORT = serializers.IntegerField(default=25) EMAIL_HOST_USER = serializers.CharField(max_length=1024) EMAIL_HOST_PASSWORD = serializers.CharField() + EMAIL_FROM = serializers.CharField(required=False, allow_blank=True) EMAIL_USE_SSL = serializers.BooleanField(default=False) EMAIL_USE_TLS = serializers.BooleanField(default=False) From 50443de888b4fa7ba80a040e07f6eb98c8119172 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 20 Jun 2019 11:25:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=88=B7=E8=A2=AB=E6=8E=88=E6=9D=83=E7=9A=84?= =?UTF-8?q?RemoteApp=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/user_group_permission.py | 7 ------- apps/perms/api/user_permission.py | 11 +++++++---- apps/perms/mixins.py | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/apps/perms/api/user_group_permission.py b/apps/perms/api/user_group_permission.py index 159f76a39..841a82096 100644 --- a/apps/perms/api/user_group_permission.py +++ b/apps/perms/api/user_group_permission.py @@ -93,19 +93,12 @@ class UserGroupGrantedNodesWithAssetsAsTreeApi(ListAPIView): show_assets = True system_user_id = None - def change_org_if_need(self): - if self.request.user.is_superuser or \ - self.request.user.is_app or \ - self.kwargs.get('pk') is None: - set_to_root_org() - def get(self, request, *args, **kwargs): self.show_assets = request.query_params.get('show_assets', '1') == '1' self.system_user_id = request.query_params.get('system_user') return super().get(request, *args, **kwargs) def get_queryset(self): - self.change_org_if_need() user_group_id = self.kwargs.get('pk', '') queryset = [] group = get_object_or_404(UserGroup, id=user_group_id) diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py index b4f8fc07e..c4e86f4bd 100644 --- a/apps/perms/api/user_permission.py +++ b/apps/perms/api/user_permission.py @@ -25,7 +25,9 @@ from ..hands import ( NodeSerializer, RemoteAppSerializer, ) from .. import serializers, const -from ..mixins import AssetsFilterMixin, RemoteAppFilterMixin +from ..mixins import ( + AssetsFilterMixin, RemoteAppFilterMixin, ChangeOrgIfNeedMixin +) from ..models import Action logger = get_logger(__name__) @@ -460,7 +462,7 @@ class GetUserAssetPermissionActionsApi(UserPermissionCacheMixin, APIView): # RemoteApp permission -class UserGrantedRemoteAppsApi(RemoteAppFilterMixin, ListAPIView): +class UserGrantedRemoteAppsApi(ChangeOrgIfNeedMixin, RemoteAppFilterMixin, ListAPIView): permission_classes = (IsOrgAdminOrAppUser,) serializer_class = RemoteAppSerializer pagination_class = LimitOffsetPagination @@ -485,7 +487,7 @@ class UserGrantedRemoteAppsApi(RemoteAppFilterMixin, ListAPIView): return super().get_permissions() -class UserGrantedRemoteAppsAsTreeApi(ListAPIView): +class UserGrantedRemoteAppsAsTreeApi(ChangeOrgIfNeedMixin, ListAPIView): serializer_class = TreeNodeSerializer permission_classes = (IsOrgAdminOrAppUser,) @@ -517,10 +519,11 @@ class UserGrantedRemoteAppsAsTreeApi(ListAPIView): return super().get_permissions() -class ValidateUserRemoteAppPermissionApi(APIView): +class ValidateUserRemoteAppPermissionApi(ChangeOrgIfNeedMixin, APIView): permission_classes = (IsOrgAdminOrAppUser,) def get(self, request, *args, **kwargs): + self.change_org_if_need(request, kwargs) user_id = request.query_params.get('user_id', '') remote_app_id = request.query_params.get('remote_app_id', '') user = get_object_or_404(User, id=user_id) diff --git a/apps/perms/mixins.py b/apps/perms/mixins.py index f302285a6..f1d7fac1e 100644 --- a/apps/perms/mixins.py +++ b/apps/perms/mixins.py @@ -1,9 +1,10 @@ # ~*~ coding: utf-8 ~*~ # +from orgs.utils import set_to_root_org __all__ = [ - 'AssetsFilterMixin', 'RemoteAppFilterMixin', + 'AssetsFilterMixin', 'RemoteAppFilterMixin', 'ChangeOrgIfNeedMixin', ] @@ -100,3 +101,17 @@ class RemoteAppFilterMixin(object): queryset, key=lambda x: getattr(x, order_by), reverse=reverse ) return queryset + + +class ChangeOrgIfNeedMixin(object): + + @staticmethod + def change_org_if_need(request, kwargs): + if request.user.is_authenticated and request.user.is_superuser \ + or request.user.is_app \ + or kwargs.get('pk') is None: + set_to_root_org() + + def get(self, request, *args, **kwargs): + self.change_org_if_need(request, kwargs) + return super().get(request, *args, **kwargs) From c17d95dae0178e12c620e990dbef44c7cfc9f14c Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 20 Jun 2019 11:38:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=B5=8B=E8=AF=95=E7=9A=84=E6=8E=A5=E5=8F=97=E8=80=85?= =?UTF-8?q?=E4=B8=BA=E5=8F=91=E9=80=81=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/settings/api.py b/apps/settings/api.py index d399d207c..37d63bef1 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -39,7 +39,7 @@ class MailTestingAPI(APIView): subject = "Test" message = "Test smtp setting" email_from = email_from or email_host_user - send_mail(subject, message, email_from, [email_host_user]) + send_mail(subject, message, email_from, [email_from]) except Exception as e: return Response({"error": str(e)}, status=401)