From e9103ee608b2a0993f93e3bfd6450205965307ce Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 2 Apr 2020 15:14:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[Update]=20=E5=AF=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89MetaDict=E5=AD=97=E6=AE=B5=E5=80=BC=E8=BF=9B=E8=A1=8Cs?=
 =?UTF-8?q?trip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/fields/serializer.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/common/fields/serializer.py b/apps/common/fields/serializer.py
index a05b49376..e7a6e7d9c 100644
--- a/apps/common/fields/serializer.py
+++ b/apps/common/fields/serializer.py
@@ -101,6 +101,15 @@ class CustomMetaDictField(serializers.DictField):
         filter_value = {k: v for k, v in value.items() if k in fields_names}
         return filter_value
 
+    @staticmethod
+    def strip_value(value):
+        new_value = {}
+        for k, v in value.items():
+            if isinstance(v, str):
+                v = v.strip()
+            new_value[k] = v
+        return new_value
+
     def get_value(self, dictionary):
         """
         反序列化时调用
@@ -108,4 +117,5 @@ class CustomMetaDictField(serializers.DictField):
         value = super().get_value(dictionary)
         value = self.convert_value_key(dictionary, value)
         value = self.filter_value_key(dictionary, value)
+        value = self.strip_value(value)
         return value

From e9fc56c0563a2edabcaab2bb694fbb949ce725e3 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 2 Apr 2020 16:02:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/static/js/jumpserver.js | 3 ++-
 apps/templates/_foot_js.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 0adae3e10..9081d3a94 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -1256,7 +1256,8 @@ function toSafeDateISOStr(s) {
 
 function toSafeLocalDateStr(d) {
     var date = safeDate(d);
-    var date_s = date.toLocaleString(getUserLang(), {hour12: false});
+    // var date_s = date.toLocaleString(getUserLang(), {hour12: false});
+    var date_s = date.toLocaleString(getUserLang(), {hourCycle: "h23"});
     return date_s.split("/").join('-')
 }
 
diff --git a/apps/templates/_foot_js.html b/apps/templates/_foot_js.html
index b140e7862..ff158b54b 100644
--- a/apps/templates/_foot_js.html
+++ b/apps/templates/_foot_js.html
@@ -7,7 +7,7 @@
 <script src="{% static "js/plugins/toastr/toastr.min.js" %}"></script>
 <script src="{% static "js/inspinia.js" %}"></script>
 <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
-<script src="{% static "js/jumpserver.js" %}?v=7"></script>
+<script src="{% static "js/jumpserver.js" %}?v=8"></script>
 <script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script>
 <script src="{% static 'js/plugins/select2/i18n/zh-CN.js' %}"></script>
 <script>

From 29b099efc069cf84246abb82dde80dc1d5c6cfa1 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 2 Apr 2020 19:45:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E4=BC=9A=E8=AF=9D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/models.py                            |  5 +++++
 apps/terminal/serializers/session.py               |  2 +-
 apps/terminal/templates/terminal/session_list.html | 12 +++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/terminal/models.py b/apps/terminal/models.py
index f73eada2b..08014a87d 100644
--- a/apps/terminal/models.py
+++ b/apps/terminal/models.py
@@ -243,6 +243,11 @@ class Session(OrgModelMixin):
             return True
         return False
 
+    def can_join(self):
+        if self.protocol in ['ssh', 'telnet', 'mysql']:
+            return True
+        return False
+
     def save_to_storage(self, f):
         local_path = self.get_local_path()
         try:
diff --git a/apps/terminal/serializers/session.py b/apps/terminal/serializers/session.py
index 006529b15..85d9241a7 100644
--- a/apps/terminal/serializers/session.py
+++ b/apps/terminal/serializers/session.py
@@ -21,7 +21,7 @@ class SessionSerializer(BulkOrgResourceModelSerializer):
             "user_id", "asset_id", "system_user_id",
             "login_from", "login_from_display", "remote_addr",
             "is_success",  "is_finished", "has_replay", "can_replay",
-            "protocol", "date_start", "date_end",
+            "can_join", "protocol", "date_start", "date_end",
             "terminal",
         ]
 
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index 7fd8a5a07..ff25a5fbb 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -146,10 +146,15 @@ function initTable() {
                         .replace("sessionID", cellData)
                         .replace("terminalID", rowData.terminal)
                 }
+                var joinBtn = ' <a disabled data-session="sessionID" class="btn btn-xs btn-info btn-join" >{% trans "Join" %}</a>';
+                joinBtn = joinBtn.replace("sessionID", rowData.id);
+                if (rowData.can_join){
+                    joinBtn = joinBtn.replace("disabled", "")
+                }
                 if (rowData.is_finished) {
                     btnGroup += replayBtn + downloadBtn
                 } else {
-                    btnGroup += termBtn;
+                    btnGroup += termBtn + joinBtn;
                 }
                 $(td).html(btnGroup);
             }},
@@ -246,6 +251,11 @@ $(document).ready(function() {
     }
     window.open(downloadUrl)
 })
+.on('click', '.btn-join', function () {
+    var sessionID = $(this).data("session");
+    var joinUrl = "/luna/join/?shareroom=" + sessionID;
+    window.open(joinUrl, "height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no");
+})
 .on("click", '#session_table_filter input', function (e) {
     e.preventDefault();
     e.stopPropagation();

From e9827c8b2525fd16ffc1fee9263c54f5d737e97c Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 7 Apr 2020 12:26:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E5=8A=A0=E5=85=A5=E6=A0=A1=E9=AA=8CAPI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/api/session.py         | 46 +++++++++++++++++++++++++---
 apps/terminal/models.py              |  8 +++--
 apps/terminal/serializers/session.py |  7 ++++-
 apps/terminal/urls/api_urls.py       |  1 +
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py
index b036f376c..4653e673d 100644
--- a/apps/terminal/api/session.py
+++ b/apps/terminal/api/session.py
@@ -1,22 +1,27 @@
 # -*- coding: utf-8 -*-
 #
+from django.utils.translation import ugettext as _
 from django.shortcuts import get_object_or_404, reverse
 from django.core.files.storage import default_storage
-from rest_framework import viewsets
+from rest_framework import viewsets, views
 from rest_framework.response import Response
 
-from common.utils import is_uuid, get_logger
+from common.utils import is_uuid, get_logger, get_object_or_none
 from common.mixins.api import AsyncApiMixin
-from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor
+from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor, IsAppUser
 from common.drf.filters import DatetimeRangeFilter
 from orgs.mixins.api import OrgBulkModelViewSet
+from orgs.utils import tmp_to_root_org, tmp_to_org
+from users.models import User
 from ..utils import find_session_replay_local, download_session_replay
 from ..hands import SystemUser
 from ..models import Session
 from .. import serializers
 
 
-__all__ = ['SessionViewSet', 'SessionReplayViewSet',]
+__all__ = [
+    'SessionViewSet', 'SessionReplayViewSet', 'SessionJoinValidateAPI'
+]
 logger = get_logger(__name__)
 
 
@@ -117,3 +122,36 @@ class SessionReplayViewSet(AsyncApiMixin, viewsets.ViewSet):
                 return Response({"error": url})
         data = self.get_replay_data(session, url)
         return Response(data)
+
+
+class SessionJoinValidateAPI(views.APIView):
+    permission_classes = (IsAppUser, )
+    serializer_class = serializers.SessionJoinValidateSerializer
+
+    def post(self, request, *args, **kwargs):
+        serializer = self.serializer_class(data=request.data)
+        if not serializer.is_valid():
+            msg = str(serializer.errors)
+            return Response({'ok': False, 'msg': msg}, status=401)
+        user_id = serializer.validated_data['user_id']
+        session_id = serializer.validated_data['session_id']
+
+        with tmp_to_root_org():
+            session = get_object_or_none(Session, pk=session_id)
+        if not session:
+            msg = _('Session does not exist: {}'.format(session_id))
+            return Response({'ok': False, 'msg': msg}, status=401)
+        if not session.can_join():
+            msg = _('Session is finished or the protocol not supported')
+            return Response({'ok': False, 'msg': msg}, status=401)
+
+        user = get_object_or_none(User, pk=user_id)
+        if not user:
+            msg = _('User does not exist: {}'.format(user_id))
+            return Response({'ok': False, 'msg': msg}, status=401)
+        with tmp_to_org(session.org):
+            if not user.admin_or_audit_orgs:
+                msg = _('User does not have permission')
+                return Response({'ok': False, 'msg': msg}, status=401)
+
+        return Response({'ok': True, 'msg': ''}, status=200)
diff --git a/apps/terminal/models.py b/apps/terminal/models.py
index 08014a87d..3dd34de86 100644
--- a/apps/terminal/models.py
+++ b/apps/terminal/models.py
@@ -244,9 +244,11 @@ class Session(OrgModelMixin):
         return False
 
     def can_join(self):
-        if self.protocol in ['ssh', 'telnet', 'mysql']:
-            return True
-        return False
+        if self.is_finished:
+            return False
+        if self.protocol not in ['ssh', 'telnet', 'mysql']:
+            return False
+        return True
 
     def save_to_storage(self, f):
         local_path = self.get_local_path()
diff --git a/apps/terminal/serializers/session.py b/apps/terminal/serializers/session.py
index 85d9241a7..bed6525b5 100644
--- a/apps/terminal/serializers/session.py
+++ b/apps/terminal/serializers/session.py
@@ -6,7 +6,7 @@ from ..models import Session
 
 __all__ = [
     'SessionSerializer', 'SessionDisplaySerializer',
-    'ReplaySerializer',
+    'ReplaySerializer', 'SessionJoinValidateSerializer',
 ]
 
 
@@ -35,3 +35,8 @@ class SessionDisplaySerializer(SessionSerializer):
 
 class ReplaySerializer(serializers.Serializer):
     file = serializers.FileField(allow_empty_file=True)
+
+
+class SessionJoinValidateSerializer(serializers.Serializer):
+    user_id = serializers.UUIDField()
+    session_id = serializers.UUIDField()
diff --git a/apps/terminal/urls/api_urls.py b/apps/terminal/urls/api_urls.py
index 8c19fa685..1b2eb156c 100644
--- a/apps/terminal/urls/api_urls.py
+++ b/apps/terminal/urls/api_urls.py
@@ -22,6 +22,7 @@ router.register(r'replay-storages', api.ReplayStorageViewSet, 'replay-storage')
 router.register(r'command-storages', api.CommandStorageViewSet, 'command-storage')
 
 urlpatterns = [
+    path('sessions/join/validate/', api.SessionJoinValidateAPI.as_view(), name='join-session'),
     path('sessions/<uuid:pk>/replay/',
          api.SessionReplayViewSet.as_view({'get': 'retrieve', 'post': 'create'}),
          name='session-replay'),