From 4fd9957becadd6260d74b61e92c0d5a644f014f7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 20 Feb 2019 17:51:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9celery?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/api.py                   |  41 ++++++++++++-----------
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 61912 -> 61966 bytes
 apps/locale/zh/LC_MESSAGES/django.po |  48 +++++++++++++++------------
 apps/ops/api/celery.py               |   7 ++++
 4 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/apps/common/api.py b/apps/common/api.py
index 6a2017cd4..cf3855b60 100644
--- a/apps/common/api.py
+++ b/apps/common/api.py
@@ -199,6 +199,8 @@ class LogTailApi(generics.RetrieveAPIView):
     buff_size = 1024 * 10
     serializer_class = OutputSerializer
     end = False
+    mark = ''
+    log_path = ''
 
     def is_file_finish_write(self):
         return True
@@ -206,6 +208,9 @@ class LogTailApi(generics.RetrieveAPIView):
     def get_log_path(self):
         raise NotImplementedError()
 
+    def get_no_file_message(self, request):
+        return 'Not found the log'
+
     def filter_line(self, line):
         """
         过滤行，可能替换一些信息
@@ -214,27 +219,14 @@ class LogTailApi(generics.RetrieveAPIView):
         """
         return line
 
-    def get(self, request, *args, **kwargs):
-        mark = request.query_params.get("mark") or str(uuid.uuid4())
-        log_path = self.get_log_path()
-
-        if not log_path or not os.path.isfile(log_path):
-            if self.is_file_finish_write():
-                return Response({
-                    "data": 'Not found the log',
-                    'end': True,
-                    'mark': mark
-                })
-            else:
-                return Response({"data": "Waiting...\r\n"}, status=200)
-
-        with open(log_path, 'r') as f:
-            offset = cache.get(mark, 0)
+    def read_from_file(self):
+        with open(self.log_path, 'r') as f:
+            offset = cache.get(self.mark, 0)
             f.seek(offset)
             data = f.read(self.buff_size).replace('\n', '\r\n')
 
-            mark = str(uuid.uuid4())
-            cache.set(mark, f.tell(), 5)
+            new_mark = str(uuid.uuid4())
+            cache.set(new_mark, f.tell(), 5)
 
             if data == '' and self.is_file_finish_write():
                 self.end = True
@@ -244,4 +236,15 @@ class LogTailApi(generics.RetrieveAPIView):
                 if line == '':
                     continue
                 _data += new_line + '\r\n'
-            return Response({"data": _data, 'end': self.end, 'mark': mark})
+            return _data, self.end, new_mark
+
+    def get(self, request, *args, **kwargs):
+        self.mark = request.query_params.get("mark") or str(uuid.uuid4())
+        self.log_path = self.get_log_path()
+
+        if not self.log_path or not os.path.isfile(self.log_path):
+            msg = self.get_no_file_message(self.request)
+            return Response({"data": msg}, status=200)
+
+        data, end, new_mark = self.read_from_file()
+        return Response({"data": data, 'end': end, 'mark': new_mark})
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 33091ed2ff7a38ec8bd65ef51693f33807fbc510..d57d38faf3e5fb4c5d0d12efe7f7b903f688b151 100644
GIT binary patch
delta 14108
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
Bs}ukL

delta 14055
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

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 8502e7c3d..28c411839 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-28 12:56+0800\n"
+"POT-Creation-Date: 2019-02-20 16:46+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "You can't update the root node name"
 msgstr "不能修改根节点名称"
 
-#: assets/api/node.py:281
+#: assets/api/node.py:282
 msgid "Update node asset hardware information: {}"
 msgstr "更新节点资产硬件信息: {}"
 
-#: assets/api/node.py:295
+#: assets/api/node.py:296
 msgid "Test if the assets under the node are connectable: {}"
 msgstr "测试节点下资产是否可连接: {}"
 
@@ -764,48 +764,48 @@ msgstr "获取资产信息失败：{}"
 msgid "Update some assets hardware info"
 msgstr "更新资产硬件信息"
 
-#: assets/tasks.py:136
+#: assets/tasks.py:134
 msgid "Update asset hardware info: {}"
 msgstr "更新资产硬件信息: {}"
 
-#: assets/tasks.py:161
+#: assets/tasks.py:159
 msgid "Test assets connectivity"
 msgstr "测试资产可连接性"
 
-#: assets/tasks.py:185
+#: assets/tasks.py:183
 msgid "Test assets connectivity: {}"
 msgstr "测试资产可连接性: {}"
 
-#: assets/tasks.py:224
+#: assets/tasks.py:225
 msgid "Test admin user connectivity period: {}"
 msgstr "定期测试管理账号可连接性: {}"
 
-#: assets/tasks.py:231
+#: assets/tasks.py:232
 msgid "Test admin user connectivity: {}"
 msgstr "测试管理行号可连接性: {}"
 
-#: assets/tasks.py:270
+#: assets/tasks.py:271
 msgid "Test system user connectivity: {}"
 msgstr "测试系统用户可连接性: {}"
 
