Merge pull request #34 from WeBankPartners/dev

Release v1.0.1
WeBankPartners · Nov 2, 2021 · c1220cb · c1220cb
2 parents 25e255e + bbdbb9f
commit c1220cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/api/terminal/terminal/common/ssh.py b/api/terminal/terminal/common/ssh.py
@@ -109,12 +109,14 @@ def connect(self, host, username, password, port=22, jump_servers=None):
                 jump_addr = (jump_host, jump_port)
                 try:
                     self._connect(self._jump_client, jump_host, jump_username, jump_password, port=jump_port)
+                    final_jump_server = jump_server
+                    jump_transport = self._jump_client.get_transport()
+                    jump_channel = jump_transport.open_channel("direct-tcpip", dest_addr, jump_addr)
+                    # use first available jumpserver
+                    break
                 except exceptions.PluginError as e:
                     fail_msgs.append(str(e))
                     continue
-                final_jump_server = jump_server
-                jump_transport = self._jump_client.get_transport()
-                jump_channel = jump_transport.open_channel("direct-tcpip", dest_addr, jump_addr)
         if len(fail_msgs) > 0 and final_jump_server is None:
             raise exceptions.PluginError(message=_("failed to establish connection with all jump_servers: %(reason)s") %
                                          {'reason': '\n'.join(fail_msgs)})

diff --git a/ui/src/pages/authorization/session-records.vue b/ui/src/pages/authorization/session-records.vue
@@ -162,7 +162,7 @@ export default {
       localStorage.setItem('replayToken', getCookie('accessToken'))
       let url = ''
       const scripts = document.getElementsByTagName('script')
-      for (let i = 0; i++; i <= scripts.length) {
+      for (let i = 0; i < scripts.length; i++) {
         if (scripts[i].src.endsWith('/xtem-player/xterm-player.min.js')) {
           url = scripts[i].src
         }