From 0a8eeca62969da0fe36f111f97f2c4ee5e8c8953 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 11 May 2020 15:12:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E7=BC=93=E5=AD=98key=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/jumpserver/api.py b/apps/jumpserver/api.py index e272c9ff3..e98a44d6b 100644 --- a/apps/jumpserver/api.py +++ b/apps/jumpserver/api.py @@ -36,7 +36,7 @@ class MonthLoginMetricMixin: @staticmethod def get_cache_key(date, tp): date_str = date.strftime("%Y%m%d") - key = "SESSION_MONTH_{}_{}".format(tp, date_str) + key = "SESSION_MONTH_{}_{}_{}".format(current_org.id, tp, date_str) return key def __get_data_from_cache(self, date, tp): From 7b3647e78afcd6e7b9a304def196cfdd73f8e21b Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 11 May 2020 16:56:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0MFA=E6=97=B6?= =?UTF-8?q?=E8=A7=A3=E9=99=A4=E7=AE=A1=E7=90=86=E5=91=98=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 90004 -> 90055 bytes apps/locale/zh/LC_MESSAGES/django.po | 129 ++++++++++-------- ..._disable_mfa.html => user_verify_mfa.html} | 0 apps/users/views/profile/otp.py | 20 ++- 4 files changed, 87 insertions(+), 62 deletions(-) rename apps/users/templates/users/{user_disable_mfa.html => user_verify_mfa.html} (100%) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index a466cf2e82b4c775389f7513945b211882ed2112..954523412d8c88bcbd3686c3002b6b992e61039a 100644 GIT binary patch delta 26441 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 delta 26373 zcmYk^1#}hH7RK>Oun?R8!AX#y!M#Xvmm)=qySv-PwPGT&knz)erEz&`zE=p150Q&l`&G@G=hS z!d%qX@9KF;0zID>(Va=C_^PMp#m2b3JTECGL)PKtz<8Js<6tRFhSe|}TbZLV9r2II zwRlG{51zzG{Df*B+1vB7Vhv2o{9b!QrS2nu*%!1(<~Sy$7d7xR^Al>Ixc%Kg zVW@tYEzX77se-5lmc>x4gBqt3M#KJ?9tWc@jKU%c+WG^il^sWI@qJ8;pHK@*%#9Di zw3rGrV^S<*`39(gTcE}nh1&8Z7XO0DiEp6B|8D^MuYnQ`boVS0bwznGAr{3XSOsHX zGt`#1F}q_T;z8yl)Riy77PtYmBO!x4F9O3+_r4SK*@ z?NXT8QJ*Wt$FTppcQr{w!#1c1JD9!9A?8?f8tUH9M=fYM7Qt;86aT?j_!_kXpHS@+ zjCJjkqi$u^vFyKAUY3Lw(gd}DUYHYypaxotxo|6LXYQbO>;bBO;5c`SQll1-9(C)o zqMofnsBy}o?tN8@>-i|8C(#u1<8UmG+fiHl5p_!vj&}>pjJlV_Ev}0CJZNF|L2dnb z)RiwqEnu_7`%#~$r!fe9cPMCOPf+*d6>8D8 zG-~2$sPPw?D^cUEcd^ggOCg-Zuc#H>$JqEUYJhhb2ZO$M?UJBg%YvwZI-s_^Kk5R8 zqMq(3)PgsnK9CNgcIq0c-!p%n`yVjTZFL%qOGPf!y)A}XNFDS)8>ok-7wVQw#(1~_ zHQ*Lh|3j#SoW@|hh1#Jfs9PFslDnX!=zssiDQJQ`R#5@Z;E@d}H# zpxW;@FQF!Sff_gFWVevis2$0S+OfjuOF*F{1r1mOb;XU%wirg-9d&D_p>D-IRQr{v ziMESA#TbTrP_NxJ)E3`D zE$APM-=Y>4bE38BYgq_ZTWiC0(PR>{f5c#8miq()Iy@qanDjb)Hvx-7myj% zE++;tzgL`suCP3+VO3PaI;b7^4)s>FM?I`#P!mi?wOfGdw+wa5)>wWAYGM0O?ay2N zb@L(m@>B7ef*zh6bKL~h(LXUJBHtdhl><>bFab5;4Ag=apmt&vYG?MMZq4tgaW0{5 z!F^P}cbEdB&13)7G0i-;(mbfAyCUjgs)o9v4ycLypsr-7ISw_!H1yvh)I{qoK8PCc z5A!_cBEF0oKhAviUk$R%cN0XS;zFp2i(wd6L`~ctb;UhUx6FsynNg?(&anE0sE2F~ z2I3j>JZixgQ9t(YX#f?17w{ZlBIq;oyz%xyXU1*S6m6Tp!%2=TjMGm zi32d#Lig;fLS4X7)Ghb}{TFbNg0A?wRou3UN2slOhT4hri`)P?Q4<$JU2%ETGg1?^ z^({~n^)`oKR^l>4CPO&E@vDAMx9EMEaNL2b;AjZj-X z7B#_o)CKKAJ&gOX3!X-O$1J(Tjb8@+zyH^uke-Sz=2X-IwxG6lKWZT-QCoHeHPKDf z>-QLSPhX&3x4@JK(jR@%DEKTf0=43Cs4JR|x}qhhiFTp} zI)~cw8>sd{%iS#uL0w@Qiz86=xls%J3bnB6sD(9N&iz+|4pz|{b!8(l6lbG$VuRIh z$8h3bQ47D1n(z_oA$y5hV7e7s` zi81kC^9^c(PZ%BJtaMwM5cN5b3^i~B>UGS6X|N_H$1dg=OhUZKMT{qnX23?MXJ#mBq4QDWu0i$Ni1hP$2PtSv zPht$bh}!b&r~&VyI=n$XFud5SoEfn)aY@ud$73vK|fk z;ujc4@Bc>%!5F;84Up7Ki+T++qdFA8xLDHiRZ%#ejy=FHkMBrQ0QyR9`ZFv#1GHQpuL$&XS`k)$tVYmXdwMQ@~o=4rf80(y&sQy_| z&qNWk?mG5gUj(|7&{j<_qfl2c4|VUCp{{hR`7`QD4xko%4z)v1Q2pMZCJb2bt~?Ry z*-3|b+lr!YNzL`_zbaai$c#fUBd$OVd>pmF+Zc%-Q3K@I;4Fn8UBQw!q~_b`1JpZI&!EtrQ|z+%)xw;Humn@|^U z9Cc-9Fd^PR?eH^HyLg-30wa*|d|p8c8mJg*fHIf}t607<>PlOo7Sh=qgxa|Ys0GbJ zUHM|v#2ZoL97Odyi;3|TY6o6n2EG4rwz#J<7wTSDL4D-5MlEb4>Yh(P{{*N3H=+jI zk6OqX%U?(B=o3``(5<|pm=@Kqzd05|^#0GHpoeQUYKt$TuIM@@!M`yNenbtBdz*VE zN@5P;Z&5#FMp%9^YR7hY>VqdU#5p zwziDb*Fi0~3F;HC6{>$b)HBo-HO?T^IHOUwWU9GzJNvH&Tdmj7R~mttFqg%3QCHjqwPRf{7Y;@(aILvz2m7xT{Y*j~PNJ^xD(YEyg1VBR zo$g*IMb&4)5G;b4pc-mHjZjzG!Q$RlKLXWn8tPeDiW+ylk3u#IyHNw(Lk;{2b&rB~ z@n;##g6h~0_0Ww(4KNF}@MWl5v;~vnPArRmqCRp%e|GmiA8N;|pcd?_OFY$53pJ+JXM43mlCJ z_5M$xpoefVYQ>vT4R=|51ho^VP!n9j%J>-7ukb#XuZ+)$8>1%vX208^PN;T+QR7ZV zJ*4x|rz=`XL07U3HPO$ghDT6abryARucB7|FDm~I)h_x0mrsNmI29@%fqKaDp>A<0 z)Gerhx{$^Pxc_R*F96{wHy zW2hazh8p)V>e=~#;TYlj#jUU+HYU*x+v6!LjfD@p_jn*KCf<+zu*I)DA9xux(aa-! z_~2^HjX_8GLp2t`?6?l~5MIJ{_zYK}Z}Bnr-LL9z?h~&k>fxD)S@1{H7XE<|_!bLc z*m3udT<;yJ}_&Yyfh;w60Jc!zfh||1+I1iiQ2h76!UXwrEKXMs^ z4XHSV`7rCB?r*k@F$VEW)WYVYo|z4(Ej@;Mm~LQPe1p2;7-!tQPlVBl!!QstVKmHw z{`Wrz1$8Kn+M-IRfxbaK^-WM$*bd|4VN|=bmR+b|U^cw-XVlaf+kHscrc# zsAppoYTT%E?7s$FLLwWkN3HA<>UFt;y0VuR2b^~cNrXwsXF#2De3691T zI1jbpt*G&iq85DiJojG%JhF=Ss4ETnpUbC2b;yR=@`7dwEJj=&b&Ez|N1TY7_$}(5 z$G_nEhoBam4t3=PP~(;LS%a$9pgwBLx}bJq9BRv^V{2T3*)iy%`*EBf)vgU{q1{mv z3`SkZ_ZW&lpzi%P%!g+&Ir@SwxqB9lAtVZ;2CRyDHtL}UYKQ7D0JURLs0o)^ydKql zA6CTEsGUi1*XkS@8>KmfpGKTR@{g^ z@ib=oi@%8DEBqQe-*BIh>rfvs|DYE30@XkHP4{rNz?8&&(Wfh%MnN5ZL@i_uYQ>u| zbpW>j^AexC*rYDXHQw!AHBf^O))wWwP#AN7o_!4bIsHv6xwE_=sq zZEe&*O;Pu%z1bDDb-hs!=Wx_RIT6)=p~dSkBMaV-)yUtut0#(4~_W@5j9S=U_`x$Y{$4r9LaSw(*;mM}{9R7zh{^5He`6<6DThDeX6*jTz2=!-yVtRp>8ngZ_o%)l+M~9*uQ?L+OiV?+p0h2#+VVRr z-e;aLFPeAF=csYKH_lkdt>*qy(1gj&OqiTFuff zya5yI={%+aUct8b6xFfbf9_dmj#-Gm$9lLG+hDwR?vt*Uxy5{8=6~-#PkN!oTZdZk z4s##+GL!g~f_!2X$v(J`)-4AQ-bPLIFRJ|;Gww(C@P(o3 zbAIIht5Coa#ZUv6F>7KNabt^zm=jR9Y&Po3enjoiCab?}-naZqi_?B`<7daTv@iUL z{nv!`Na&ulLfwkN<`l~>MYY>)`D5l4%Re>WqZSt13-C{n0@bfDYN6%K8mM*+eAb{n zYT`bqkK%Et4ihmW&O-kJP&;~Y`QjE=K`p!?YN94)JF|y5$Q+GY;1r8z;n&RXEw+lAR`ECL;dpNO zXfbT-QCAXbW;2VU7ElxQtTaSTtCQ28W79HNl+IQj=E)e%nGpreEx=wNu;8p8)|^>Q3K4e zc#Xw7Ek1!-*hP!~viPz2!t(D>69)ykag(F^WkTh11o_;S6eFQ4uWJpOnr$rK8MUy! zmLG}9h$mRQ#Oi-Cw^{xWYKMNq3i!>1_H2SYeDcm~Qb(bBpB*#C)6XyO-&jk`Ms3-T=3dn6a@OL6Ai{Ihw~JSX-3-=v_edTIv7cO8OUDO0EEN*XcAJhlcVAPdPu>3sK zLYAP$U5`E`j#|Yz)XHy~(Gvvt|ArfZny8NX9nK+cVexy^IMEV16QbIuK`kJo#rduN zE3;xk-v10Vs7pdy*x#IiMTj@zTzrU{V00okaFjV0m0ygSXr0A-t^PO`CI2Vt*2YWh z+Gj9xC+7Xv))yy{8*8HCVHQtEUCCkdgn0(_ef|<^#~z{j#Sd{4grj~o71u7qAaU^O7@}v5dw|q@hyLzYzTUp!})o!FY z3E3H+H`^7wh2{#>)4A5-Ur_^|G%uk(QtzR5CP6Y+pWiHndX}nN+yQk9`kF&5KMMUn z|EE#VN>^LOUh}x+FQ5i^h-vT{YJmwu-B+)ysQR*~TT%tJ;NhrWRwtvbd@icpGOJ&W z@%8@iu*4D6Q+yWH@V5C7^^iS7O`IgT8!!^pu8>&*HE}sihqX`>_dtz12-W_3)WaBs zKCN&W1vOlcnqVjL+p+hjc@FiB=mO@%duFl}0seo8Tn_b1=WHyE*RTzSr*u0z7B%ra z)Iye^7P=`V?|%vk`$#Ooi`W?lrE;&y15`)-6+*@` zo@nv()V%*{xR``?V4XGCf%O#(-e*u<%h58*a zTDWVU17kD4SA>G@aT%+qYBoR()W+ie=4dm@T!ea^)|z`Q|2wMx71Xoz6t$p~>D>iq z!-9JM%TUnP3_yKyO+kIeud(M0 z09MlzG{_k6QRki-WSd@sgt2r?xn&)92;3L?N>T>Z7q7szZCT4{G2M zsD;c#EpUb94_f{l>LI*?>i-e-$r&e`yM^gcAHfAMuHOH86x5-WKf%{#)CA)#o{O4j zrFjU|{yJ)>-k6_I6UNN$3^Bt{?IJDCkGhajiuL~2v5Mwq7jq!$p&N_p@Pp+yq87Lp z_0XO|UD0Dy`vf`M6=y$wr#~YqUjQ{uMO6D*s88Ick-Yz^XlE5YP*>!$_y^R2R-*>mg!S<- z=D@T$-Cw(^pa$+@4n&PJ7S(?xYMyl#??BzceK~pm)!+gN4R9Sb(IeCVpDa$B%hl&W zZDk2mzv^aPt8Zj+d(?#8%mG$E(wu7k;G>`kSDSlL_wWyk@0tIZ@p8LQv@p~alrx*4 z7Tg!Lu$icZEmzpe6C$`Go2ZM z+VV(L|3a28i<-EK)i<$xJHNbtT`8zTA9I8`#aw_IV3oPY@~2VX{jTEI_z;6JM}B7^ zv$R z|I|mJB!xspT!(K^6E!hgTfURU{ZZd=hFUxl^{d$gi|3-gXe_q)XVgLtqAuunjE;9K z?|VQ&Tl3lsF6vgA#w>^$poZB9)xNzs2z5o1%{izGSc>Ym3U%e%QUCDjG^&4=ul)MF zuPFRWqB^F=uZy_`jZq!Dp#~a3f0)-WT<`xw3Thayg!?BP zNl?G39W~c?d zF3tO|9}+=j0=zIRiILb0^?FP~UGWB-hR3icHY)3W_?$*v(IfMdnYf($tvHie3@g&E zHtG)*^HJZ7ZkF@8dl_8bU1<{3fZ-PBH%p=aS+KY+cBNelJdA&$ZpG{h?pL#|n1lE( zYKKB92KfJff(@}Q@f0ksdLIRSLS?Mvwx$x+A^r_>$G%L*1&^{(9cOBsJVXnNbszM}4ztgc_h9YQPER zY;!s4ZP;Y-IrFCZ6xIK|#R+Pvhx?hRd+`Tqiym8j z%sTd)Ly9_XpbTa{)J-g7aRbys+gsez9D(}Cib5^yqMTIp|C3~!{h8>j@TeHAQ&O;9&u32LD~q29C2sD*8}{4W-t zLbbo_v&2pFsa3o;qt$Z_gUv)3LC56S2}`0Dx(2nN!>EZbpcZlkwSc>*3ww^5xMY3z z5$7vUArpzdsIRFDP#;mpa4BYN5a1obqu3ayG;|-rPf$Bk=sP!IFVsEmhuZq-s0AIg z{5gyNMJ+ITBmcsDUJwPXC@Cfj;7mmbr;D4{D;X%<8Bs zZjQRgU2rxILG=r5>gvNWw*IY*oD?)cVXG*HT2Lj6Yoea&#;5_iqb3}Ntk?gh#HY}b zb7xe%YN5V(d^elSxgwB%EWprRDKDmW5b9Wsx5=mBjLUhNx;yygahUi&`nSY-v@e9a zX{VzYaUL5hHMvu?%V04NgOC3+gKN0$i$V1hw;m03)W)G!zQX`r$&KLrhxQ5Rdz11E z&I7brhik1ZMgMVuKCvjVrQV;MtEvBs_#yVyx3MpeiMEJ6RBoiaj|mpwR2*P+ZK=ym zoQ}aJX)wyAL{Y%Pe$sMHKH<%lj(tZNx8P1gCbabPuru zUku!x2LDr%V-F4HVF^=3?+LXu7#|Z0NiQHS- z&$3wc^K7hnl-pV#eY)$&VC_Qm-|kC8G`Z<`jlMr%6lY0tI;zob73DX2TD~F3^0_0G8#oiIgEgMT z05geSk&jJTpI3Z5`Hw%WO$hZ>DbFL{+;VkHHH^jhGi(mNfBKK_sc)UzmA!!^E7O4g zoT2x@I=22|fDhz56K9S}^i4Y7Y)Y%Gr-(-UgT>`3KjsXyX})4<`mUlwA1pflrM^D- zjf`3duhaIVtMcYhE@FKx&Q_F*MBQi{;%oE8a2cp6MV#Y{A>%XkSLFIwyCbyG@y5(d{T0f+u^;`Ka~7oh z2W?V)F-~=I>B#j(9b>2)t%qDk6@u1GkeE|n&v$7628~7hfioAmk@!}PIrdY|LZ3Lc zh!*&YTz>kMrhJL=IjehsiO3hFeFgfSvIX!>-|G_1&F>%dC;oRUjj~V?%{p%+)=`vr zGaYjh|Bd}m!zip-?znJ`H;=PnRQCF0F z6LN1j+mrvE_y_Vju96!Y)wpgdUjQW?pJ<^Yv%}j*T#(j3TfNf1P)G+2;f_NWoeq@|Q#G@#m$C9`lbv)(t|J&HTtYdl-2{?PuDIVus z&Z-PlgPi}%6SN|iowF|kC8F*D<(1?MQ0_`jhd!i(ZOjhTSG4kZ+US_Z`G9jZbsKyn zS6W3}1{lHFnR5u|7V^btG?=qEgA5@Kx52Vgj!QWqb-8JKjW{1R+&kX9_wT;VjJgj=^=@!ZXzA_{*Ga15Z+0SLF@HMZ_m* z^NRBj(wXLOp*u@N&_wJLhC# z9m{Z`l?Tv%Kj*41`VFNVo%&yCJ6#`k&8+b^B<3?<3*rg3n9IcaBSw7U5KTtsQJhma z8eoHH}AS7ic+3T`JBbYiKG0V zOBZa2QPdoy9ENpmq~BqWlN@Zy- zQO5z|?&NjcV2s{+X!?_^#Hrt+bo@j`dOGxTp?AVMEBuen!>QL%pFTR`aO%;|O}vM4 zKH7i8W!CR0bw#PWXA{>X|A6u<^1TANX|+fkA}GY!fQCJ+;UNY&K;17mk~;l|qIG;_ z4#xeoe`awt%ExIRo%jjuI^b~P@iyKV>I29P!Ks`&`uJ2Jd6-j2P8vVQCY+Cy;0Uz= zx?m34m!j<)&Q1*e`G`rr7{Lr{+l2Z8#F@w+AXfypS)KYcqVF7X`qwl3M++*;*?^lY z*NX-^%9&Gak;Q1clw4urY@CycFIt`2H|NYneOAt2qo#fr;@eK`QL@K4kJGxk&D5B3 z7-tvay0jjRvuNwXW5i2nUxs)CZMIpTQ1TbZO(nO0TvghSNi6`@o##DcgJ=c^INPsAT7-yk=Z z@)2@Xh<_yxBHqIoIzp{|e;0aXsn_uy`&iw#miw80rP2^2;v7ijQAtuqxPyOf!4+nh zsc18g@=L2<>i;&KoJ?A3bS!72{8rvfT*As@DPOZu)UFHd7BgEpt50CwB%hdeHK;33 zj?jPPu)Y8ybBaTnqILc$`lg-+7 zqO4<&#kXAOeTVt2+>X9it-PCdE9vu_?&5hSU11d&D7Ue}W?L>L9mjF5rBg~ucS>G`u&gge{lZHd4>2W=U&bUoHsaiRHm)|xZvZD?f(D# zehRCI!1(?qd^%$+8czFSl3lddQIXtC%Lft9CcnU6!|!h7HQZftf7-aJibuSe@mg~x zCeEv$(gi8pqrT~mXHPoMwz`Sr({t)5`R@FV9Hk*>ptgta^q=x)ar7PTM$^14@{CbX;_cMb~;58XQcf3 z_?o(WoRciKoB^)WW;*9_?qP_pl@0kjnMSk<#NRlJaO&ubSs0-b<$E}kGm<`Yt=~fO zGbnGR-PfF%znDFeatYe&*ho2s)g`6fK5{9vhyN0cx53mf1!r6p>_|m@Ejo5%ptg9J zGdb=1P`|>}?HJl8njOm_e^t!*P^f zQx2!ipPa>sgKW~#wC%;2mik+m2Y*5x9dQ%wqgmXH1qWMM_1_cM!ez|wKi>1d?Kz(_ z_;wnuvmN;bhmp_88Ok}5xF+7BU0upcDbG@lI5iXA);{v{{1_$iL9+C&>DUt-Wwob5QH z6MuPBw|2^HSF`uAl8wQ0TWW*!TFl= z36oB*jt-9ybrjzkNjX lfOIKC?oJqYZ||hYJM)*`nZM!ouDN%jmTzC2HXx$Z{{dSK4UYf- diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2a2de30c3..9ea83491f 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-08 15:42+0800\n" +"POT-Creation-Date: 2020-05-11 16:53+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2769,7 +2769,7 @@ msgid "" msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）" #: authentication/errors.py:48 users/views/profile/otp.py:63 -#: users/views/profile/otp.py:102 +#: users/views/profile/otp.py:100 users/views/profile/otp.py:116 msgid "MFA code invalid, or ntp sync server time" msgstr "MFA验证码不正确，或者服务器端时间不对" @@ -2832,10 +2832,10 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:360 users/templates/users/user_disable_mfa.html:32 -#: users/templates/users/user_profile.html:94 +#: users/models/user.py:360 users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:166 +#: users/templates/users/user_verify_mfa.html:32 msgid "Disable" msgstr "禁用" @@ -2894,10 +2894,10 @@ msgstr "请打开 Google Authenticator，输入6位动态码" #: authentication/templates/authentication/login_otp.html:26 #: users/templates/users/first_login.html:100 -#: users/templates/users/user_disable_mfa.html:26 #: users/templates/users/user_otp_check_password.html:15 #: users/templates/users/user_otp_enable_bind.html:24 #: users/templates/users/user_otp_enable_install_app.html:29 +#: users/templates/users/user_verify_mfa.html:26 msgid "Next" msgstr "下一步" @@ -5766,26 +5766,6 @@ msgstr "解除用户登录限制后，此用户即可正常登录" msgid "Reset user MFA success" msgstr "重置用户多因子认证成功" -#: users/templates/users/user_disable_mfa.html:6 -#: users/templates/users/user_otp_check_password.html:6 -msgid "Authenticate" -msgstr "验证身份" - -#: users/templates/users/user_disable_mfa.html:11 -msgid "" -"The account protection has been opened, please complete the following " -"operations according to the prompts" -msgstr "账号保护已开启，请根据提示完成以下操作" - -#: users/templates/users/user_disable_mfa.html:13 -msgid "Open Authenticator and enter the 6-bit dynamic code" -msgstr "请打开 验证器，输入6位动态码" - -#: users/templates/users/user_disable_mfa.html:23 -#: users/templates/users/user_otp_enable_bind.html:22 -msgid "Six figures" -msgstr "6位数字" - #: users/templates/users/user_group_detail.html:17 #: users/templates/users/user_group_granted_asset.html:18 #: users/views/group.py:83 @@ -5844,6 +5824,11 @@ msgstr "用户已失效" msgid "User is inactive" msgstr "用户已禁用" +#: users/templates/users/user_otp_check_password.html:6 +#: users/templates/users/user_verify_mfa.html:6 +msgid "Authenticate" +msgstr "验证身份" + #: users/templates/users/user_otp_enable_bind.html:6 msgid "Bind one-time password authenticator" msgstr "绑定一次性密码验证器" @@ -5854,6 +5839,11 @@ msgid "" "code for a 6-bit verification code" msgstr "使用手机 Google Authenticator 应用扫描以下二维码，获取6位验证码" +#: users/templates/users/user_otp_enable_bind.html:22 +#: users/templates/users/user_verify_mfa.html:23 +msgid "Six figures" +msgstr "6位数字" + #: users/templates/users/user_otp_enable_install_app.html:6 msgid "Install app" msgstr "安装应用" @@ -5936,6 +5926,16 @@ msgstr "更新用户" msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" +#: users/templates/users/user_verify_mfa.html:11 +msgid "" +"The account protection has been opened, please complete the following " +"operations according to the prompts" +msgstr "账号保护已开启，请根据提示完成以下操作" + +#: users/templates/users/user_verify_mfa.html:13 +msgid "Open Authenticator and enter the 6-bit dynamic code" +msgstr "请打开 验证器，输入6位动态码" + # msgid "Update user" # msgstr "更新用户" #: users/utils.py:24 @@ -6183,19 +6183,19 @@ msgstr "首次登录" msgid "Profile setting" msgstr "个人信息设置" -#: users/views/profile/otp.py:130 +#: users/views/profile/otp.py:144 msgid "MFA enable success" msgstr "多因子认证启用成功" -#: users/views/profile/otp.py:131 +#: users/views/profile/otp.py:145 msgid "MFA enable success, return login page" msgstr "多因子认证启用成功，返回到登录页面" -#: users/views/profile/otp.py:133 +#: users/views/profile/otp.py:147 msgid "MFA disable success" msgstr "多因子认证禁用成功" -#: users/views/profile/otp.py:134 +#: users/views/profile/otp.py:148 msgid "MFA disable success, return login page" msgstr "多因子认证禁用成功，返回登录页面" @@ -6529,11 +6529,11 @@ msgstr "同步实例任务历史" msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/providers/aliyun.py:16 +#: xpack/plugins/cloud/providers/aliyun.py:19 msgid "Alibaba Cloud" msgstr "阿里云" -#: xpack/plugins/cloud/providers/aws.py:14 +#: xpack/plugins/cloud/providers/aws.py:15 msgid "AWS (International)" msgstr "AWS (国际)" @@ -6541,51 +6541,59 @@ msgstr "AWS (国际)" msgid "AWS (China)" msgstr "AWS (中国)" -#: xpack/plugins/cloud/providers/huaweicloud.py:13 +#: xpack/plugins/cloud/providers/huaweicloud.py:17 msgid "Huawei Cloud" msgstr "华为云" -#: xpack/plugins/cloud/providers/huaweicloud.py:16 -msgid "CN North-Beijing4" -msgstr "华北-北京4" - -#: xpack/plugins/cloud/providers/huaweicloud.py:17 -msgid "CN East-Shanghai1" -msgstr "华东-上海1" - -#: xpack/plugins/cloud/providers/huaweicloud.py:18 -msgid "CN East-Shanghai2" -msgstr "华东-上海2" - -#: xpack/plugins/cloud/providers/huaweicloud.py:19 -msgid "CN South-Guangzhou" -msgstr "华南-广州" - #: xpack/plugins/cloud/providers/huaweicloud.py:20 -msgid "CN Southwest-Guiyang1" -msgstr "西南-贵阳1" +msgid "AF-Johannesburg" +msgstr "非洲-约翰内斯堡" #: xpack/plugins/cloud/providers/huaweicloud.py:21 -msgid "AP-Hong-Kong" -msgstr "亚太-香港" - -#: xpack/plugins/cloud/providers/huaweicloud.py:22 msgid "AP-Bangkok" msgstr "亚太-曼谷" +#: xpack/plugins/cloud/providers/huaweicloud.py:22 +msgid "AP-Hong Kong" +msgstr "亚太-香港" + #: xpack/plugins/cloud/providers/huaweicloud.py:23 msgid "AP-Singapore" msgstr "亚太-新加坡" #: xpack/plugins/cloud/providers/huaweicloud.py:24 -msgid "AF-Johannesburg" -msgstr "非洲-约翰内斯堡" +msgid "CN East-Shanghai1" +msgstr "华东-上海1" #: xpack/plugins/cloud/providers/huaweicloud.py:25 -msgid "LA-Santiago" -msgstr "拉美-圣地亚哥" +msgid "CN East-Shanghai2" +msgstr "华东-上海2" -#: xpack/plugins/cloud/providers/qcloud.py:14 +#: xpack/plugins/cloud/providers/huaweicloud.py:26 +msgid "CN North-Beijing1" +msgstr "华北-北京1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:27 +msgid "CN North-Beijing4" +msgstr "华北-北京4" + +#: xpack/plugins/cloud/providers/huaweicloud.py:28 +msgid "CN Northeast-Dalian" +msgstr "东北-大连" + +#: xpack/plugins/cloud/providers/huaweicloud.py:29 +msgid "CN South-Guangzhou" +msgstr "华南-广州" + +#: xpack/plugins/cloud/providers/huaweicloud.py:30 +msgid "CN Southwest-Guiyang1" +msgstr "西南-贵阳1" + +#: xpack/plugins/cloud/providers/huaweicloud.py:31 +msgid "EU-Paris" +msgstr "" + +#: xpack/plugins/cloud/providers/qcloud.py:17 msgid "Tencent Cloud" msgstr "腾讯云" @@ -6981,6 +6989,9 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" +#~ msgid "LA-Santiago" +#~ msgstr "拉美-圣地亚哥" + #~ msgid "Total hosts" #~ msgstr "主机总数" diff --git a/apps/users/templates/users/user_disable_mfa.html b/apps/users/templates/users/user_verify_mfa.html similarity index 100% rename from apps/users/templates/users/user_disable_mfa.html rename to apps/users/templates/users/user_verify_mfa.html diff --git a/apps/users/views/profile/otp.py b/apps/users/views/profile/otp.py index 7bae70c58..2d823f5ab 100644 --- a/apps/users/views/profile/otp.py +++ b/apps/users/views/profile/otp.py @@ -83,12 +83,26 @@ class UserOtpEnableBindView(TemplateView, FormView): return super().get_context_data(**kwargs) -class UserDisableMFAView(FormView): - template_name = 'users/user_disable_mfa.html' +class UserVerifyMFAView(FormView): + template_name = 'users/user_verify_mfa.html' form_class = forms.UserCheckOtpCodeForm success_url = reverse_lazy('users:user-otp-settings-success') permission_classes = [IsValidUser] + def form_valid(self, form): + user = self.request.user + otp_code = form.cleaned_data.get('otp_code') + + valid = user.check_mfa(otp_code) + if valid: + return super().form_valid(form) + else: + error = _('MFA code invalid, or ntp sync server time') + form.add_error('otp_code', error) + return super().form_invalid(form) + + +class UserDisableMFAView(UserVerifyMFAView): def form_valid(self, form): user = self.request.user otp_code = form.cleaned_data.get('otp_code') @@ -104,7 +118,7 @@ class UserDisableMFAView(FormView): return super().form_invalid(form) -class UserOtpUpdateView(UserDisableMFAView): +class UserOtpUpdateView(UserVerifyMFAView): success_url = reverse_lazy('users:user-otp-enable-bind')