From 3ba80f02d24bb232a757f1b749f3f8ece75b6771 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Tue, 13 Sep 2022 09:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E5=88=B0?=
 =?UTF-8?q?=203.6.4-b3=201.=20=E6=A3=80=E6=9F=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=E7=9A=84=E7=A9=BA=E5=AF=86=E7=A0=81=E5=B9=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=9B=202.=20=E5=88=86=E7=BB=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=9A=E6=A3=80=E6=9F=A5=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90=EF=BC=9B=203.=20?=
 =?UTF-8?q?=E5=AF=B9=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E8=BD=AC=E4=B9=89=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8Dsql=E6=B3=A8=E5=85=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/teleport.iml                            |   2 +-
 build/builder/build-version.py                |  14 ++++-----
 build/builder/core/ver.py                     |   8 ++---
 dist/client/windows/assist/installer.nsi      | Bin 3054 -> 2940 bytes
 server/tp_core/core/tp_core.rc                | Bin 5146 -> 5146 bytes
 server/tp_core/core/ts_ver.h                  |  12 ++++----
 server/www/requirements.txt                   |   4 +--
 .../teleport/static/js/audit/record-list.js   |   2 +-
 .../teleport/static/js/ops/session-list.js    |   2 +-
 server/www/teleport/webroot/app/app_env.py    |  20 ++++++-------
 server/www/teleport/webroot/app/app_ver.py    |   8 ++---
 .../teleport/webroot/app/base/controller.py   |  22 ++++++++++++++
 .../teleport/webroot/app/controller/group.py  |  28 ++++++++++++++++--
 .../teleport/webroot/app/controller/user.py   |  13 ++++++++
 version.in                                    |   6 ++--
 15 files changed, 100 insertions(+), 41 deletions(-)

diff --git a/.idea/teleport.iml b/.idea/teleport.iml
index ab4b55b..174f52a 100644
--- a/.idea/teleport.iml
+++ b/.idea/teleport.iml
@@ -2,7 +2,7 @@
 <module classpath="CMake" type="CPP_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Python" name="Python facet">
-      <configuration sdkName="Python 3.7" />
+      <configuration sdkName="Python 3.9" />
     </facet>
   </component>
 </module>
\ No newline at end of file
diff --git a/build/builder/build-version.py b/build/builder/build-version.py
index 7ccc157..80589eb 100644
--- a/build/builder/build-version.py
+++ b/build/builder/build-version.py
@@ -462,13 +462,13 @@ class Builder:
                 if len(ver_array) != 2:
                     raise RuntimeError('Invalid .pbxproj file.')
 
-                _ver = ver_array[1].strip()[:-1].strip()
-                v = _ver.split(".")
-                if len(v) < 3:
-                    raise RuntimeError('Invalid .pbxproj file.')
-                old_ver = '.'.join(v)
-                if old_ver == ver:
-                    continue
+                # _ver = ver_array[1].strip()[:-1].strip()
+                # v = _ver.split(".")
+                # if len(v) < 3:
+                #     raise RuntimeError('Invalid .pbxproj file.')
+                # old_ver = '.'.join(v)
+                # if old_ver == ver:
+                #     continue
                 lines[x] = '{flag} = {ver};\n'.format(flag=ver_array[0], ver=ver)
                 bOK = True
 
