From a77acb7dfbb47415ec604ce72616a7db7bbd2ecd Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 17 Jan 2018 17:18:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[Change]=20=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=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 31610 -> 31608 bytes apps/locale/zh/LC_MESSAGES/django.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 5b01e493bc366126e93b5de9115b6256c4691b6c..3d866a742aa33c001d3230ffb61d3ac13449f036 100644 GIT binary patch delta 2863 zcmXZedrX#P7{~Dk6AgP60}+Ojq+|`Hu1OK8L>Qfp9 z!8``B(kQVMb-)T#!8+6d8?X;#PMlV1Lr~~ zezhGqgNaVZg=JBJ$*9Jrp{``U^JS>QtL%E`U$KqOH#u%b?QgN+=L~d(-`Pv3f>-TL z%py)IkIY8RKa9GvB0IzRId~`eMULaP%GTS>NF!megF!wUT2KYgdcn_*|F&JW$Md%x z$CgL8G9A@ej?G71X`$oC?E)K5$n&papoR6QTl^ZP;O@i%8bdX9&>r^uamT0aIaHm? zI10N^^)gmO-iNxAkJvdFO%Tg1i=U# zg*jM^Fk9QIOVy~kL_SoB~_5CWNd^+k; zWaD_u$3#Pw+Y!t&f@d6`$NP!fQSZ{An#hT$^>JHe>v532|IG~aOm?CQ?zJDGHXgLc>>1Br zaompj9B(+Eu_g!}ARdk*aT@9Z%WMOx?oLd6|L-vvOyV=tcY6|5;2NsHkY}R}g;+p5 z)p0fIdk;|uyn$)>F{a~Js0+J@L-87Ff1lduLLaL2_h0D56jWz3aR|i>h6P`?8&qn`10)E#^a2jU)71FfjWj-cwFb^iBS?!P*};RUg^(J$Tz)WXSj7OKEP z&#!QPlk-iE_u5ZU2OmW>_Jh5QYOuq0h8}dI4(vr8G+*an zYTp7IM;%;+ldu6*uMM^TThE`j;a?v7=LIRxMFrDsE~;Pw>Lq*3`Nht!#0>K59dEPm zpbk8MYOoE}$k(2~gjxFjuQSlXz{P|H0qC2 u+%{r4aU1F-99^e+yr%OK1O7Up3RJe9&waJH|Lmz#=5~D0+*%b+$^0LRxp+MQ delta 2865 zcmXZedrX#P7{~DkH57dVq);rxq(WyXTdV`viopzOS*}%1n`?@`DhQ$+N*lfquDL?l z(A;dcGMknISD~#~!)$rT<}9<)JfvlYmNv&EMs4){@%;Y!+}CyA_jO;->4m=Dxc=U_ z56`5=B0&%=Sr`Pe*1m%A#4V0DJKk=0*^h8E>pn&8KY}UvljpD4>zF{k54CQ{qR^y8 zL2Pg$-H9yJ!MQjT^Bq6z`5Bl*{%OYxa3t|^)V|fW5%Y-G;Y9or)!0Q;1OK2J8WxQO z!7~gJqhX>HbwCBGU_I)9wKxP@Y%5M9e#3r+CB!{gfDbJWt;cxcF4VyX93MwDa4P1+ zZ}tinGjZK<-jc9D0jjZL)RoM3z6@1(g$cVTEsl4f_P5*E7YuZT-`jJjf|qSC zrV$Ta8k&xpzYld~h4wM$XW8tb(CJ%8BoaeE3? z=RDqtJ*awP%R?uj?&Je@7DhNfSjymbtV12tstMfUc!%S5OeNpx_*>N5eHOKE0M&T> zve0CEo4pGo%uln^F{X}77^uMWsAsnTRj3>@uofe@3AJt;>frbB9z24o(~G*0gbE%5 z-i_mN21c;dR-x+DSNQv1OG3A1gC};P3hs8iA64M6{Q*Z2|7x$H3ijK$%5eP%R6Z5; zDAMtM%=Ua~CHG$kRgsv2O{fjKQFmak<9+rZs*$7iXVm^b9QWf$;^E6fQ|x#<8IzdL zMb$5gc`(z?w)0Vql%oz@X|-MlHruzI{}_|V?{j?2o&C`0&@IVA z9XJp5C>A20eo*iDk{v*Gp0*-16SXfJ)o89QuruvkyV%ws`(i<3I0)8xq6KfF&{oXG zcbz|m!-&tI4!mHy?cb;ddQo4=(3Ro(aj1qfQ2Qoh3g%#h^MgVLy5gq>6I`|9T1+9o z!EUpAPzN1C6+GeiG)^M!M!ieP)uGc->!Y^XHejN@|Md*?Otzv5w%HEU#!h?4p78ty z$K9yU@rLtbYq(0{49vu0)CHE=CRE+6IQad4z#y5#=cw=YD5}6!RDm(I;f6e%O8ltf z8r1jRh&tdcOu}RNh5270T(Vj;&c*S0idC-SCZ~%2sV8U>B;9Z#;hv)AapcW1xk@SBJM|H0s%=q4Md@XQ2vBwfW8$+b2=$pLP5K>W@>@ ww&GIaF4Rjn`DNAPHGOVyz+Wd+fvS#EceE5GT Date: Wed, 17 Jan 2018 17:22:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[Update]=20=E5=90=AF=E7=94=A8ldap=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/forms.py | 6 +++--- apps/common/views.py | 4 ++-- apps/locale/zh/LC_MESSAGES/django.mo | Bin 31608 -> 31614 bytes apps/locale/zh/LC_MESSAGES/django.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/forms.py b/apps/common/forms.py index 073bb671f..6b83c54cc 100644 --- a/apps/common/forms.py +++ b/apps/common/forms.py @@ -72,9 +72,6 @@ class BasicSettingForm(BaseForm): max_length=1024, label=_("Email Subject Prefix"), initial="[Jumpserver] " ) - AUTH_LDAP = forms.BooleanField( - label=_("Enable LDAP Auth"), initial=False, required=False - ) class EmailSettingForm(BaseForm): @@ -129,3 +126,6 @@ class LDAPSettingForm(BaseForm): AUTH_LDAP_START_TLS = forms.BooleanField( label=_("Use SSL"), initial=False, required=False ) + AUTH_LDAP = forms.BooleanField( + label=_("Enable LDAP Auth"), initial=False, required=False + ) diff --git a/apps/common/views.py b/apps/common/views.py index 4135ca82c..43b249cee 100644 --- a/apps/common/views.py +++ b/apps/common/views.py @@ -25,8 +25,6 @@ class BasicSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() - if "AUTH_LDAP" in form.cleaned_data: - ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"]) msg = _("Update setting successfully, please restart program") messages.success(request, msg) return redirect('settings:basic-setting') @@ -79,6 +77,8 @@ class LDAPSettingView(AdminUserRequiredMixin, TemplateView): form = self.form_class(request.POST) if form.is_valid(): form.save() + if "AUTH_LDAP" in form.cleaned_data: + ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"]) msg = _("Update setting successfully, please restart program") messages.success(request, msg) return redirect('settings:ldap-setting') diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 3d866a742aa33c001d3230ffb61d3ac13449f036..e11f9f5560cde51416848d6495e4036da7014744 100644 GIT binary patch delta 2862 zcmXZedrX#P7{~F)NIdWo^eUzyin`2@n#HEGLR~t{w3fx%ifMDnK~xk)5L-QA5U#mA zu#vgZY-Kj>;9-?Ea}BfQA)B*IOY@L)L`xf*vW{+3X;QVXb`$lZl%guXnu3zHdLon_0ITwf`{2@dwXev>n)s{B_j2u$aW$Jb?_KW!f}ot@ca}^Bmacs66{U97`5+t+kj(|qzzVzpn`|@QMf{rm5+5YKiW6``X=EKH6Stxc-tYJrs)19X z6TjGtIGKqK$N6PZfk~*wrlPK-$oUFX;U#vt^Q&yL^DT}yqxNsJ;pYr=h2Pn8sDc-4 zC-x`qF()z`H9r=0Wd-(O=L@kX`B{$3ZH=wBYmi35;B^K$Y}ke>c+v}ga{QOQYP&q& zy*yeU$6o9kfNE@*9fi8me8-R48MZtj&%cI&7S^L~@vEqUn-U9X4As~kyU+8793Qi% zP<77ZFuaPYmpM0bB?FH-tM!geM$48 z#(Ueoc90!`G1lE<$786Dr!i20r%}(Y1a$`%;2^BU7_LLD+lV^&T^xyrQFS^|7m_+Z z2nORFn1xd?hNZR&Ri|#gzyB2^bZgdnVhgI^cE|fr1rFI0m_q!sy^Jc@WxH2I>tm?= z0Mw(%#?d&+^Q9Hse;rgsA_p5$8@8kFz%Ivo?EzFHN9>QN{eL*_!rsIw3nKg3AvPD& zm>+|xKRNVZx-GKBs74l`4y?8>q7Gbb-*o;XOe4S7@lksQwf=(RU}3Z_6;(IPVxU`+ zgF0{)>QR&-pMFs1_;;IB8FfC;4oB@9g(^74PO{VOOgq;uMfQb3Lo^6hdZG!tQ)mO` z;@i$2#T$vwpbl)a?e=d}1D&X^q{pIYeHQ9g4@K?E#W?0+jPrv62D;+M6Nw<0=eQQ* znfgQ$YX9iPVAiQ7@{Qs2dq<5BC&ZH=wRoAmv!VUUI!PzATzk5L=<*n{@C z=i3~&qdv!L&SzEy!3g4^I25O%F0jHjqUvtI#P|OmgLD#~p}yNAr~;Qz1#VpuZOF$v zi63&j6!pC~pbmHgtKNd)36`w%sqZt^Qy~+3fUN{s+)ydu{*# delta 2855 zcmXZeeN2{B7{~D&QVe;#ag1S7>-bv<=T>Ib4_iJ2)>|zsfBTeYpzrl znVXJQX47iwmPsquFk8N4bCy|YC~2>1X=6-d)MobmJ@@ag&$+I1&ULQ)?ScRLlKT6S z_I787X+aRw#DgG)jrIjhA#QcN+3|M!o_!y0XWd7r{l_p9zxVuQ+k>g(`%vqG1(Aan z1Yu$#&xr!m!6kSLPH_C7=PNLS{Ns-2p)O!4YTs%b;zZ(gcqe{_YU~$O1An6$O0Eur zU?ziDb(ENoI$$xXU=!+qwU~^pwhiwke$9T4(};Vq949S|Y{C@cPSnAN9G^rra3*x( zXL}i^GSTC>v?eN0hH9)5btP5K*Pse7vum7x*|s^q#qkc*{@phGl!31B8{3U4c*$PJ zT;inK$UM~i{irJ|w^N;;fwz*M<2Y{XZL{5gG!h0|85FT$H>%)iFZj{%pSIWbd;X^5 z*rMoGW}zC(w?(KcEp_~eon_+*dH(ebw6Ga7z>iDERgQ{~L z$6zn2UiRY1yHI!X0XqX@oF6P?FdSE)4r}zFHxE^)7Vp4DjNvBKx^1X~-@&nX3{~ek>OuxB4T6z4 z2J^83V>sW|q3Sd(_4mJ)gl^47PwYe$+~fEls=!hEE#5}_lf8;6*l%y5)~D1(`7G3< z$iwkigo%dgxc@q+jzkf*pbG6l-GL6r2kc?g#^d$})c)Tc_hTCIz-5s`>~LF%8O)cU z>Q4?mm~N}=TvQ{qr~{YV=TQf)w{JMV7cRKp`s`wB4=i!sLeK{*3m@neZZ5L7#E#7y!V z?KZm)b)emecaaDW=z-jzkz|CNjs|GF8cv$<9>U@p7Q(! z#}`qb<2C2AR|LU5#3OJtR-!Jj#zIijVitaZy0CLN46mT}C$Eey^uCq;{!5*hjOuI}4#g_Ri#)#y^=>qy z{y%sT^*itq>KSiF-N83;Fz!S((1B{~5UT!Z=YL(v{a5GLydbtJ`o$ZGT3BYMqYBLS z{9@qPDU+VfpD{KJEPydd@2s9=^Ig(_H#ddVJgey;ONFq`}u$D8ci zr~~(*8tgaQLj{V)WwJ7{0{+#bmIU3 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 55e035bfe..50aec9767 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -1311,7 +1311,7 @@ msgstr "Email主题前缀" #: common/forms.py:76 msgid "Enable LDAP Auth" -msgstr "LDAP认证" +msgstr "开启LDAP认证" #: common/forms.py:82 msgid "SMTP host" From 3c3e9a41130f96d3a4a95515ca6dd4cae28efd85 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 17 Jan 2018 17:26:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB?= =?UTF-8?q?=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 31614 -> 31661 bytes apps/locale/zh/LC_MESSAGES/django.po | 149 +++++++++++++-------------- 2 files changed, 73 insertions(+), 76 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index e11f9f5560cde51416848d6495e4036da7014744..7be8a996a99f2451a1f8854e863216f289eaa052 100644 GIT binary patch delta 4807 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\n" "Language-Team: Jumpserver team\n" @@ -129,7 +129,7 @@ msgid "Password or private key password" msgstr "密码或秘钥不合法" #: assets/forms.py:201 assets/forms.py:262 assets/models/user.py:30 -#: common/forms.py:110 users/forms.py:16 users/forms.py:24 +#: common/forms.py:107 users/forms.py:16 users/forms.py:24 #: users/templates/users/login.html:56 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:11 @@ -661,7 +661,7 @@ msgstr "其它" #: assets/templates/assets/asset_group_create.html:16 #: assets/templates/assets/asset_update.html:55 #: assets/templates/assets/cluster_create_update.html:54 -#: common/templates/common/basic_setting.html:56 +#: common/templates/common/basic_setting.html:55 #: common/templates/common/email_setting.html:56 #: common/templates/common/ldap_setting.html:56 #: perms/templates/perms/asset_permission_create_update.html:67 @@ -681,10 +681,10 @@ msgstr "重置" #: assets/templates/assets/asset_bulk_update.html:24 #: assets/templates/assets/asset_create.html:41 #: assets/templates/assets/asset_group_create.html:17 -#: assets/templates/assets/asset_list.html:55 +#: assets/templates/assets/asset_list.html:53 #: assets/templates/assets/asset_update.html:56 #: assets/templates/assets/cluster_create_update.html:55 -#: common/templates/common/basic_setting.html:57 +#: common/templates/common/basic_setting.html:56 #: common/templates/common/email_setting.html:57 #: common/templates/common/ldap_setting.html:57 #: perms/templates/perms/asset_permission_create_update.html:68 @@ -726,8 +726,8 @@ msgstr "资产列表" #: assets/templates/assets/asset_detail.html:24 #: assets/templates/assets/asset_group_detail.html:18 #: assets/templates/assets/asset_group_detail.html:177 -#: assets/templates/assets/asset_group_list.html:42 -#: assets/templates/assets/asset_list.html:95 +#: assets/templates/assets/asset_group_list.html:38 +#: assets/templates/assets/asset_list.html:98 #: assets/templates/assets/cluster_assets.html:170 #: assets/templates/assets/cluster_detail.html:25 #: assets/templates/assets/cluster_list.html:43 @@ -750,8 +750,8 @@ msgstr "更新" #: assets/templates/assets/admin_user_list.html:84 #: assets/templates/assets/asset_detail.html:28 #: assets/templates/assets/asset_group_detail.html:22 -#: assets/templates/assets/asset_group_list.html:43 -#: assets/templates/assets/asset_list.html:96 +#: assets/templates/assets/asset_group_list.html:39 +#: assets/templates/assets/asset_list.html:99 #: assets/templates/assets/cluster_detail.html:29 #: assets/templates/assets/cluster_list.html:44 #: assets/templates/assets/system_user_detail.html:30 @@ -776,7 +776,6 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:62 #: assets/templates/assets/asset_group_detail.html:53 -#: assets/templates/assets/asset_list.html:34 #: assets/templates/assets/cluster_assets.html:54 #: assets/templates/assets/user_asset_list.html:22 #: users/templates/users/login_log_list.html:50 @@ -786,7 +785,7 @@ msgstr "类型" #: assets/templates/assets/admin_user_assets.html:63 #: assets/templates/assets/admin_user_list.html:25 #: assets/templates/assets/asset_detail.html:376 -#: assets/templates/assets/asset_list.html:38 +#: assets/templates/assets/asset_list.html:36 #: assets/templates/assets/system_user_asset.html:55 #: assets/templates/assets/system_user_list.html:27 msgid "Reachable" @@ -827,8 +826,8 @@ msgstr "使用集群管理用户" #: assets/templates/assets/admin_user_detail.html:101 #: assets/templates/assets/asset_detail.html:230 -#: assets/templates/assets/asset_group_list.html:85 -#: assets/templates/assets/asset_list.html:214 +#: assets/templates/assets/asset_group_list.html:81 +#: assets/templates/assets/asset_list.html:220 #: assets/templates/assets/cluster_assets.html:104 #: assets/templates/assets/cluster_list.html:89 #: assets/templates/assets/system_user_detail.html:164 @@ -859,7 +858,7 @@ msgstr "比例" #: assets/templates/assets/admin_user_list.html:29 #: assets/templates/assets/asset_group_detail.html:55 #: assets/templates/assets/asset_group_list.html:18 -#: assets/templates/assets/asset_list.html:39 +#: assets/templates/assets/asset_list.html:37 #: assets/templates/assets/cluster_assets.html:56 #: assets/templates/assets/cluster_list.html:23 #: assets/templates/assets/system_user_list.html:31 @@ -909,7 +908,7 @@ msgid "Quick modify" msgstr "快速修改" #: assets/templates/assets/asset_detail.html:175 -#: assets/templates/assets/asset_list.html:37 +#: assets/templates/assets/asset_list.html:35 #: assets/templates/assets/user_asset_list.html:25 perms/models.py:20 #: perms/templates/perms/asset_permission_create_update.html:47 #: perms/templates/perms/asset_permission_detail.html:116 @@ -970,8 +969,8 @@ msgstr "移除" msgid "Create asset group" msgstr "创建资产组" -#: assets/templates/assets/asset_group_list.html:80 -#: assets/templates/assets/asset_list.html:209 +#: assets/templates/assets/asset_group_list.html:76 +#: assets/templates/assets/asset_list.html:215 #: assets/templates/assets/cluster_list.html:84 #: assets/templates/assets/system_user_list.html:129 #: users/templates/users/user_detail.html:333 @@ -981,29 +980,29 @@ msgstr "创建资产组" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_group_list.html:81 +#: assets/templates/assets/asset_group_list.html:77 #: users/templates/users/user_group_list.html:78 msgid "This will delete the selected groups !!!" msgstr "删除选择组" -#: assets/templates/assets/asset_group_list.html:89 +#: assets/templates/assets/asset_group_list.html:85 msgid "Group deleted" msgstr "组已被删除" -#: assets/templates/assets/asset_group_list.html:90 -#: assets/templates/assets/asset_group_list.html:95 +#: assets/templates/assets/asset_group_list.html:86 +#: assets/templates/assets/asset_group_list.html:91 msgid "Group Delete" msgstr "删除" -#: assets/templates/assets/asset_group_list.html:94 +#: assets/templates/assets/asset_group_list.html:90 msgid "Group deleting failed." msgstr "删除失败" -#: assets/templates/assets/asset_group_list.html:157 +#: assets/templates/assets/asset_group_list.html:153 msgid "The selected asset groups has been updated successfully." msgstr "更新成功" -#: assets/templates/assets/asset_group_list.html:158 +#: assets/templates/assets/asset_group_list.html:154 msgid "AssetGroup Updated" msgstr "资产组更新" @@ -1021,52 +1020,47 @@ msgstr "导出" msgid "Create asset" msgstr "创建资产" -#: assets/templates/assets/asset_list.html:35 -#: assets/templates/assets/user_asset_list.html:23 -msgid "Env" -msgstr "环境" - -#: assets/templates/assets/asset_list.html:36 +#: assets/templates/assets/asset_list.html:34 #: assets/templates/assets/user_asset_list.html:24 msgid "Hardware" msgstr "硬件" -#: assets/templates/assets/asset_list.html:48 +#: assets/templates/assets/asset_list.html:46 #: users/templates/users/user_list.html:37 msgid "Delete selected" msgstr "批量删除" -#: assets/templates/assets/asset_list.html:49 +#: assets/templates/assets/asset_list.html:47 #: users/templates/users/user_list.html:38 msgid "Update selected" msgstr "批量更新" -#: assets/templates/assets/asset_list.html:50 +#: assets/templates/assets/asset_list.html:48 #: users/templates/users/user_list.html:39 msgid "Deactive selected" msgstr "禁用所选" -#: assets/templates/assets/asset_list.html:51 +#: assets/templates/assets/asset_list.html:49 #: users/templates/users/user_list.html:40 msgid "Active selected" msgstr "激活所选" -#: assets/templates/assets/asset_list.html:210 +#: assets/templates/assets/asset_list.html:216 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" # msgid "Deleted!" # msgstr "删除" -#: assets/templates/assets/asset_list.html:218 +#: assets/templates/assets/asset_list.html:224 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:219 -#: assets/templates/assets/asset_list.html:224 +#: assets/templates/assets/asset_list.html:225 +#: assets/templates/assets/asset_list.html:230 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:223 +#: assets/templates/assets/asset_list.html:229 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1202,6 +1196,10 @@ msgstr "删除系统用户" msgid "System Users Deleting failed." msgstr "系统用户删除失败" +#: assets/templates/assets/user_asset_list.html:23 +msgid "Env" +msgstr "环境" + #: assets/templates/assets/user_asset_list.html:26 msgid "Connective" msgstr "连接性" @@ -1309,66 +1307,66 @@ msgstr "用户第一次登录，修改profile后重定向到地址" msgid "Email Subject Prefix" msgstr "Email主题前缀" -#: common/forms.py:76 -msgid "Enable LDAP Auth" -msgstr "开启LDAP认证" - -#: common/forms.py:82 +#: common/forms.py:79 msgid "SMTP host" msgstr "SMTP主机" -#: common/forms.py:84 +#: common/forms.py:81 msgid "SMTP port" msgstr "SMTP端口" -#: common/forms.py:86 +#: common/forms.py:83 msgid "SMTP user" msgstr "SMTP账号" -#: common/forms.py:89 +#: common/forms.py:86 msgid "SMTP password" msgstr "SMTP密码" -#: common/forms.py:90 +#: common/forms.py:87 msgid "Some provider use token except password" msgstr "一些邮件提供商需要输入的是Token" -#: common/forms.py:93 common/forms.py:130 +#: common/forms.py:90 common/forms.py:127 msgid "Use SSL" msgstr "使用SSL" -#: common/forms.py:94 +#: common/forms.py:91 msgid "If SMTP port is 465, may be select" msgstr "如果SMTP端口是465，通常需要启用SSL" -#: common/forms.py:97 +#: common/forms.py:94 msgid "Use TLS" msgstr "使用TLS" -#: common/forms.py:98 +#: common/forms.py:95 msgid "If SMTP port is 587, may be select" msgstr "如果SMTP端口是587，通常需要启用TLS" -#: common/forms.py:104 +#: common/forms.py:101 msgid "LDAP server" msgstr "LDAP地址" -#: common/forms.py:107 +#: common/forms.py:104 msgid "Bind DN" msgstr "绑定DN" -#: common/forms.py:114 +#: common/forms.py:111 msgid "User OU" msgstr "用户OU" -#: common/forms.py:117 +#: common/forms.py:114 msgid "User search filter" msgstr "用户过滤器" -#: common/forms.py:120 +#: common/forms.py:117 msgid "User attr map" msgstr "LDAP属性映射" +#: common/forms.py:130 +msgid "Enable LDAP Auth" +msgstr "开启LDAP认证" + #: common/mixins.py:29 msgid "is discard" msgstr "" @@ -1393,7 +1391,7 @@ msgstr "基本设置" #: common/templates/common/basic_setting.html:18 #: common/templates/common/email_setting.html:18 -#: common/templates/common/ldap_setting.html:18 common/views.py:45 +#: common/templates/common/ldap_setting.html:18 common/views.py:44 msgid "Email setting" msgstr "邮件设置" @@ -1403,20 +1401,19 @@ msgstr "邮件设置" msgid "LDAP setting" msgstr "LDAP设置" -#: common/templates/common/basic_setting.html:55 #: common/templates/common/email_setting.html:55 #: common/templates/common/ldap_setting.html:55 msgid "Test connection" msgstr "测试连接" -#: common/views.py:17 common/views.py:44 common/views.py:69 +#: common/views.py:17 common/views.py:43 common/views.py:69 #: templates/_nav.html:69 msgid "Settings" msgstr "系统设置" -#: common/views.py:30 common/views.py:55 common/views.py:80 -msgid "Update setting successfully" -msgstr "更新设置成功" +#: common/views.py:28 common/views.py:54 common/views.py:82 +msgid "Update setting successfully, please restart program" +msgstr "更新设置成功, 请手动重启程序" #: ops/models.py:32 msgid "Interval" @@ -1912,8 +1909,8 @@ msgid "Close" msgstr "关闭" #: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44 -#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:194 -#: users/views/login.py:243 users/views/user.py:57 users/views/user.py:72 +#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:197 +#: users/views/login.py:246 users/views/user.py:57 users/views/user.py:72 #: users/views/user.py:91 users/views/user.py:147 users/views/user.py:304 #: users/views/user.py:318 users/views/user.py:355 users/views/user.py:377 msgid "Users" @@ -2740,48 +2737,48 @@ msgstr "编辑用户组" msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: users/views/login.py:84 +#: users/views/login.py:87 msgid "Logout success" msgstr "退出登录成功" -#: users/views/login.py:85 +#: users/views/login.py:88 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: users/views/login.py:101 +#: users/views/login.py:104 msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:114 +#: users/views/login.py:117 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:115 +#: users/views/login.py:118 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:129 +#: users/views/login.py:132 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:130 +#: users/views/login.py:133 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:147 users/views/login.py:160 +#: users/views/login.py:150 users/views/login.py:163 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:156 +#: users/views/login.py:159 msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:194 +#: users/views/login.py:197 msgid "First login" msgstr "首次登陆" -#: users/views/login.py:244 +#: users/views/login.py:247 msgid "Login log list" msgstr "登录日志" From 67001dd99f9798a67a4d6b89d7c0adf20d3ca019 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 18 Jan 2018 09:56:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Feature]=20=E6=94=AF=E6=8C=81es=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/settings.py | 3 ++- apps/terminal/backends/command/es.py | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 apps/terminal/backends/command/es.py diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 7a8aa422e..89686cada 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -373,7 +373,8 @@ CAPTCHA_FOREGROUND_COLOR = '#001100' CAPTCHA_NOISE_FUNCTIONS = ('captcha.helpers.noise_dots',) CAPTCHA_TEST_MODE = CONFIG.CAPTCHA_TEST_MODE -COMMAND_STORAGE_BACKEND = 'terminal.backends.command.db' +#COMMAND_STORAGE_BACKEND = 'terminal.backends.command.db' +COMMAND_STORAGE_BACKEND = 'terminal.backends.command.es' # Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html BOOTSTRAP3 = { diff --git a/apps/terminal/backends/command/es.py b/apps/terminal/backends/command/es.py new file mode 100644 index 000000000..39c83f09d --- /dev/null +++ b/apps/terminal/backends/command/es.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# + +from jms_es_storage import ESStore +from .base import CommandBase + + +class CommandStore(CommandBase, ESStore): + def __init__(self): + ESStore.__init__(self, hosts=["http://elastic:changeme@localhost:9200"]) + + def save(self, command): + return ESStore.save(self, command) + + def bulk_save(self, commands): + return ESStore.bulk_save(self, commands) + + def filter(self, date_from=None, date_to=None, + user=None, asset=None, system_user=None, + input=None, session=None): + + data = ESStore.filter( + self, date_from=date_from, date_to=date_to, + user=user, asset=asset, system_user=system_user, + input=input, session=session + ) + return [item["_source"] for item in data["hits"] if item]