From 2a0e68c58fee5cb7244d8d27af5e7b0a18320197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Wed, 16 Jan 2019 18:13:16 +0800 Subject: [PATCH] Bugfix (#2350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 权限页面增加过滤规则 * [Update] 修改terminal注册，更新以后使用api完成 * [Update] 修改terminal注册，更新以后使用api完成 * [Update] 修改更新注册逻辑 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 60393 -> 60438 bytes apps/locale/zh/LC_MESSAGES/django.po | 36 ++++---- apps/static/js/jumpserver.js | 85 +++++++++++++++++- apps/terminal/api/v2/terminal.py | 23 ++++- apps/terminal/forms.py | 2 - apps/terminal/serializers/v1.py | 2 - apps/terminal/serializers/v2.py | 56 +++++++----- .../templates/terminal/terminal_update.html | 18 ++-- apps/terminal/urls/api_urls_v2.py | 3 +- apps/users/api/v2/user.py | 2 +- apps/users/serializers/v2.py | 22 +++-- 11 files changed, 182 insertions(+), 67 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index fc4e8e96f82b708c2f8f26926011c27b46df5048..cf3c41fc8a31b9470cd64970f815eca91b8c55c9 100644 GIT binary patch delta 13541 zcmXZh37n5r`^WKnRx_9xGnO)AnUQ72j3LHE_OWD5c1_umiOSZDB+HFtZHmS&L`ak+ zJw=41D58vticFF;HOQ|Mz{J``p(#=Q`)UfAe_G{}3|&ScrczE_9y9 z|7C@EUIk2x_q;x#p4T`-t)923wddvIW_%Hwweh@}_%Tkz)(?4JVUXv2fqQUqJI_l9 zCPxR_xj&|p%iHN;&x<2|8q4B%4EH?WE8rrEhQ(L{*J3&R04w7GWIo&4#Zcn8vc#Rc<&?57I>2QX;l7pT|BQe_P}t)_l9txm5;zOn2*J9B}U^q)Pviw zBz|rlK_&VHS&4Vm{1>&Lpst=5gE4pyRz^Ml08(tP6-F|?*Om)Spex4VaE!pon1HiT z6L{O&w_p|G9jNDiK~?BBYT`lNJg*c+q81d7VOSfBV|}wZ`mr>0;6gL)gHPa4)C#`A z>Ua`UFswV1!`hgO%aJj?(mgznE?$oLF{(YfC#%H)s0l1WRcbk^0&99wf8AI|Lo3{b z+SBW(iB;|8R-TDE3t3nipFmCUdDP0Mpz_Q>mH0K(*1dt{a6PJmd#wEss^5uT)L)4% zSch9!l{mDwD^&_AQ3lq+mKcd6Q3=MP`cFrd{5{l`?L?jOACVWzyMkJIiAPIM!Eu4>aaE;yn0hO=F?w_;vTd0cp z!P%|?5vY#k%!;UlRWVQj)P!214q02g2OmL|cra>0J}S=))I?`vd0dIA&aD1NN>mLSVkT<95vYlcMorvD^?wbOenptUgx7qxf-?7jTn!gqbhLAiG+(#J5o^FV^2xDh4&-MAYG} ziCR!?R3#es_gzD48kDdrs>FR!6Bv$4JOQ=R85XZXCEkcixDA!?3)F-Tqb5>>+UxVE zGw~0q;!y)!rONnRXy7WSj_Ig@o1$ji3H3l%+<}jx5|`sUt${0Ia^?VQ1 zM6*!~c@h(GI95V`HW%%=*oar~UsR%t16_h^s0sXo+FS2QH$XH7CXVW#jt}7jSQC9~ zUx)h8Y(ee$HcY`oNIu`Y#f1h4ALL3Og_>z4)JjuO1Ke*uh^kaebxX{Y(qDmT-<4P2diW{L4w8e1jf=bXEHDG^he-`x? z^I7po92Fh9l)#3!&0rVL^KHKXhyp4Ss+VmmCta7=yL4Oka7(Pp>}JK&2L z_KfFM#EGa0Eki9}mBsI%@^8dq_zOnhS=8CM@(lHlgTYVxR)nJ_j|CH&EY`75FZ`kHfIvQ1^3x$mc={k6=kWiCW1;)Bt~>Dsda5 zFodUd$YN3VlTlyJdZ?APv$!kjEDc8We*vTMHPn_Yv)KQX3l01YY9c34iO*v-yoQ=k z{BYNvi0YS$TJZzc-WOG&A*hMuT0G9~PeqM0$Kqwk!hG)?E~2@y36pRahF}ru$LI{| z^aqV_r#1ogYgY?3P#a9a&Zw;#gPK@A>hynrTF5@sIDcR%yp4hPKWd~aaT(Og5>P9y zfjTs`Fb38~U94WA;9&_rE0k9pjkWgasDAmVgbPspKEPP~1oix3)D|8^E#w!}89IaNcL`O2JLv0IEhg8! zw>2@aVpM|qs0lR3IP8QfVSm($hodSp1=VjZ*25L3Jl|p9Ora)v9<{Z9+x;84?7tG< zu^X{@Zs4-02NF?XRQHq%iP&hWX= z7BoRsqBl0fXRrpY$EsL}8t@jX0yRdv1Zie{)JmJ8O5PE*1-(%d>yH|6ggFLvmi)|a1-l_m5E2AwqgNl%a)nzQ7hky8gM77-+sJT z@Bd*gG}Cja*W(ImD`LjD$|Rx^G(tVt0@c5*#gCx&yccTaIan5-L!E)?*1i?hZ!ace zAqL+6+gxPR5W+8tI`lP%q6Qv^n)zf@1zy2=xB}JxJ1mF4VH*C2`c5Q|b?t3XrSF5< zq8!vh@}%DXv0SLclTiasL%k;X>VR`lC0&S`$ZFI|H=@qWc56Rm9zzZEtHoE$f2}=q zoSRS_`kGk+7ux%(s1;?P25yOo*dBEjoBrt@FXf>E~?)&)QSsG{nwx>w*@&&-d1dd-(mumo8VsK zx~Pe?$G}^G%HMwi_1DF48gytTpjJ2+wb!ex<2KYp_MFwK%fvCh!TbygYh#F`TY6UYaUVxhTa!kezs7m~R>i09MQWwns z!+7FS6J148Q5E!Ca-l=@2x?EWF|gOD8IMP;dU3$Y?@K&|i~s{b);j~6ViKgmtt zA-qa^HY)$alik4mkmr5xSuV8l7f=(KWX?i8Fb`F#HK-YHMy+rss?-Nj&mS>=LT%x1 zsD9T_d4gYZ`AefJQxRhs->bt#A`Mxn5)MS|*{Yk8GVfD#6{?9Mx|!DnKeYM{0V#jXJSL#gT?SR zhGOU}wJC$;nPonV z(cI5Q4Lk&caTtc+NGyS)P=|FAYNFFoXJt03GD|TU|3&qWe9iSQ`x^BxPD2G6bh>Mx zUXv!M2YRFS@+nlpF{r~c6)WK))JnFZp8p2*{O=frL9<<+7}WEXuqLLW#_j2I5yQm* z)IcLGehKvjE5JnDh&mJBpeAqzHSjIe^QGpvl_jF`q@gO&)NF&1#1G>$*c+A4-^+zc zdmL4olcyB~Q z7vuH*kK{rFzJjH38Ajmys1k2S?R6oB;olgj3e89mZ<(6 zP~&7{;NSm-aiPO88nwbHsF}`2z5k1GGd7;@w(2sf|5elg-U9bN7sDjNOl*g}u~ZQM z;)%_Pw=8t8<29_Sev7ETIu7ANd%6Y7;vv*be?tv$74^Wsn2xm;y9qvy+JYR^%10v~ zLvI@D`4UU`?+i>J9`&Ic{6^rPkGyj@hPcyGn)y6?`_r+T z;zDeV<=41xd_Qv>eogx#ROz33+nI;q#FJ1Hnr`h&tbMJ;8_gZ&m*)4rU7SWGx`NvK zo7Nt*)(sSmdK(ff&Or5Vfhv7lYwwNP!a){~HK(Kc&9iv5#s2%&um_d!u=%}t!u$<2 zv5Tk*TsMQ?aVw88tKcB+*T+a)f>m)fCgWGw3$J2-9g7a@+<)VF*Sut=t#|FuVnZHy z7d64(F%ti<_@;RWAEZ6(UH7^+N4;kKP!rCzc%nHMqjW6Sa-qZ@nxB|^u_WyW%wy&m zR4Mi>@!vdP6!<~?Q-YC)+M*WE<@GiYdRH%8ix7chqQ$=3e5wJ$=Q=C?2t_uKuuW;owz zRU!&CP`sIh)rpgF7|O^j!F=Zx}RjGqqeM(*$efF&P9Iuz4uW4+irEw_b?wvwGTw)AF-AFSHnc>kdOL? z&&3*e*xGNJcQBUrux;*xbr0(KhNy|Q!BW@>wUvFXeK4xuaEr%T{L(h+-f|F)Bp*nfvcegNVB*h>I^iu_HL;D{mrLQ&*k}cG1i=n_i|%~#Vb*X z-!VT#Rpv8`FPgVdB@Nr|`jOh3yD)M13o}a zpb(Yt6zaF)ENX?3JKX&WsEMbbR+@$C-_h)5?b)b_KIz(hFOLgNU@R)ZRMdaRTW+qz zbmGc?R-fJE( zk6;VhkE0SL>~{T>iO^N{yFnH#?v1BnafiVmA|Ta|7X-+e=0S#hNn=6ClB=p!USud zX3jNNm>bOPs0r*xo$8-31jF~b??G`h0hK=uwKbW0slPt0ZD`2E?$&V@RwI7H;ytK| z7NS;g8%ty4=e9DlD(Zf!#SP46W*gK*JDL4`yU0b&XsS8i+Sg!N+P9&$V@-+i#+Q2oJlWdBE4!)S8?YNjvaeYg;naEJM&-Txl7lJge-WA{sb=_*+sbw=u<`n9q4 zo~SJyu2}E?%hq8TYM>36fZNRzDrCZO7@US6Evrq$fws;t7z_F-2ld&t# zJ7DksIU1_a5PQ%i%0La!)a-yt&>J;SKZ}Q;4($kwXP^e2jT&g9#d}a&P=w0!mwD?T z^;g4P8cJgL*Ur+Y2NLmqtYh&L=5wflC!?NUf-m7pRG#XGob^!mo1-TF5GrpM)c0n9 z&xIaXh??iCWQd^R)Sgc@s6kpl{qC9uXL*j9JfFP&=)xuknXk`$UW(&PP4J z)Y?~>o6Vi(0aT%mS^O6&-yMr%zjgU4p~g=~t7y~r@F<>P|tP5Ug-C;hL6mz@H970Sp4aCF40l5$h>U+XGVPQ`js`SU^IDZ zqs~-Q)C3O9|t59Fm&33;KlZk&seaAw6uoaulumbJ9 zQ5778s=#DSW_)iR7o}*}iIwp%>O=NtpaZKo<`O@E8YmkZ;!D^AKS3ofeVqRl1{1Lt zeuVd8%#Y4w)cqEiiN~-O<9jhbxkJ$eQ;EA_F8Y{&S22+2XE*a?R7o3QIqZOK@d<2= z>rtouFH{BpLrpOF1V4NjgZv5O`RFg?qV-ApAFD7+9e!~u>xyNF*J3PwVje~%EMf~&dM*+5w$(UA{nb#H2JJ~hd=Wch3EYQTNg=A=35$P2Rp7FD z2Q`uCB9|ut6{lmMQdohwgWVsDWr@cY`L4usXwU=inID_`P>1TM#W&5+UtRxLvl40n zsi>`LYVEzO{YlhTjkfkz%_Tk;n&Dd1O1GMOP%A!&-LMcfKn>nawLfUKKux?Y>V6MY zzQGuQFQD>HLT$w?)M1~46VPADMFTF9eshVk&8JX_^6){Nf*N2KD&Y~k|Fd}sRnprQ z$DMKgs-W_unT=5s?&$QrN4cm)LymQri%G<*TnFz9YcE6%aN6R3%*fx}K;=;rybmj4 zCTgJW);<6O3&L>Pr(mSs|5;pw&@eC1z;6JC6TgK@u+IF*+V`3V%p>M;97F$8NLnxZ ztjqf&s$wTG9M54j{1a2vvFtg%PS^r3<6>-!GtTpmqj&_2~0Ye8R4jZ1AIBM9Ck)s9`9$4-l2Z08Z`q2F z$ddI%S(>tw?AaoslJNfi&$-?{efpm3oO7RZo#lR>nQ6wckSj++{L?X^AA0=LIK=Zx zV432c*E!VlDyON|^FC?jd6RJg4#$+{p7%B`!_io?h3EYg6pdK1Sgz)PqYg0>3i1 zqXs&Nti(HSUPUeF7UsuCSQPU=>z*%%Y_^w%d6?g;LqQ2N!5Hj{;W!xMa0DuWkF0(X zCK0bdJ$DebL)TG>-@<6ThgwkHww{*@OJQCtYgR+Q02TEqDAT902X;oSU@Io$0jz*` z@l`C9>3KtNDl&%`@|@?<Ie6zcQOeMN|9)b*2|l zi4|(^R-TNy3pKDHK8s4QH)`cssByAUN93c9?p-W`vr#*^+UmEU`t5Je{%fEU*5NXi zA-;p!s@M*0pfXs6I2H3?chms=QT>OZwtOz?$iBeB_#N^>d1p{7zmMAK;OAXJF+K%N z6pz}H3aE}%P%BGAO;p$7=BS-{5|v12jK@Bxf#1YxIK$d^qsGgz_G4Cm8MR~nZ3^0f zzfm2-Iyxg!0~SJUWf@dLsi;d<2a94O)E0L@CG;w4oNQF0qcIlWNA1uGEQXtr1^eC+ z3VQH_dBMD4{%r<#a&JWhYM{bc7n4yFc0(oB2bK7%sJF;RjXw!>x8BDT+=iig|8G&y zR{V+D>VHuK<$1wb0QI`XVsmVOTG=?%%0EQy&her97oc`%BdXs4)bl4$17An2{4dl_JwhcM-OXLz z;;4j5p?0EjH{Vs%q(TEWK|RP}oi?f3)KPKEm2-NZ4dj`668tD;`F$50P6!A;l_HE7cZx=uj7Ept)Nt-=)i3N_zF^tFP&C}_ZtzOG{eYT&XKr(ig78Y=V0Fc-E$ z^~=Cy?1;fQ#vG4H#1qYB_$2XutcJ1uIDci-svqw@4#$?5gJBr=lAACIm1qiX!1_2G z?_xtAhEk zHs-}AEN+c~9kBW_s6^gHUFvDL0vF;d*k*wHy5Hhc(16=90uP|J_9SY8v#6c8j*<8W z>XHR9irR~zJ~>OHR#w;ICaAmA0oA`RMxl>7k}3a>zoejvx1ti+j~e(mmcZ4Kp;!rCtXZ5X7JM=s%k)9U6Z0)b1<{4x06l7t(HEfiJGVuR=|d+qw0rBY!vGDFGeloYt%eHV>DjJ!2ACoP~f}W88FjY17L5!G)o7QoL@&wqE3zP&;q~eSNDvqM-M- z_z+t$YJjq+1gc>SK8D)D4AhFdqIM<=)o(ne;xyFG?ZUvFLM3_}b+qTK{n8N5UjyH; zhM+7raW2#Y(WrrAQMW%CwZb&i%Icz4))3XdIV!<6n1WqU&rQLCILBOt`h?t>#s2Fo zPf?*Qxod_EbsdVLwk!qp+B7y_#Hz#-t$iJ8C-$H&?J@HXYA2#!a|stS<53Bh@hRvC zs-Siv9UEdNEQhnP4DLWpcp0?=MPGLVlrYPpR$3LcyfCA6R`$J%)Nc&Y+Is5o%|mv)urdP!Co|^{-=bBh;CTJk4K?5{EP{uyGG0S{P81vA>T994{%O<^ zwL>lBMXC3{KLu^^VAO=Kqh6Cy>VRWVTRI7q$cLzv&PUyu}YvZqA92yN%yUxEo$J77WXt?LQOOXwSsJmC!!Lcisf-0YA1H1`t3vQ)Cu!9 zEKcl=b~_S>+Ce{+f-Y4f)S0xxz*(d2zyQ?Bvrs!U2}|NU)CxDD`tQM3c*5ecV_X8Y z@ek@-p~ioFtedzE^1Sc8KtU_-i%MjWIRf>-1k_f|KxMoDwZbn@TfGVO{C4wu)Da#+ z^}B!?=Qe8mkZ~@tNGzapNuZEGLk-jxwnd#;2df{AdcPN-&Tc)Hz#P;>H_V4vlQ?R; z+mWW2MBEN_m$FeuH3bv#Yb?k7-f;^3Fld6iz5P)StilDj3x{E!H|-M=OA|lBZ?N=4 z&wBw+V;0t*q^Kp!# zy%lQW=P?+&U#HH^o%P%Bx2dONnFoRz@3{}SIMlq&eG2(0JcF93 zyTwCLpJ3xK0q3Lc#8y-Shfxz>Mm_IMb1RERjZ*@(6IIPxsN4TI_Q!P8c>Y=n+SQSA4G~ z1r5{^qcIZ;U@z2Vc^$RF_fP|UV(|)8|4pcs?MEeY6qUe5)Pw~-aBoWjs$Wx#!PZz@ z?|*j+ns6i*#3>k#3sGCV9Cg+^Fc+S~z|LS`XHfkkKXi!}LG?>UU9!rkol8aauaBCi z6$bwP*M)*EM<3J*vrw6iM!o-U`IqJU)%R&*sv+i;flN@mmZ2KA(%h3%+UrACGicy~y4E zmlnH;-a(z+91O*ks2y92I)bgJquh(7@TAq>$BM+E|8b_EzQj8IhxA5M7)C`iyoV*Q z;it|Qa6fT2YRg-E=FCLxOm|d5eXV|k)laf`syWA8YOXVP_!KnI52!OgY7J-28>qM7 zzQu)>xc-T#x1u~Mu{x-uYi4mLvoEUOP>Uy6{JzEhLJCS?rMb@BZ0F9+zQz{0X~ZrDcI%bbRk!SMc_k5zF0gKu=*^I=+ia@V}S` z_gj3_JdO3JzleHG6IQs_t05}kwib6YvrwNClQ8h}|BOI^Ka-h@F@g@u&GqIk)K>mz z@i~icq7r+AT4|oo-SaifhN$|dEFNl(#dy6QQ?23))LCytZS5h8f3SPM zT_WMA1S8B?%uAe%;aDAYS?jIj{Z}EwI`&3wNbzVTDZj8e=#qiR{WdA|Cm91 zZYNV8j;~+}s^2`+0+;&~G~pK1P8={VpuYeAK|N4pwR@m6Dz0Tdfl4&P;`SE5X!f`I z!KitBi>LlSoOVFv~#G|!vATl)ixqu08AB~cSrG#|7246`%p?!073v1nGs*PIMz%?O^|9fxBBN%iS)MEH{X?d|7TLr1fN>N z=N5m1k<@QPo!vpJ{{@xECG!tcKYOb_5;b0NGZFdb_R3ql9o26y`YIf;hV!V2u3G#L zsy&GBVi|?HlyPQl)JJq%l-&g1S;WJ)E!8$`czc^MrJEizf7}}Z-pLMjD~&|k40tvmN^5p zGm9+#-aLld(u)?~MNJUA(LJ9B^^;B!RDBv&#QLa@WWTpH48k}nhM~R#K0qa~2KC@p z)Yk7tt?-Jq|BFgI&nCChBvk*(W~$ZKLnYeO>NAl9e6JG)4bU6)yPa>2#j3;;%(d8= z_&hek#+#jEu?g`G?2TbtTml173&^r~49+B;g#9t;TYV65{!=I@L?yV4b;x!&er~# z#pBF5sOP`3_C4ldEKdD7)Hn~UK6HnhrvU0FqWB%`zb0-$gBzL;6cOhzSI#cX7@^(pAG^fq6!hBvV=^)pdNveMjRo;CkLC06ji zZsG*gO3Rtm&HAW*&9DqUYq9@21x+v>!*H%OEH=Ni`Yosx>_Y9-F^jLD2L9K~v)jc* z%+jdms-YJ8gvD)LyYKaO1#bv8q{Cv}o8?~ZC7N55EYZyoUZHuG!xQPp!NoI=K z05xt)Gb149-`*;^pfc@+rEwT)Wpm7>*1it4lD!rmxAyC(oxF#-BQbkjzhqQ>E!2^= zvACDoncsVZf+m`RTG4FtYgEQRS^Ei#f3^4qYQXyz7x>P7N5o@1_02I6d!f#JB5J%9 zm#@aX1$BeAoeJK~#GJD)DltajIi2Y>etZ z%%`A?CtyYV7&XBT)Y+aw4Rjmzz&(q@4!ZhCvyd5QCZYOQFl(7lm>H;f{mxb~5c5(o z%A90QH|Jq~+LxkMw87kA?l+I35<_Bj%GXY5;*sC%ZLp_&-eX+j9i*vY!YS>JL)^-Gy$Qe}b zznXVY69xU~>I<2PW>vGknT{IoIn;Pvt-d$rA|8U;^XwnFhLtIdw+>&T653+%QPcnz z%xf4zeB0tb%?D=aPp*GH)B<8qx2Y6{Voj^BhcU!0d@FQBO+3JS6E(nma|P;w4dy;n zV!v2?3Dy4|YMih`E-r<7t}?dAh8BNh`pYPsr(v^IEI8~QTx)JK511#-%jR7(_=x)x zWPa2gh({$@)vSq1uz}gq>3i+0q9^Ksffm1Rjz@i%PP6tksL!x(P#0c_z#?c-f_3J zA7L@Vn`Zb4*Pe*As9%p&)Q*L*~(@3PZ3f>TBpH3=D+IJp7c~(l{(aTnW>$ z2{yxbP`5n?wSy;737*4O@h0-qir4jLKIX9OY4^XUwxHic9VlpJHGXmbZ(|A$kkOhrEY47HLqsE(U0 z-if+Y2h7u`L~fu4x^HpRS=%WrL474udpc^%JE3-X5bF8KXMIos|4cr}d6#Y@ReGtBZW3dhfU2x<0^{mhWHBctj!xvE#%tsBl+S)gn z`%qhY%HrFoe!&;rI1y$ERKk_bx~R9Hxoh{mEDDKKjJFP-x(06zYJwdWA2+X{Cc1}8 zFyxZ`qK%p;4OQP50}H}1;ulfR^~Vq#8i+anYzkpij6)6Zw)v6OFE*E(tIZ9VP5-UP zFkZc1-N4_VCfb5wxChJPL9B##u>&Sv<^t=%;S}^f_q)Q!Bd*4(coVf%@mJlgeG0X* zzNkb;n3M2v;tw$s51|sMaLx5kMZNdUQT4xI5S9$~yy;EThQXRGY005Mjn`bP^G--m jqcwvXgmsxdan`lmH501Wu2-|xn(W!XwV6KT+M@pfK0^rL diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index eff28a6d0..92e081d08 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: 2019-01-15 17:56+0800\n" +"POT-Creation-Date: 2019-01-16 17:58+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -67,8 +67,8 @@ msgstr "网域" #: assets/templates/assets/asset_update.html:35 perms/forms.py:45 #: perms/forms.py:52 perms/models.py:85 #: perms/templates/perms/asset_permission_list.html:57 -#: perms/templates/perms/asset_permission_list.html:77 -#: perms/templates/perms/asset_permission_list.html:126 +#: perms/templates/perms/asset_permission_list.html:78 +#: perms/templates/perms/asset_permission_list.html:128 #: xpack/plugins/cloud/models.py:123 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:63 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 @@ -119,7 +119,7 @@ msgstr "端口" #: perms/models.py:31 #: perms/templates/perms/asset_permission_create_update.html:45 #: perms/templates/perms/asset_permission_list.html:56 -#: perms/templates/perms/asset_permission_list.html:123 +#: perms/templates/perms/asset_permission_list.html:125 #: terminal/backends/command/models.py:13 terminal/models.py:143 #: terminal/templates/terminal/command_list.html:40 #: terminal/templates/terminal/command_list.html:73 @@ -185,7 +185,7 @@ msgstr "名称" #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:30 #: audits/templates/audits/login_log_list.html:49 -#: perms/templates/perms/asset_permission_list.html:76 +#: perms/templates/perms/asset_permission_list.html:74 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:15 #: users/forms.py:33 users/models/authentication.py:77 users/models/user.py:53 #: users/templates/users/_select_user_modal.html:14 @@ -277,7 +277,7 @@ msgstr "IP" #: assets/templates/assets/user_asset_list.html:45 #: assets/templates/assets/user_asset_list.html:150 common/forms.py:130 #: perms/templates/perms/asset_permission_asset.html:54 -#: perms/templates/perms/asset_permission_list.html:75 +#: perms/templates/perms/asset_permission_list.html:77 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 msgid "Hostname" @@ -637,7 +637,7 @@ msgstr "默认资产组" #: perms/models.py:29 #: perms/templates/perms/asset_permission_create_update.html:41 #: perms/templates/perms/asset_permission_list.html:54 -#: perms/templates/perms/asset_permission_list.html:117 templates/index.html:87 +#: perms/templates/perms/asset_permission_list.html:119 templates/index.html:87 #: terminal/backends/command/models.py:12 terminal/models.py:142 #: terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 @@ -724,7 +724,8 @@ msgstr "登录模式" #: perms/models.py:33 perms/models.py:87 #: perms/templates/perms/asset_permission_detail.html:140 #: perms/templates/perms/asset_permission_list.html:58 -#: perms/templates/perms/asset_permission_list.html:129 templates/_nav.html:25 +#: perms/templates/perms/asset_permission_list.html:79 +#: perms/templates/perms/asset_permission_list.html:131 templates/_nav.html:25 #: terminal/backends/command/models.py:14 terminal/models.py:144 #: terminal/templates/terminal/command_list.html:48 #: terminal/templates/terminal/command_list.html:74 @@ -884,7 +885,7 @@ msgstr "自动生成密钥" #: assets/templates/assets/asset_update.html:64 #: assets/templates/assets/gateway_create_update.html:53 #: perms/templates/perms/asset_permission_create_update.html:50 -#: terminal/templates/terminal/terminal_update.html:42 +#: terminal/templates/terminal/terminal_update.html:40 msgid "Other" msgstr "其它" @@ -906,7 +907,7 @@ msgstr "其它" #: common/templates/common/security_setting.html:70 #: common/templates/common/terminal_setting.html:68 #: perms/templates/perms/asset_permission_create_update.html:80 -#: terminal/templates/terminal/terminal_update.html:47 +#: terminal/templates/terminal/terminal_update.html:45 #: users/templates/users/_user.html:50 #: users/templates/users/user_bulk_update.html:23 #: users/templates/users/user_detail.html:176 @@ -941,7 +942,7 @@ msgstr "重置" #: perms/templates/perms/asset_permission_create_update.html:81 #: terminal/templates/terminal/command_list.html:103 #: terminal/templates/terminal/session_list.html:127 -#: terminal/templates/terminal/terminal_update.html:48 +#: terminal/templates/terminal/terminal_update.html:46 #: users/templates/users/_user.html:51 #: users/templates/users/forgot_password.html:45 #: users/templates/users/user_bulk_update.html:24 @@ -1025,7 +1026,7 @@ msgstr "测试" #: assets/templates/assets/system_user_detail.html:26 #: assets/templates/assets/system_user_list.html:92 audits/models.py:32 #: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:175 +#: perms/templates/perms/asset_permission_list.html:177 #: terminal/templates/terminal/terminal_detail.html:16 #: terminal/templates/terminal/terminal_list.html:71 #: users/templates/users/user_detail.html:25 @@ -1060,7 +1061,7 @@ msgstr "更新" #: common/templates/common/terminal_setting.html:112 #: ops/templates/ops/task_list.html:72 #: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:176 +#: perms/templates/perms/asset_permission_list.html:178 #: terminal/templates/terminal/terminal_list.html:73 #: users/templates/users/user_detail.html:30 #: users/templates/users/user_group_detail.html:32 @@ -1173,7 +1174,6 @@ msgstr "快速修改" #: perms/models.py:88 #: perms/templates/perms/asset_permission_create_update.html:52 #: perms/templates/perms/asset_permission_detail.html:120 -#: perms/templates/perms/asset_permission_list.html:73 #: terminal/templates/terminal/terminal_list.html:34 #: users/templates/users/_select_user_modal.html:18 #: users/templates/users/user_detail.html:144 @@ -2572,7 +2572,8 @@ msgstr "组织管理" #: perms/forms.py:39 perms/models.py:30 perms/models.py:86 #: perms/templates/perms/asset_permission_list.html:55 -#: perms/templates/perms/asset_permission_list.html:120 templates/_nav.html:14 +#: perms/templates/perms/asset_permission_list.html:75 +#: perms/templates/perms/asset_permission_list.html:122 templates/_nav.html:14 #: users/forms.py:273 users/models/group.py:26 users/models/user.py:61 #: users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_detail.html:213 @@ -2658,6 +2659,7 @@ msgid "Create permission" msgstr "创建授权规则" #: perms/templates/perms/asset_permission_list.html:59 +#: perms/templates/perms/asset_permission_list.html:73 #: users/templates/users/user_list.html:28 xpack/plugins/cloud/models.py:53 #: xpack/plugins/cloud/templates/cloud/account_detail.html:60 #: xpack/plugins/cloud/templates/cloud/account_list.html:14 @@ -3545,6 +3547,10 @@ msgstr "用户认证源来自 {}, 请去相应系统修改密码" msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" +#: users/serializers/v2.py:40 +msgid "name not unique" +msgstr "名称重复" + #: users/templates/users/_base_otp.html:27 msgid "Home page" msgstr "首页" diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index 9a570d841..5e602dd4f 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -161,6 +161,87 @@ function activeNav() { } } +function formSubmit(props) { + /* + { + "form": $("form"), + "url": "", + "method": "POST", + "redirect_to": "", + "success": function(data, textStatue, jqXHR){}, + "error": function(jqXHR, textStatus, errorThrown) {} + } + */ + props = props || {}; + var data = props.data || props.form.serializeObject(); + var redirect_to = props.redirect_to; + $.ajax({ + url: props.url, + type: props.method || 'POST', + data: JSON.stringify(data), + contentType: props.content_type || "application/json; charset=utf-8", + dataType: props.data_type || "json" + }).done(function (data, textState, jqXHR) { + if (redirect_to) { + location.href = redirect_to; + } else if (typeof props.success === 'function') { + return props.success(data, textState, jqXHR); + } + }).fail(function(jqXHR, textStatus, errorThrown) { + if (typeof props.error === 'function') { + return props.error(jqXHR, textStatus, errorThrown) + } + if (!props.form) { + alert(jqXHR.responseText); + return + } + if (jqXHR.status === 400) { + var errors = jqXHR.responseJSON; + var noneFieldErrorRef = props.form.children('.alert-danger'); + if (noneFieldErrorRef.length !== 1) { + props.form.prepend(''); + noneFieldErrorRef = props.form.children('.alert-danger'); + } + var noneFieldErrorMsg = ""; + noneFieldErrorRef.css("display", "none"); + noneFieldErrorRef.html(""); + props.form.find(".help-block.error").html(""); + props.form.find(".form-group.has-error").removeClass("has-error"); + + if (typeof errors !== "object") { + noneFieldErrorMsg = errors; + if (noneFieldErrorRef.length === 1) { + noneFieldErrorRef.css('display', 'block'); + noneFieldErrorRef.html(noneFieldErrorMsg); + } + return + } + $.each(errors, function (k, v) { + var fieldRef = props.form.find('input[name="' + k + '"]'); + var formGroupRef = fieldRef.parents('.form-group'); + var parentRef = fieldRef.parent(); + var helpBlockRef = parentRef.children('.help-block.error'); + if (helpBlockRef.length === 0) { + parentRef.append('
'); + helpBlockRef = parentRef.children('.help-block.error'); + } + if (fieldRef.length === 1 && formGroupRef.length === 1) { + formGroupRef.addClass('has-error'); + var help_msg = v.join("
") ; + helpBlockRef.html(help_msg); + } else { + noneFieldErrorMsg += v + '
'; + } + }); + if (noneFieldErrorRef.length === 1 && noneFieldErrorMsg !== '') { + noneFieldErrorRef.css('display', 'block'); + noneFieldErrorRef.html(noneFieldErrorMsg); + } + } + + }) +} + function APIUpdateAttr(props) { // props = {url: .., body: , success: , error: , method: ,} props = props || {}; @@ -195,9 +276,6 @@ function APIUpdateAttr(props) { }).fail(function(jqXHR, textStatus, errorThrown) { if (flash_message) { var msg = ""; - console.log(jqXHR); - console.log(textStatus); - console.log(errorThrown); if (user_fail_message) { msg = user_fail_message; } else if (jqXHR.responseJSON) { @@ -213,6 +291,7 @@ function APIUpdateAttr(props) { toastr.error(msg); } if (typeof props.error === 'function') { + console.log(jqXHR); return props.error(jqXHR.responseText, jqXHR.status); } }); diff --git a/apps/terminal/api/v2/terminal.py b/apps/terminal/api/v2/terminal.py index 3fd42a6ab..7e7a61c2a 100644 --- a/apps/terminal/api/v2/terminal.py +++ b/apps/terminal/api/v2/terminal.py @@ -1,12 +1,16 @@ # -*- coding: utf-8 -*- # -from rest_framework import viewsets +from rest_framework import viewsets, generics +from rest_framework import status +from rest_framework.response import Response from common.permissions import IsSuperUser, WithBootstrapToken + + from ...models import Terminal from ...serializers import v2 as serializers -__all__ = ['TerminalViewSet', 'TerminalRegistrationViewSet'] +__all__ = ['TerminalViewSet', 'TerminalRegistrationApi'] class TerminalViewSet(viewsets.ModelViewSet): @@ -15,8 +19,19 @@ class TerminalViewSet(viewsets.ModelViewSet): permission_classes = [IsSuperUser] -class TerminalRegistrationViewSet(viewsets.ModelViewSet): - queryset = Terminal.objects.filter(is_deleted=False) +class TerminalRegistrationApi(generics.CreateAPIView): serializer_class = serializers.TerminalRegistrationSerializer permission_classes = [WithBootstrapToken] http_method_names = ['post'] + + def create(self, request, *args, **kwargs): + data = request.data + serializer = serializers.TerminalSerializer( + data=data, context={'request': request} + ) + serializer.is_valid(raise_exception=True) + terminal = serializer.save() + sa_serializer = serializer.sa_serializer_class(instance=terminal.user) + data['service_account'] = sa_serializer.data + return Response(data, status=status.HTTP_201_CREATED) + diff --git a/apps/terminal/forms.py b/apps/terminal/forms.py index 207363ab0..b2f81fbb5 100644 --- a/apps/terminal/forms.py +++ b/apps/terminal/forms.py @@ -39,5 +39,3 @@ class TerminalForm(forms.ModelForm): 'name', 'remote_addr', 'comment', 'command_storage', 'replay_storage', ] - help_texts = { - } diff --git a/apps/terminal/serializers/v1.py b/apps/terminal/serializers/v1.py index ac3324097..688453ac1 100644 --- a/apps/terminal/serializers/v1.py +++ b/apps/terminal/serializers/v1.py @@ -31,8 +31,6 @@ class TerminalSerializer(serializers.ModelSerializer): return cache.get(key) - - class SessionSerializer(BulkSerializerMixin, serializers.ModelSerializer): command_amount = serializers.SerializerMethodField() command_store = get_multi_command_storage() diff --git a/apps/terminal/serializers/v2.py b/apps/terminal/serializers/v2.py index 7e0365800..242c07268 100644 --- a/apps/terminal/serializers/v2.py +++ b/apps/terminal/serializers/v2.py @@ -3,7 +3,7 @@ from rest_framework import serializers from common.utils import get_request_ip -from users.serializers.v2 import ServiceAccountRegistrationSerializer +from users.serializers.v2 import ServiceAccountSerializer from ..models import Terminal @@ -11,36 +11,48 @@ __all__ = ['TerminalSerializer', 'TerminalRegistrationSerializer'] class TerminalSerializer(serializers.ModelSerializer): - class Meta: - model = Terminal - fields = [ - 'id', 'name', 'remote_addr', 'comment', - ] - read_only_fields = ['id', 'remote_addr'] - - -class TerminalRegistrationSerializer(serializers.ModelSerializer): - service_account = ServiceAccountRegistrationSerializer(read_only=True) - service_account_serializer = None + sa_serializer_class = ServiceAccountSerializer + sa_serializer = None class Meta: model = Terminal fields = [ - 'id', 'name', 'remote_addr', 'comment', 'service_account' + 'id', 'name', 'remote_addr', 'command_storage', + 'replay_storage', 'user', 'is_accepted', 'is_deleted', + 'date_created', 'comment' ] - read_only_fields = ['id', 'remote_addr', 'service_account'] - - def validate(self, attrs): - self.service_account_serializer = ServiceAccountRegistrationSerializer(data=attrs) - self.service_account_serializer.is_valid(raise_exception=True) - return attrs + read_only_fields = ['id', 'remote_addr', 'user', 'date_created'] + + def is_valid(self, raise_exception=False): + valid = super().is_valid(raise_exception=raise_exception) + if not valid: + return valid + data = {'name': self.validated_data.get('name')} + kwargs = {'data': data} + if self.instance and self.instance.user: + kwargs['instance'] = self.instance.user + self.sa_serializer = ServiceAccountSerializer(**kwargs) + valid = self.sa_serializer.is_valid(raise_exception=True) + return valid + + def save(self, **kwargs): + instance = super().save(**kwargs) + sa = self.sa_serializer.save() + instance.user = sa + instance.save() + return instance def create(self, validated_data): request = self.context.get('request') - sa = self.service_account_serializer.save() instance = super().create(validated_data) instance.is_accepted = True - instance.user = sa - instance.remote_addr = get_request_ip(request) + if request: + instance.remote_addr = get_request_ip(request) instance.save() return instance + + +class TerminalRegistrationSerializer(serializers.Serializer): + name = serializers.CharField(max_length=128) + comment = serializers.CharField(max_length=128) + service_account = ServiceAccountSerializer(read_only=True) diff --git a/apps/terminal/templates/terminal/terminal_update.html b/apps/terminal/templates/terminal/terminal_update.html index bde86563d..f9554fda4 100644 --- a/apps/terminal/templates/terminal/terminal_update.html +++ b/apps/terminal/templates/terminal/terminal_update.html @@ -33,8 +33,6 @@

{% trans 'Info' %}

{% bootstrap_field form.name layout="horizontal" %} {% bootstrap_field form.remote_addr layout="horizontal" %} -{# {% bootstrap_field form.ssh_port layout="horizontal" %}#} -{# {% bootstrap_field form.http_port layout="horizontal" %}#} {% bootstrap_field form.command_storage layout="horizontal" %} {% bootstrap_field form.replay_storage layout="horizontal" %} @@ -60,14 +58,14 @@ diff --git a/apps/terminal/urls/api_urls_v2.py b/apps/terminal/urls/api_urls_v2.py index 600ad3611..15254d216 100644 --- a/apps/terminal/urls/api_urls_v2.py +++ b/apps/terminal/urls/api_urls_v2.py @@ -11,10 +11,11 @@ app_name = 'terminal' router = BulkRouter() router.register(r'terminal', api.TerminalViewSet, 'terminal') -router.register(r'terminal-registrations', api.TerminalRegistrationViewSet, 'terminal-registration') urlpatterns = [ + path('terminal-registrations/', api.TerminalRegistrationApi.as_view(), + name='terminal-registration') ] urlpatterns += router.urls diff --git a/apps/users/api/v2/user.py b/apps/users/api/v2/user.py index 6c883861e..b0f121809 100644 --- a/apps/users/api/v2/user.py +++ b/apps/users/api/v2/user.py @@ -7,6 +7,6 @@ from ...serializers import v2 as serializers class ServiceAccountRegistrationViewSet(viewsets.ModelViewSet): - serializer_class = serializers.ServiceAccountRegistrationSerializer + serializer_class = serializers.ServiceAccountSerializer permission_classes = (WithBootstrapToken,) http_method_names = ['post'] diff --git a/apps/users/serializers/v2.py b/apps/users/serializers/v2.py index f9931d5dc..f936dc7bc 100644 --- a/apps/users/serializers/v2.py +++ b/apps/users/serializers/v2.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # +from django.utils.translation import ugettext as _ from rest_framework import serializers from ..models import User, AccessKey @@ -12,7 +13,7 @@ class AccessKeySerializer(serializers.ModelSerializer): read_only_fields = ['id', 'secret'] -class ServiceAccountRegistrationSerializer(serializers.ModelSerializer): +class ServiceAccountSerializer(serializers.ModelSerializer): access_key = AccessKeySerializer(read_only=True) class Meta: @@ -30,15 +31,22 @@ class ServiceAccountRegistrationSerializer(serializers.ModelSerializer): def validate_name(self, name): email = self.get_email() username = self.get_username() - if User.objects.filter(email=email) or \ - User.objects.filter(username=username): - raise serializers.ValidationError('name not unique', code='unique') + if self.instance: + users = User.objects.exclude(id=self.instance.id) + else: + users = User.objects.all() + if users.filter(email=email) or \ + users.filter(username=username): + raise serializers.ValidationError(_('name not unique'), code='unique') return name + def save(self, **kwargs): + self.validated_data['email'] = self.get_email() + self.validated_data['username'] = self.get_username() + self.validated_data['role'] = User.ROLE_APP + return super().save(**kwargs) + def create(self, validated_data): - validated_data['email'] = self.get_email() - validated_data['username'] = self.get_username() - validated_data['role'] = User.ROLE_APP instance = super().create(validated_data) instance.create_access_key() return instance