diff --git a/build/builder/core/ver.py b/build/builder/core/ver.py
index d83182b..10d07ec 100644
--- a/build/builder/core/ver.py
+++ b/build/builder/core/ver.py
@@ -1,4 +1,4 @@
-# -*- coding: utf8 -*-
-VER_TP_SERVER = "3.6.3"
-VER_TP_ASSIST = "3.6.3"
-VER_TP_STATE = "b2"
+# -*- coding: utf8 -*-
+VER_TP_SERVER = "3.6.4"
+VER_TP_ASSIST = "3.6.3"
+VER_TP_STATE = "b3"
diff --git a/dist/client/windows/assist/installer.nsi b/dist/client/windows/assist/installer.nsi
index 37f0298179be7b528009b19fec3e6247faaa3ec4..8d1cd6b293a2c759a11514dbbc1d018d6f9edcfd 100644
GIT binary patch
delta 367
zcmaDS{zq&=*~E%0W-bQn$&5_JLO_}UgcTTOMSJ>L#GRiwxrotk@*ze8cBm9k*~Ezo
zEX+W4lOHk*PhP{M!3bf!VX~V1h*@c}7qcFip2Msr$ptlSx!=K%&gi2ZtikRKp$wi3
zE<n9g!K!Alm_TWs$^Tf4z-B2=j$jo6iV97xV^smu+gRm*GB;WECtqL@nJmX<0_26W
zsZVZT^8vChvc*flY+_HI6+OBCS73YUH$UEx50#Vs*k=Hhyk@tY{Eky?@&*pE$tfIa
zlY2O<SV2DGocxhfc=7`d2^1d3WGPN1L6E#6Ln=caLkdGCLmJS-!JNTBvp#a_PQJz|
w1~kuZvL2TkFz~o0*K%o2uHzD$ypKx+sNy=;!O63@9rz%Qa%J#ma03Pe052bCDF6Tf

delta 478
zcmew(_D+0489Ofn7lSne=j69c@)KvdG4f8lUoHU=gOCagv!XryEaJ{j<Ykzg!RW`x
zJ9#UkAygYk^+W|Fc54QZV&2IInS>|LVA5cP@qB@*L1GHbc2HIUvza_t7Hq8o!*aia
zA)V1jJ6MC=8A2I68C;;IC@>35e#Be^*Do=-jztHFcZJ0aZVSkKfysKTLQwf2Ruw3#
zgH;ZyYB{SuRO|&SOs71XI#euz%?he+GF!YXvisPRXGKr${}tGt`pu6w<U=LIKQioX
zQ1y%1ErDiC<W!%`#32S`iF2qk0Rzg8!wSeL=P(44%Q>9IK}K3LC^Don<T0c$WHO{d
z1MD|PFi-_3h!QxBfUJp}_F&R*5|<b!%pJUw9l69O8*qXA=g6fEwK<pTAds)i?I;3M
OXU*Ws;LqR&HW~o!rDwPR

diff --git a/server/tp_core/core/tp_core.rc b/server/tp_core/core/tp_core.rc
index 4d1b37a588be9c6d973cac1c40651fa2989274ce..544da0b5760db0c70cb4c6fe3d376493a37a8039 100644
GIT binary patch
delta 42
wcmbQGF-v2^0uDx#$qPC38BI1{<haQM<m}~@ovgqsw)r0SJw~ADUfx(X063lwE&u=k

