Merge pull request #161 from jumpserver/dev

[Update] 修改action

coco/interactive.py

@@ -226,7 +226,7 @@ class InteractiveServer:
 
     def _page_generator(self, assets):
         start, page = 0, 1
-        while True:
+        while not self.client.closed:
             _assets = assets[start:start+self.page_size]
             # 最后一页
             if page == self.total_pages:
@@ -302,7 +302,7 @@ class InteractiveServer:
         opt = net_input(self.client, prompt=':')
         if opt in ('p', 'P'):
             return PAGE_UP
-        elif opt in ('b', 'q'):
+        elif opt in ('b', 'q', None):
             return BACK
         elif opt and opt.isdigit() and self.results and 0 < int(opt) <= len(self.results):
             self.proxy(self.results[int(opt)-1])

coco/utils.py

@@ -305,7 +305,7 @@ def net_input(client, prompt='Opt> ', sensitive=False, before=0, after=0):
 
     while True:
         data = client.recv(1)
-        if len(data) == 0:
+        if len(data) == 0 or client.closed:
             break
         # Client input backspace
         if data in char.BACKSPACE_CHAR: