From 7924b094f8aaa2b1e54971584721df47bac3c5d3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 18 Jul 2018 16:15:35 +0800 Subject: [PATCH 01/12] =?UTF-8?q?[Update]=20gunicorn=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8eventlet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jms | 1 - 1 file changed, 1 deletion(-) diff --git a/jms b/jms index 47eb81859..0f07f0760 100755 --- a/jms +++ b/jms @@ -123,7 +123,6 @@ def start_gunicorn(): 'gunicorn', 'jumpserver.wsgi', '-b', bind, '-w', str(WORKERS), - '-k', 'eventlet', '--access-logformat', log_format, '-p', pid_file, ] From 30527442036101644ac3451ce2853caaaa201b4d Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 18 Jul 2018 19:17:20 +0800 Subject: [PATCH 02/12] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0eventlet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jms | 1 + 1 file changed, 1 insertion(+) diff --git a/jms b/jms index 0f07f0760..5e334c926 100755 --- a/jms +++ b/jms @@ -122,6 +122,7 @@ def start_gunicorn(): cmd = [ 'gunicorn', 'jumpserver.wsgi', '-b', bind, + '-k', 'eventlet', '-w', str(WORKERS), '--access-logformat', log_format, '-p', pid_file, From e1fff18ce321502c7c942a38c7370d7d2653b587 Mon Sep 17 00:00:00 2001 From: wojiushixiaobai <296015668@qq.com> Date: Thu, 19 Jul 2018 14:14:58 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=B7=98=E5=AE=9DIP?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/users/utils.py b/apps/users/utils.py index 7cbaa75f0..047cf8e71 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -212,10 +212,10 @@ def write_login_log(*args, **kwargs): def get_ip_city(ip, timeout=10): - # Taobao ip api: http://ip.taobao.com//service/getIpInfo.php?ip=8.8.8.8 + # Taobao ip api: http://ip.taobao.com/service/getIpInfo.php?ip=8.8.8.8 # Sina ip api: http://int.dpool.sina.com.cn/iplookup/iplookup.php?ip=8.8.8.8&format=json - url = 'http://int.dpool.sina.com.cn/iplookup/iplookup.php?ip=%s&format=json' % ip + url = 'http://ip.taobao.com/service/getIpInfo.php?ip=%s' % ip try: r = requests.get(url, timeout=timeout) except: @@ -224,8 +224,8 @@ def get_ip_city(ip, timeout=10): if r and r.status_code == 200: try: data = r.json() - if not isinstance(data, int) and data['ret'] == 1: - city = data['country'] + ' ' + data['city'] + if not isinstance(data, int) and data['code'] == 0: + city = data['data']['country'] + ' ' + data['data']['city'] except ValueError: pass return city From 83f220d7deb379759b141371b3b57cf1307bfb17 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 19 Jul 2018 18:36:52 +0800 Subject: [PATCH 04/12] =?UTF-8?q?[Feature]=20=E6=B7=BB=E5=8A=A0=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20(#1559)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Feature] 添加命令记录下载功能 * [Update] 文案修改，导出记录、提交，取消全部命令导出 * [Update] 命令导出，修复时间问题 --- apps/common/mixins.py | 5 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 36944 -> 37020 bytes apps/i18n/zh/LC_MESSAGES/django.po | 93 ++++++++-------- .../templates/terminal/command_list.html | 53 ++++++--- .../templates/terminal/command_report.html | 103 ++++++++++++++++++ apps/terminal/urls/views_urls.py | 1 + apps/terminal/views/command.py | 48 +++++++- 7 files changed, 239 insertions(+), 64 deletions(-) create mode 100644 apps/terminal/templates/terminal/command_report.html diff --git a/apps/common/mixins.py b/apps/common/mixins.py index 243ee93c6..ae2ae6f65 100644 --- a/apps/common/mixins.py +++ b/apps/common/mixins.py @@ -93,7 +93,7 @@ class DatetimeSearchMixin: date_format = '%Y-%m-%d' date_from = date_to = None - def get(self, request, *args, **kwargs): + def get_date_range(self): date_from_s = self.request.GET.get('date_from') date_to_s = self.request.GET.get('date_to') @@ -113,6 +113,9 @@ class DatetimeSearchMixin: ) else: self.date_to = timezone.now() + + def get(self, request, *args, **kwargs): + self.get_date_range() return super().get(request, *args, **kwargs) diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 50e22bf55f237bf8d2d1e9ddf1c548523ff9daf9..bc860621d21695678c0861851093bcc830d23c74 100644 GIT binary patch delta 12395 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 9e3766748..b0ef3043f 100644 --- a/apps/i18n/zh/LC_MESSAGES/django.po +++ b/apps/i18n/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: 2018-07-13 19:20+0800\n" +"POT-Creation-Date: 2018-07-19 18:29+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -445,7 +445,7 @@ msgstr "默认资产组" #: terminal/templates/terminal/session_list.html:71 users/forms.py:282 #: users/models/user.py:31 users/models/user.py:333 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:13 users/views/user.py:361 +#: users/templates/users/user_group_list.html:13 users/views/user.py:367 msgid "User" msgstr "用户" @@ -685,6 +685,7 @@ msgstr "重置" #: common/templates/common/security_setting.html:71 #: common/templates/common/terminal_setting.html:108 #: perms/templates/perms/asset_permission_create_update.html:70 +#: terminal/templates/terminal/command_list.html:103 #: terminal/templates/terminal/session_list.html:126 #: terminal/templates/terminal/terminal_update.html:48 #: users/templates/users/_user.html:47 @@ -814,7 +815,7 @@ msgstr "选择节点" #: users/templates/users/user_detail.html:374 #: users/templates/users/user_detail.html:399 #: users/templates/users/user_detail.html:422 -#: users/templates/users/user_detail.html:458 +#: users/templates/users/user_detail.html:466 #: users/templates/users/user_group_create_update.html:32 #: users/templates/users/user_group_list.html:86 #: users/templates/users/user_list.html:200 @@ -1005,7 +1006,7 @@ msgstr "存在资产，不能删除" #: assets/templates/assets/system_user_list.html:134 #: users/templates/users/user_detail.html:369 #: users/templates/users/user_detail.html:394 -#: users/templates/users/user_detail.html:453 +#: users/templates/users/user_detail.html:461 #: users/templates/users/user_group_list.html:81 #: users/templates/users/user_list.html:195 msgid "Are you sure?" @@ -2002,7 +2003,7 @@ msgstr "文档" #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:343 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:349 msgid "Profile" msgstr "个人信息" @@ -2059,13 +2060,13 @@ msgstr "关闭" #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44 #: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95 -#: users/views/login.py:330 users/views/login.py:388 users/views/user.py:65 -#: users/views/user.py:80 users/views/user.py:102 users/views/user.py:175 -#: users/views/user.py:330 users/views/user.py:380 users/views/user.py:415 +#: users/views/login.py:332 users/views/login.py:390 users/views/user.py:67 +#: users/views/user.py:82 users/views/user.py:104 users/views/user.py:180 +#: users/views/user.py:336 users/views/user.py:386 users/views/user.py:421 msgid "Users" msgstr "用户管理" -#: templates/_nav.html:13 users/views/user.py:66 +#: templates/_nav.html:13 users/views/user.py:68 msgid "User list" msgstr "用户列表" @@ -2093,7 +2094,7 @@ msgstr "命令记录" msgid "Web terminal" msgstr "Web终端" -#: templates/_nav.html:51 terminal/views/command.py:47 +#: templates/_nav.html:51 terminal/views/command.py:49 #: terminal/views/session.py:75 terminal/views/session.py:93 #: terminal/views/session.py:115 terminal/views/terminal.py:31 #: terminal/views/terminal.py:46 terminal/views/terminal.py:58 @@ -2202,13 +2203,17 @@ msgstr "参数" msgid "Goto" msgstr "转到" +#: terminal/templates/terminal/command_list.html:99 +msgid "Export command" +msgstr "导出命令" + #: terminal/templates/terminal/session_detail.html:17 #: terminal/views/session.py:116 msgid "Session detail" msgstr "会话详情" #: terminal/templates/terminal/session_detail.html:28 -#: terminal/views/command.py:48 +#: terminal/views/command.py:50 msgid "Command list" msgstr "命令记录列表" @@ -2324,7 +2329,7 @@ msgid "" "You should use your ssh client tools connect terminal: {}

{}" msgstr "你可以使用ssh客户端工具连接终端" -#: users/api.py:221 users/templates/users/login.html:50 +#: users/api.py:226 users/templates/users/login.html:50 msgid "Log in frequently and try again later" msgstr "登录频繁, 稍后重试" @@ -2725,7 +2730,7 @@ msgid "Setting" msgstr "设置" #: users/templates/users/user_create.html:4 -#: users/templates/users/user_list.html:16 users/views/user.py:80 +#: users/templates/users/user_list.html:16 users/views/user.py:82 msgid "Create user" msgstr "创建用户" @@ -2734,7 +2739,7 @@ msgid "Reset link will be generated and sent to the user. " msgstr "生成重置密码连接，通过邮件发送给用户" #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:176 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:181 msgid "User detail" msgstr "用户详情" @@ -2772,7 +2777,7 @@ msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" #: users/templates/users/user_detail.html:186 -#: users/templates/users/user_detail.html:444 +#: users/templates/users/user_detail.html:446 msgid "Unblock user" msgstr "解除登录限制" @@ -2818,7 +2823,7 @@ msgstr "更新ssh密钥成功" msgid "User SSH public key update" msgstr "ssh密钥" -#: users/templates/users/user_detail.html:454 +#: users/templates/users/user_detail.html:462 msgid "After unlocking the user, the user can log in normally." msgstr "解除用户登录限制后，此用户即可正常登录" @@ -2878,8 +2883,8 @@ msgstr "用户删除失败" msgid "Administrator Settings force MFA login" msgstr "管理员设置强制使用MFA登录" -#: users/templates/users/user_profile.html:116 users/views/user.py:205 -#: users/views/user.py:259 +#: users/templates/users/user_profile.html:116 users/views/user.py:211 +#: users/views/user.py:265 msgid "User groups" msgstr "用户组" @@ -2925,7 +2930,7 @@ msgid "" "corresponding private key." msgstr "新的公钥已设置成功，请下载对应的私钥" -#: users/templates/users/user_update.html:4 users/views/user.py:103 +#: users/templates/users/user_update.html:4 users/views/user.py:105 msgid "Update user" msgstr "更新用户" @@ -3079,104 +3084,104 @@ msgstr "更新用户组" msgid "User group granted asset" msgstr "用户组授权资产" -#: users/views/login.py:75 +#: users/views/login.py:76 msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: users/views/login.py:178 users/views/user.py:500 users/views/user.py:525 +#: users/views/login.py:180 users/views/user.py:506 users/views/user.py:531 msgid "MFA code invalid" msgstr "MFA码认证失败" -#: users/views/login.py:207 +#: users/views/login.py:209 msgid "Logout success" msgstr "退出登录成功" -#: users/views/login.py:208 +#: users/views/login.py:210 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: users/views/login.py:224 +#: users/views/login.py:226 msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:237 +#: users/views/login.py:239 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:238 +#: users/views/login.py:240 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:251 +#: users/views/login.py:253 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:252 +#: users/views/login.py:254 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:273 users/views/login.py:286 +#: users/views/login.py:275 users/views/login.py:288 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:282 +#: users/views/login.py:284 msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:292 users/views/user.py:118 users/views/user.py:398 +#: users/views/login.py:294 users/views/user.py:120 users/views/user.py:404 msgid "* Your password does not meet the requirements" msgstr "* 您的密码不符合要求" -#: users/views/login.py:330 +#: users/views/login.py:332 msgid "First login" msgstr "首次登陆" -#: users/views/login.py:389 +#: users/views/login.py:391 msgid "Login log list" msgstr "登录日志" -#: users/views/user.py:129 +#: users/views/user.py:131 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:234 +#: users/views/user.py:240 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:331 +#: users/views/user.py:337 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:362 +#: users/views/user.py:368 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:381 +#: users/views/user.py:387 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:416 +#: users/views/user.py:422 msgid "Public key update" msgstr "密钥更新" -#: users/views/user.py:457 +#: users/views/user.py:463 msgid "Password invalid" msgstr "用户名或密码无效" -#: users/views/user.py:551 +#: users/views/user.py:557 msgid "MFA enable success" msgstr "MFA 绑定成功" -#: users/views/user.py:552 +#: users/views/user.py:558 msgid "MFA enable success, return login page" msgstr "MFA 绑定成功，返回到登录页面" -#: users/views/user.py:554 +#: users/views/user.py:560 msgid "MFA disable success" msgstr "MFA 解绑成功" -#: users/views/user.py:555 +#: users/views/user.py:561 msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" diff --git a/apps/terminal/templates/terminal/command_list.html b/apps/terminal/templates/terminal/command_list.html index 6b55d787e..50daf682d 100644 --- a/apps/terminal/templates/terminal/command_list.html +++ b/apps/terminal/templates/terminal/command_list.html @@ -92,27 +92,52 @@ {% endfor %} + +
+
+ +
+ +
+
+
{% endblock %} {% block custom_foot_js %} {% endblock %} diff --git a/apps/terminal/templates/terminal/command_report.html b/apps/terminal/templates/terminal/command_report.html new file mode 100644 index 000000000..3542c1423 --- /dev/null +++ b/apps/terminal/templates/terminal/command_report.html @@ -0,0 +1,103 @@ +{% load common_tags %} +{% load static %} + + + + + Command Report + + + + +
+
+

Command Report

+
+

total: {{ total_count }}

+

date: {{ now | ts_to_date }}

+
+ +
+ +
+ {% for command in queryset %} +
+

+ [{{ command.user}} {{ command.system_user }}@{{ command.asset }} {{ command.timestamp | ts_to_date }}] + {{ forloop.counter }} +

+ +

$ {{ command.input }}

+ + 
{{ command.output }}
+
+ +
+ {% endfor %} +
+
+
+ + \ No newline at end of file diff --git a/apps/terminal/urls/views_urls.py b/apps/terminal/urls/views_urls.py index 834d0f39d..c5865cb2b 100644 --- a/apps/terminal/urls/views_urls.py +++ b/apps/terminal/urls/views_urls.py @@ -24,5 +24,6 @@ urlpatterns = [ # Command view url(r'^command/$', views.CommandListView.as_view(), name='command-list'), + url(r'^command/export/$', views.CommandExportView.as_view(), name='command-export') ] diff --git a/apps/terminal/views/command.py b/apps/terminal/views/command.py index 748261414..5e12b7ea4 100644 --- a/apps/terminal/views/command.py +++ b/apps/terminal/views/command.py @@ -1,17 +1,19 @@ # -*- coding: utf-8 -*- # -from django.views.generic import ListView +from django.views.generic import ListView, View from django.conf import settings -from django.utils import timezone from django.utils.translation import ugettext as _ +from django.http import HttpResponse +from django.template import loader +import time from common.mixins import DatetimeSearchMixin, AdminUserRequiredMixin from ..models import Command from .. import utils from ..backends import get_multi_command_storage -__all__ = ['CommandListView'] +__all__ = ['CommandListView', 'CommandExportView'] common_storage = get_multi_command_storage() @@ -60,7 +62,43 @@ class CommandListView(DatetimeSearchMixin, AdminUserRequiredMixin, ListView): return super().get_context_data(**kwargs) +class CommandExportView(DatetimeSearchMixin, AdminUserRequiredMixin, View): + model = Command + command = user = asset = system_user = action = '' + date_from = date_to = None + def get(self, request, *args, **kwargs): + queryset = self.get_queryset() + template = 'terminal/command_report.html' + context = { + 'queryset': queryset, + 'total_count': len(queryset), + 'now': time.time(), + } + content = loader.render_to_string(template, context, request) + content_type = 'application/octet-stream' + response = HttpResponse(content, content_type) + filename = 'command-report-{}.html'.format(int(time.time())) + response['Content-Disposition'] = 'attachment; filename="%s"' % filename + return response - - + def get_queryset(self): + self.get_date_range() + self.action = self.request.GET.get('action', '') + self.command = self.request.GET.get('command', '') + self.user = self.request.GET.get("user", '') + self.asset = self.request.GET.get('asset', '') + self.system_user = self.request.GET.get('system_user', '') + filter_kwargs = dict() + filter_kwargs['date_from'] = self.date_from + filter_kwargs['date_to'] = self.date_to + if self.user: + filter_kwargs['user'] = self.user + if self.asset: + filter_kwargs['asset'] = self.asset + if self.system_user: + filter_kwargs['system_user'] = self.system_user + if self.command: + filter_kwargs['input'] = self.command + queryset = common_storage.filter(**filter_kwargs) + return queryset From 1c56ba5a113dcf9d0cbef01e11d636c93625716a Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 20 Jul 2018 18:48:57 +0800 Subject: [PATCH 05/12] [Update] paramiko => 2.4.1 --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 25d28f259..b0cdc31f3 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -46,7 +46,7 @@ MarkupSafe==1.0 mysqlclient==1.3.12 olefile==0.44 openapi-codec==1.3.2 -paramiko==2.4.0 +paramiko==2.4.1 passlib==1.7.1 Pillow==4.3.0 pyasn1==0.4.2 From 80f147cf131dbc383d8f4d99f89745f69f783c51 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 24 Jul 2018 16:40:41 +0800 Subject: [PATCH 06/12] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index c0a536276..547a9ac3d 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -336,6 +336,7 @@ AUTH_LDAP_GROUP_SEARCH = LDAPSearch( AUTH_LDAP_CONNECTION_OPTIONS = { ldap.OPT_TIMEOUT: 5 } +AUTH_LDAP_GROUP_CACHE_TIMEOUT = 1 AUTH_LDAP_ALWAYS_UPDATE_USER = True AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend' From f4c31d8e869ee1672c99861132fb3cd8a3ea02cc Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 25 Jul 2018 10:22:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset.py | 2 +- apps/perms/api.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 7a2b3fe57..b26c50216 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -154,7 +154,7 @@ class Asset(models.Model): return False, warning def is_unixlike(self): - if self.platform not in ("Windows",): + if self.platform not in ("Windows", "Windows2016"): return True else: return False diff --git a/apps/perms/api.py b/apps/perms/api.py index 88be52fe2..66b7d8056 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -73,10 +73,7 @@ class UserGrantedAssetsApi(ListAPIView): util = AssetPermissionUtil(user) for k, v in util.get_assets().items(): - if k.is_unixlike(): - system_users_granted = [s for s in v if s.protocol in ['ssh', 'telnet']] - else: - system_users_granted = [s for s in v if s.protocol in ['rdp', 'telnet']] + system_users_granted = [s for s in v if s.protocol == k.protocol] k.system_users_granted = system_users_granted queryset.append(k) return queryset @@ -124,10 +121,7 @@ class UserGrantedNodesWithAssetsApi(ListAPIView): for node, _assets in nodes.items(): assets = _assets.keys() for k, v in _assets.items(): - if k.is_unixlike(): - system_users_granted = [s for s in v if s.protocol in ['ssh', 'telnet']] - else: - system_users_granted = [s for s in v if s.protocol in ['rdp', 'telnet']] + system_users_granted = [s for s in v if s.protocol == k.protocol] k.system_users_granted = system_users_granted node.assets_granted = assets queryset.append(node) From ac238aa36e37513523ec00f7266189addb50c023 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Wed, 25 Jul 2018 17:51:09 +0800 Subject: [PATCH 08/12] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=EF=BC=8C3->7=20(#1586)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 修改用户登录失败限制次数，3->7 * [Update] 修改用户登录失败限制次数，3->7 - 续 --- apps/common/forms.py | 2 +- apps/jumpserver/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/forms.py b/apps/common/forms.py index a11420498..8667aa128 100644 --- a/apps/common/forms.py +++ b/apps/common/forms.py @@ -181,7 +181,7 @@ class SecuritySettingForm(BaseForm): ) # limit login count SECURITY_LOGIN_LIMIT_COUNT = forms.IntegerField( - initial=3, min_value=3, + initial=7, min_value=3, label=_("Limit the number of login failures") ) # limit login time diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index 547a9ac3d..0bd38d95b 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -406,7 +406,7 @@ TERMINAL_REPLAY_STORAGE = { DEFAULT_PASSWORD_MIN_LENGTH = 6 -DEFAULT_LOGIN_LIMIT_COUNT = 3 +DEFAULT_LOGIN_LIMIT_COUNT = 7 DEFAULT_LOGIN_LIMIT_TIME = 30 # Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html From 74c3f122757b2ce246e15b9c661c847dd85fa45c Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 26 Jul 2018 14:37:10 +0800 Subject: [PATCH 09/12] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E5=B0=86windows=E5=8D=8F=E8=AE=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BArdp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/domain.py | 2 +- utils/2018_07_15_set_win_protocol_to_ssh.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 utils/2018_07_15_set_win_protocol_to_ssh.sh diff --git a/apps/assets/models/domain.py b/apps/assets/models/domain.py index 6f29a0381..61c3bcc1f 100644 --- a/apps/assets/models/domain.py +++ b/apps/assets/models/domain.py @@ -43,7 +43,7 @@ class Gateway(AssetUser): ip = models.GenericIPAddressField(max_length=32, verbose_name=_('IP'), db_index=True) port = models.IntegerField(default=22, verbose_name=_('Port')) protocol = models.CharField(choices=PROTOCOL_CHOICES, max_length=16, default=SSH_PROTOCOL, verbose_name=_("Protocol")) - domain = models.ForeignKey(Domain, verbose_name=_("Domain")) + domain = models.ForeignKey(Domain, verbose_name=_("Domain"), on_delete=models.CASCADE) comment = models.CharField(max_length=128, blank=True, null=True, verbose_name=_("Comment")) is_active = models.BooleanField(default=True, verbose_name=_("Is active")) diff --git a/utils/2018_07_15_set_win_protocol_to_ssh.sh b/utils/2018_07_15_set_win_protocol_to_ssh.sh new file mode 100644 index 000000000..6d8596244 --- /dev/null +++ b/utils/2018_07_15_set_win_protocol_to_ssh.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# + +python ../apps/manage.py shell << EOF +from assets.models import Asset + +Asset.objects.filter(platform__startswith='Win').update(protocol='rdp') + +EOF From 7e65e44a3cec8e66eff60ea84f42d88755c73c25 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 26 Jul 2018 18:12:25 +0800 Subject: [PATCH 10/12] =?UTF-8?q?[Update]=20=E5=85=BC=E5=AE=B9guacamole?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=A8=A1=E5=BC=8F=E4=B8=8A=E4=BC=A0system=20?= =?UTF-8?q?user=E6=98=AFuuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/user.py | 20 +++++++++++++++++++ apps/terminal/api.py | 13 ++++++++---- apps/terminal/hands.py | 3 ++- .../templates/terminal/session_list.html | 2 +- apps/terminal/templatetags/terminal_tags.py | 2 ++ 5 files changed, 34 insertions(+), 6 deletions(-) diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index 5faca5da8..21b7c9a41 100644 --- a/apps/assets/models/user.py +++ b/apps/assets/models/user.py @@ -118,6 +118,8 @@ class SystemUser(AssetUser): shell = models.CharField(max_length=64, default='/bin/bash', verbose_name=_('Shell')) login_mode = models.CharField(choices=LOGIN_MODE_CHOICES, default=AUTO_LOGIN, max_length=10, verbose_name=_('Login mode')) + cache_key = "__SYSTEM_USER_CACHED_{}" + def __str__(self): return '{0.name}({0.username})'.format(self) @@ -154,6 +156,24 @@ class SystemUser(AssetUser): else: return False + def set_cache(self): + cache.set(self.cache_key.format(self.id), self, 3600) + + def expire_cache(self): + cache.delete(self.cache_key.format(self.id)) + + @classmethod + def get_system_user_by_id_or_cached(cls, sid): + cached = cache.get(cls.cache_key.format(sid)) + if cached: + return cached + try: + system_user = cls.objects.get(id=sid) + system_user.set_cache() + return system_user + except cls.DoesNotExist: + return None + class Meta: ordering = ['name'] verbose_name = _("System user") diff --git a/apps/terminal/api.py b/apps/terminal/api.py index b428acb3e..956491f21 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -4,7 +4,6 @@ from collections import OrderedDict import logging import os import uuid -import copy from django.core.cache import cache from django.shortcuts import get_object_or_404, redirect @@ -16,12 +15,13 @@ from django.conf import settings import jms_storage -from rest_framework import viewsets, serializers +from rest_framework import viewsets from rest_framework.views import APIView, Response from rest_framework.permissions import AllowAny from rest_framework_bulk import BulkModelViewSet -from common.utils import get_object_or_none +from common.utils import get_object_or_none, is_uuid +from .hands import SystemUser from .models import Terminal, Status, Session, Task from .serializers import TerminalSerializer, StatusSerializer, \ SessionSerializer, TaskSerializer, ReplaySerializer @@ -187,8 +187,13 @@ class SessionViewSet(viewsets.ModelViewSet): return self.queryset def perform_create(self, serializer): - if self.request.user.terminal: + if hasattr(self.request.user, 'terminal'): serializer.validated_data["terminal"] = self.request.user.terminal + sid = serializer.validated_data["system_user"] + if is_uuid(sid): + _system_user = SystemUser.get_system_user_by_id_or_cached(sid) + if _system_user: + serializer.validated_data["system_user"] = _system_user.name return super().perform_create(serializer) diff --git a/apps/terminal/hands.py b/apps/terminal/hands.py index ce075bfc5..3461730b8 100644 --- a/apps/terminal/hands.py +++ b/apps/terminal/hands.py @@ -4,4 +4,5 @@ from users.models import User from users.permissions import IsSuperUserOrAppUser, IsAppUser, \ IsSuperUserOrAppUserOrUserReadonly -from users.utils import AdminUserRequiredMixin \ No newline at end of file +from users.utils import AdminUserRequiredMixin +from assets.models import SystemUser \ No newline at end of file diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index 33ae09877..4bdf61fab 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -58,7 +58,7 @@
diff --git a/apps/terminal/templatetags/terminal_tags.py b/apps/terminal/templatetags/terminal_tags.py index c5643c67b..e8ba23186 100644 --- a/apps/terminal/templatetags/terminal_tags.py +++ b/apps/terminal/templatetags/terminal_tags.py @@ -1,6 +1,7 @@ # ~*~ coding: utf-8 ~*~ from django import template + from ..backends import get_multi_command_storage register = template.Library() @@ -10,3 +11,4 @@ command_store = get_multi_command_storage() @register.filter def get_session_command_amount(session_id): return command_store.count(session=session_id) + From d649aacfd6b0c101bbcf1ed806f917105a47a5d2 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 26 Jul 2018 18:25:14 +0800 Subject: [PATCH 11/12] =?UTF-8?q?[Update]=20asset=20platform=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88*required=20(#1595)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms/asset.py | 4 ++-- apps/assets/templates/assets/asset_create.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index 5000c087d..5e52e3ac9 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -45,7 +45,7 @@ class AssetCreateForm(forms.ModelForm): 'root or other NOPASSWD sudo privilege user existed in asset,' 'If asset is windows or other set any one, more see admin user left menu' ), - 'platform': _("* required Must set exact system platform, Windows, Linux ..."), + # 'platform': _("* required Must set exact system platform, Windows, Linux ..."), 'domain': _("If your have some network not connect with each other, you can set domain") } @@ -85,7 +85,7 @@ class AssetUpdateForm(forms.ModelForm): 'root or other NOPASSWD sudo privilege user existed in asset,' 'If asset is windows or other set any one, more see admin user left menu' ), - 'platform': _("* required Must set exact system platform, Windows, Linux ..."), + # 'platform': _("* required Must set exact system platform, Windows, Linux ..."), 'domain': _("If your have some network not connect with each other, you can set domain") } diff --git a/apps/assets/templates/assets/asset_create.html b/apps/assets/templates/assets/asset_create.html index 55e233d0d..2a3d62b3d 100644 --- a/apps/assets/templates/assets/asset_create.html +++ b/apps/assets/templates/assets/asset_create.html @@ -15,10 +15,10 @@ {% csrf_token %}

{% trans 'Basic' %}

{% bootstrap_field form.hostname layout="horizontal" %} - {% bootstrap_field form.platform layout="horizontal" %} {% bootstrap_field form.ip layout="horizontal" %} {% bootstrap_field form.protocol layout="horizontal" %} {% bootstrap_field form.port layout="horizontal" %} + {% bootstrap_field form.platform layout="horizontal" %} {% bootstrap_field form.public_ip layout="horizontal" %} {% bootstrap_field form.domain layout="horizontal" %} From 5ce3dd4079301a07f70da9cdefa2b77352509ea7 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 26 Jul 2018 19:30:37 +0800 Subject: [PATCH 12/12] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0unblock=20us?= =?UTF-8?q?er=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/unblock_all_user.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 utils/unblock_all_user.sh diff --git a/utils/unblock_all_user.sh b/utils/unblock_all_user.sh new file mode 100644 index 000000000..6fe4e3356 --- /dev/null +++ b/utils/unblock_all_user.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# + +python ../apps/manage.py shell << EOF +from django.core.cache import cache + +cache.delete_pattern('_LOGIN_BLOCK_*') +cache.delete_pattern('_LOGIN_LIMIT_*') + +EOF