delta 42
wcmbQGF-v2^0uDyw$qPC38I3nz<haQM<m}~@ovgqsw)r0SJw~ADUfx(X060YsDgXcg

diff --git a/server/tp_core/core/ts_ver.h b/server/tp_core/core/ts_ver.h
index 88578c3..3aefb63 100644
--- a/server/tp_core/core/ts_ver.h
+++ b/server/tp_core/core/ts_ver.h
@@ -1,6 +1,6 @@
-#ifndef __TS_SERVER_VER_H__
-#define __TS_SERVER_VER_H__
-
-#define TP_SERVER_VER	L"3.6.3"
-
-#endif // __TS_SERVER_VER_H__
+#ifndef __TS_SERVER_VER_H__
+#define __TS_SERVER_VER_H__
+
+#define TP_SERVER_VER	L"3.6.4"
+
+#endif // __TS_SERVER_VER_H__
diff --git a/server/www/requirements.txt b/server/www/requirements.txt
index b39e624..7aff58b 100644
--- a/server/www/requirements.txt
+++ b/server/www/requirements.txt
@@ -7,7 +7,7 @@
 tornado
 PyMySQL
 psutil
-jinja2
+Jinja2
 MarkupSafe
 Pillow
 wheezy.captcha
@@ -15,7 +15,7 @@ qrcode
 ldap3
 cffi
 
-# for Windows
+# for Windows/macOS
 pycryptodome
 # for Linux
 pycrypto
diff --git a/server/www/teleport/static/js/audit/record-list.js b/server/www/teleport/static/js/audit/record-list.js
index da67e00..e045b46 100644
--- a/server/www/teleport/static/js/audit/record-list.js
+++ b/server/www/teleport/static/js/audit/record-list.js
@@ -449,7 +449,7 @@ $app.on_table_host_render_created = function (render) {
     };
 
     render.time_begin = function (row_id, fields) {
-        return tp_format_datetime(fields.time_begin, 'MM-dd HH:mm:ss');
+        return tp_format_datetime(fields.time_begin);
     };
 
     render.time_cost = function (row_id, fields) {
diff --git a/server/www/teleport/static/js/ops/session-list.js b/server/www/teleport/static/js/ops/session-list.js
index b680d6e..dc1b407 100644
--- a/server/www/teleport/static/js/ops/session-list.js
+++ b/server/www/teleport/static/js/ops/session-list.js
@@ -283,7 +283,7 @@ $app.on_table_session_render_created = function (render) {
     };
 
     render.time_begin = function (row_id, fields) {
-        return tp_format_datetime(fields.time_begin, 'MM-dd HH:mm:ss');
+        return tp_format_datetime(fields.time_begin);
     };
 
     render.time_cost = function (row_id, fields) {
diff --git a/server/www/teleport/webroot/app/app_env.py b/server/www/teleport/webroot/app/app_env.py
index b9755fa..2d87ae4 100644
--- a/server/www/teleport/webroot/app/app_env.py
+++ b/server/www/teleport/webroot/app/app_env.py
@@ -24,6 +24,12 @@ if PLATFORM not in ['windows', 'linux', 'darwin']:
 
 PATH_DATA = ''
 
+PATH_APP_ROOT = os.path.abspath(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', '..'))
+
+BITS = 'x64'
+if '32bit' == platform.architecture()[0]:
+    BITS = 'x86'
+
 # 将Python安装的扩展库移除，避免开发调试与正式发布所依赖的库文件不一致导致发布的版本无法运行
 # if PLATFORM != 'darwin':
 if PLATFORM not in ['windows', 'darwin']:
@@ -34,16 +40,10 @@ if PLATFORM not in ['windows', 'darwin']:
     for p in x:
         sys.path.remove(p)
 
-PATH_APP_ROOT = os.path.abspath(os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', '..'))
-
-BITS = 'x64'
-if '32bit' == platform.architecture()[0]:
-    BITS = 'x86'
-
-# 引入必要的扩展库
-_ext_path = os.path.abspath(os.path.join(PATH_APP_ROOT, '..', 'packages', 'packages-{}'.format(PLATFORM), BITS))
-if _ext_path not in sys.path:
-    sys.path.append(_ext_path)
+    # 引入必要的扩展库
+    _ext_path = os.path.abspath(os.path.join(PATH_APP_ROOT, '..', 'packages', 'packages-{}'.format(PLATFORM), BITS))
+    if _ext_path not in sys.path:
+        sys.path.append(_ext_path)
 
 # 确定一些路径
 PATH_DATA = os.path.abspath(os.path.join(PATH_APP_ROOT, '..', '..', 'share'))
diff --git a/server/www/teleport/webroot/app/app_ver.py b/server/www/teleport/webroot/app/app_ver.py
index b43b689..d080174 100644
--- a/server/www/teleport/webroot/app/app_ver.py
+++ b/server/www/teleport/webroot/app/app_ver.py
@@ -1,4 +1,4 @@
-# -*- coding: utf8 -*-
-TP_SERVER_VER = "3.6.3"
-TP_ASSIST_REQUIRE_VER = "3.6.3"
-TP_STATE_VER = "b2"
+# -*- coding: utf8 -*-
+TP_SERVER_VER = "3.6.4"
+TP_ASSIST_REQUIRE_VER = "3.6.3"
+TP_STATE_VER = "b3"
diff --git a/server/www/teleport/webroot/app/base/controller.py b/server/www/teleport/webroot/app/base/controller.py
index 88d4e06..a989e05 100644
--- a/server/www/teleport/webroot/app/base/controller.py
+++ b/server/www/teleport/webroot/app/base/controller.py
@@ -16,6 +16,8 @@ from app.base.session import tp_session
 from app.const import *
 from tornado.escape import json_encode
 import app.app_ver as app_ver
+
+
 # import app.const as app_const
 
 
@@ -201,6 +203,13 @@ class TPBaseHandler(tornado.web.RequestHandler):
     def show_error_page(self, err_code):
         self.render('error/error.html', page_param=json.dumps({'err_code': err_code}))
 
+    @staticmethod
+    def escaped_argument(val):
+        if val is None:
+            return None
+        else:
+            return tornado.escape.xhtml_escape(val)
+
 
 class TPBaseJsonHandler(TPBaseHandler):
     """
@@ -213,3 +222,16 @@ class TPBaseJsonHandler(TPBaseHandler):
     def __init__(self, application, request, **kwargs):
         super().__init__(application, request, **kwargs)
         self._mode = self.MODE_JSON
+
+    def check_group_operation_privilege(self, group_type):
+        if group_type == TP_GROUP_USER:
+            require_privilege = TP_PRIVILEGE_USER_GROUP
+        elif group_type == TP_GROUP_ACCOUNT:
+            require_privilege = TP_PRIVILEGE_ACCOUNT_GROUP
+        elif group_type == TP_GROUP_HOST:
+            require_privilege = TP_PRIVILEGE_ASSET_GROUP
+        else:
+            self.write_json(TPE_PARAM)
+            return TPE_PARAM
+
+        return self.check_privilege(require_privilege)
diff --git a/server/www/teleport/webroot/app/controller/group.py b/server/www/teleport/webroot/app/controller/group.py
index 36e975c..3dc078f 100644
--- a/server/www/teleport/webroot/app/controller/group.py
+++ b/server/www/teleport/webroot/app/controller/group.py
@@ -19,11 +19,15 @@ class DoUpdateGroupHandler(TPBaseJsonHandler):
         try:
             gtype = int(args['gtype'])
             gid = int(args['gid'])
-            name = args['name']
-            desc = args['desc']
+            name = self.escaped_argument(args['name'])
+            desc = self.escaped_argument(args['desc'])
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         if gid == -1:
             err, _ = group.create(self, gtype, name, desc)
         else:
@@ -48,6 +52,10 @@ class DoLockGroupHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         err = group.update_groups_state(self, gtype, glist, TP_STATE_DISABLED)
 
         self.write_json(err)
@@ -69,6 +77,10 @@ class DoUnlockGroupHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         err = group.update_groups_state(self, gtype, glist, TP_STATE_NORMAL)
 
         self.write_json(err)
@@ -90,6 +102,10 @@ class DoRemoveGroupHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         err = group.remove(self, gtype, glist)
 
         self.write_json(err)
@@ -112,6 +128,10 @@ class DoAddMembersHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         err = group.add_members(gtype, gid, members)
         self.write_json(err)
 
@@ -133,6 +153,10 @@ class DoRemoveMembersHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # 权限检查
+        if self.check_group_operation_privilege(gtype) != TPE_OK:
+            return
+
         err = group.remove_members(gtype, gid, members)
         self.write_json(err)
 
diff --git a/server/www/teleport/webroot/app/controller/user.py b/server/www/teleport/webroot/app/controller/user.py
index 38b0df9..493dc86 100755
--- a/server/www/teleport/webroot/app/controller/user.py
+++ b/server/www/teleport/webroot/app/controller/user.py
@@ -140,6 +140,7 @@ class DoGenerateOathSecretHandler(TPBaseJsonHandler):
         return self.write_json(TPE_OK, data={"tmp_oath_secret": oath_secret})
 
 
+# 用于进行身份验证器绑定时验证用户身份，必须提供用户名/密码
 class DoVerifyUserHandler(TPBaseJsonHandler):
     def post(self):
         args = self.get_argument('args', None)
@@ -156,6 +157,12 @@ class DoVerifyUserHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # Oath 绑定时必须进行密码验证
+        if username is None or len(username) == 0:
+            return self.write_json(TPE_PARAM, '未提供用户名')
+        if password is None or len(password) == 0:
+            return self.write_json(TPE_PARAM, '未提供密码')
+
         try:
             check_bind_oath = args['check_bind_oath']
         except:
@@ -187,6 +194,12 @@ class DoBindOathHandler(TPBaseJsonHandler):
         except:
             return self.write_json(TPE_PARAM)
 
+        # Oath 绑定时必须进行密码验证
+        if username is None or len(username) == 0:
+            return self.write_json(TPE_PARAM, '未提供用户名')
+        if password is None or len(password) == 0:
+            return self.write_json(TPE_PARAM, '未提供密码')
+
         err, user_info, msg = user.login(self, username, password=password)
         if err != TPE_OK:
             if err == TPE_NOT_EXISTS:
diff --git a/version.in b/version.in
index cb15399..73e33a0 100644
--- a/version.in
+++ b/version.in
@@ -10,9 +10,9 @@ Minor: 次版本号。如果两个程序集的名称和主版本号相同，而
 Revision: 修订号。主版本号和次版本号都相同但修订号不同的程序集应是完全可互换的。
           这适用于修复以前发布的程序集中的错误或安全漏洞。
 
-TP_SERVER 3.6.3           # 整个服务端打包的版本
-TP_TPCORE 3.6.3           # 核心服务 tp_core 的版本
+TP_SERVER 3.6.4           # 整个服务端打包的版本
+TP_TPCORE 3.6.4           # 核心服务 tp_core 的版本
 TP_TPWEB 3.1.1            # web服务 tp_web 的版本（一般除非升级Python，否则不会变化）
 TP_ASSIST 3.6.3           # 助手版本
 TP_ASSIST_REQUIRE 3.6.3   # 适配的助手最低版本
-TP_STATE b2               # 版本状态，可以是 beta1，rc2 等，用于打包文件名及部分界面。如果是 release 则界面上不显示。
+TP_STATE b3               # 版本状态，可以是 beta1，rc2 等，用于打包文件名及部分界面。如果是 release 则界面上不显示。