-#: assets/tasks.py:277
+#: assets/tasks.py:278
 msgid "Test system user connectivity: {} => {}"
 msgstr "测试系统用户可连接性: {} => {}"
 
-#: assets/tasks.py:290
+#: assets/tasks.py:291
 msgid "Test system user connectivity period: {}"
 msgstr "定期测试系统用户可连接性: {}"
 
-#: assets/tasks.py:362
+#: assets/tasks.py:363
 msgid ""
 "Push system user task skip, auto push not enable or protocol is not ssh: {}"
 msgstr "推送系统用户任务跳过，自动推送没有打开，或协议不是ssh: {}"
 
-#: assets/tasks.py:382 assets/tasks.py:396
+#: assets/tasks.py:383 assets/tasks.py:397
 msgid "Push system users to assets: {}"
 msgstr "推送系统用户到入资产: {}"
 
-#: assets/tasks.py:388
+#: assets/tasks.py:389
 msgid "Push system users to asset: {} => {}"
 msgstr "推送系统用户到入资产: {} => {}"
 
@@ -1092,7 +1092,7 @@ msgstr "选择节点"
 
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:208
-#: assets/templates/assets/asset_list.html:635
+#: assets/templates/assets/asset_list.html:636
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_asset.html:112
 #: assets/templates/assets/system_user_detail.html:182
@@ -1312,7 +1312,7 @@ msgstr "重命名成功"
 msgid "Rename failed, do not change the root node name"
 msgstr "重命名失败，不能更改root节点的名称"
 
-#: assets/templates/assets/asset_list.html:629
+#: assets/templates/assets/asset_list.html:630
 #: assets/templates/assets/system_user_list.html:137
 #: users/templates/users/user_detail.html:382
 #: users/templates/users/user_detail.html:408
@@ -1322,11 +1322,11 @@ msgstr "重命名失败，不能更改root节点的名称"
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:630
+#: assets/templates/assets/asset_list.html:631
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:633
+#: assets/templates/assets/asset_list.html:634
 #: assets/templates/assets/system_user_list.html:141
 #: common/templates/common/terminal_setting.html:163
 #: users/templates/users/user_detail.html:386
@@ -1339,16 +1339,16 @@ msgstr "删除选择资产"
 msgid "Cancel"
 msgstr "取消"
 
-#: assets/templates/assets/asset_list.html:639
+#: assets/templates/assets/asset_list.html:640
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:640
-#: assets/templates/assets/asset_list.html:645
+#: assets/templates/assets/asset_list.html:641
+#: assets/templates/assets/asset_list.html:646
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:644
+#: assets/templates/assets/asset_list.html:645
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
@@ -2315,6 +2315,10 @@ msgstr ""
 "div><div>如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运</"
 "div>"
 
+#: ops/api/celery.py:54
+msgid "Waiting task start"
+msgstr "等待任务开始"
+
 #: ops/models/adhoc.py:38
 msgid "Interval"
 msgstr "间隔"
diff --git a/apps/ops/api/celery.py b/apps/ops/api/celery.py
index caffff601..6be58770f 100644
--- a/apps/ops/api/celery.py
+++ b/apps/ops/api/celery.py
@@ -4,6 +4,7 @@
 import os
 import re
 
+from django.utils.translation import ugettext as _
 from celery.result import AsyncResult
 from rest_framework import generics
 
@@ -46,6 +47,12 @@ class CeleryTaskLogApi(LogTailApi):
     def is_file_finish_write(self):
         return self.task.ready()
 
+    def get_no_file_message(self, request):
+        if self.mark == 'undefined':
+            return '.'
+        else:
+            return _('Waiting task start')
+
 
 class CeleryResultApi(generics.RetrieveAPIView):
     permission_classes = (IsValidUser,)

From 859f2d97951ad731f342cd14683d68c2ea770c84 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 20 Feb 2019 19:00:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E6=94=AF=E6=8C=81telnet?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/forms.py                 |   4 +++
 apps/jumpserver/conf.py              |   1 +
 apps/jumpserver/settings.py          |   1 +
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 61966 -> 62169 bytes
 apps/locale/zh/LC_MESSAGES/django.po |  47 ++++++++++++++++-----------
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/apps/common/forms.py b/apps/common/forms.py
index 33ee48f03..36ab924b7 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -159,6 +159,10 @@ class TerminalSettingForm(BaseForm):
         help_text=_("Units: days, Session, record, command will be delete "
                     "if more than duration, only in database")
     )
+    TERMINAL_TELNET_REGEX = forms.CharField(
+        required=False, label=_("Telnet login regex"),
+        help_text=_("ex: Last\s*login|success|成功")
+    )
 
 
 class TerminalCommandStorage(BaseForm):
diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 971184c31..757af26fe 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -330,6 +330,7 @@ defaults = {
     'TERMINAL_ASSET_LIST_PAGE_SIZE': 'auto',
     'TERMINAL_SESSION_KEEP_DURATION': 9999,
     'TERMINAL_HOST_KEY': '',
+    'TERMINAL_TELNET_REGEX': '',
     'SECURITY_MFA_AUTH': False,
     'SECURITY_LOGIN_LIMIT_COUNT': 7,
     'SECURITY_LOGIN_LIMIT_TIME': 30,
diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index 40f757d39..f6db4e37d 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -555,3 +555,4 @@ SWAGGER_SETTINGS = {
 
 # Default email suffix
 EMAIL_SUFFIX = CONFIG.EMAIL_SUFFIX
+TERMINAL_TELNET_REGEX = CONFIG.TERMINAL_TELNET_REGEX
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index d57d38faf3e5fb4c5d0d12efe7f7b903f688b151..6b3607f4b112feac7e3c1d6d04554d7cf13aca31 100644
GIT binary patch
delta 15714
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
R@|QpT|E?s-FaPt6{{d#`zW@LL

delta 15514
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
WXV%MIyKq9|+%CtOMEgHozy5zJk9t%9

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 28c411839..85bddd065 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-02-20 16:46+0800\n"
+"POT-Creation-Date: 2019-02-20 18:56+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -2003,45 +2003,54 @@ msgstr ""
 "单位：天。 会话、录像、命令记录超过该时长将会被删除(仅影响数据库存储, oss等不"
 "受影响)"
 
-#: common/forms.py:171
+#: common/forms.py:163
+msgid "Telnet login regex"
+msgstr "Telnet 成功正则表达式"
+
+#: common/forms.py:164
+msgid "ex: Last\\s*login|success|成功"
+msgstr ""
+"登录telnet服务器成功后的提示正则表达式，如: Last\\s*login|success|成功 "
+
+#: common/forms.py:175
 msgid "MFA Secondary certification"
 msgstr "MFA 二次认证"
 
-#: common/forms.py:173
+#: common/forms.py:177
 msgid ""
 "After opening, the user login must use MFA secondary authentication (valid "
 "for all users, including administrators)"
 msgstr "开启后，用户登录必须使用MFA二次认证（对所有用户有效，包括管理员）"
 
-#: common/forms.py:179
+#: common/forms.py:183
 msgid "Limit the number of login failures"
 msgstr "限制登录失败次数"
 
-#: common/forms.py:183
+#: common/forms.py:187
 msgid "No logon interval"
 msgstr "禁止登录时间间隔"
 
-#: common/forms.py:185
+#: common/forms.py:189
 msgid ""
 "Tip: (unit/minute) if the user has failed to log in for a limited number of "
 "times, no login is allowed during this time interval."
 msgstr ""
 "提示：（单位：分）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录"
 
-#: common/forms.py:191
+#: common/forms.py:195
 msgid "Connection max idle time"
 msgstr "SSH最大空闲时间"
 
-#: common/forms.py:193
+#: common/forms.py:197
 msgid ""
 "If idle time more than it, disconnect connection(only ssh now) Unit: minute"
 msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）"
 
-#: common/forms.py:199
+#: common/forms.py:203
 msgid "Password expiration time"
 msgstr "密码过期时间"
 
-#: common/forms.py:202
+#: common/forms.py:206
 msgid ""
 "Tip: (unit: day) If the user does not update the password during the time, "
 "the user password will expire failure;The password expiration reminder mail "
@@ -2051,45 +2060,45 @@ msgstr ""
 "提示：（单位：天）如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期"
 "提醒邮件将在密码过期前5天内由系统（每天）自动发送给用户"
 
-#: common/forms.py:211
+#: common/forms.py:215
 msgid "Password minimum length"
 msgstr "密码最小长度 "
 
-#: common/forms.py:215
+#: common/forms.py:219
 msgid "Must contain capital letters"
 msgstr "必须包含大写字母"
 
-#: common/forms.py:217
+#: common/forms.py:221
 msgid ""
 "After opening, the user password changes and resets must contain uppercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含大写字母"
 
-#: common/forms.py:222
+#: common/forms.py:226
 msgid "Must contain lowercase letters"
 msgstr "必须包含小写字母"
 
-#: common/forms.py:223
+#: common/forms.py:227
 msgid ""
 "After opening, the user password changes and resets must contain lowercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含小写字母"
 
-#: common/forms.py:228
+#: common/forms.py:232
 msgid "Must contain numeric characters"
 msgstr "必须包含数字字符"
 
-#: common/forms.py:229
+#: common/forms.py:233
 msgid ""
 "After opening, the user password changes and resets must contain numeric "
 "characters"
 msgstr "开启后，用户密码修改、重置必须包含数字字符"
 
-#: common/forms.py:234
+#: common/forms.py:238
 msgid "Must contain special characters"
 msgstr "必须包含特殊字符"
 
-#: common/forms.py:235
+#: common/forms.py:239
 msgid ""
 "After opening, the user password changes and resets must contain special "
 "characters"