Skip to content

J
jumpserver
Commit c022c811 authored by liuzheng712's avatar liuzheng712
Browse files
Options

Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix

parents 5af9dd65 abdf9c72
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 133 deletions
connect.py
View file @ c022c811
...@@ -16,6 +16,8 @@ import readline ...@@ -16,6 +16,8 @@ import readline
import django import django
import paramiko import paramiko
import errno import errno
import pyte
import operator
import struct, fcntl, signal, socket, select import struct, fcntl, signal, socket, select
from io import open as copen from io import open as copen
import uuid import uuid
...@@ -90,8 +92,11 @@ class Tty(object): ...@@ -90,8 +92,11 @@ class Tty(object):
self.remote_ip = '' self.remote_ip = ''
self.login_type = login_type self.login_type = login_type
self.vim_flag = False self.vim_flag = False
self.ps1_pattern = re.compile('\[.*@.*\][\$#]') self.ps1_pattern = re.compile('\[.*@.*\][\$#]\s')
self.vim_pattern = re.compile(r'\Wvi[m]+\s.* | \Wfg\s.*', re.X)
self.vim_data = '' self.vim_data = ''
self.stream = pyte.ByteStream()
self.screen = None
@staticmethod @staticmethod
def is_output(strings): def is_output(strings):
...@@ -101,135 +106,50 @@ class Tty(object): ...@@ -101,135 +106,50 @@ class Tty(object):
return True return True
return False return False
@staticmethod def command_parser(self, command):
def remove_obstruct_char(cmd_str):
'''删除一些干扰的特殊符号'''
control_char = re.compile(r'\x07 | \x1b\[1P | \r ', re.X)
cmd_str = control_char.sub('',cmd_str.strip())
patch_char = re.compile('\x08\x1b\[C') #删除方向左右一起的按键
while patch_char.search(cmd_str):
cmd_str = patch_char.sub('', cmd_str.rstrip())
return cmd_str
@staticmethod
def deal_backspace(match_str, result_command, pattern_str, backspace_num):
'''
处理删除确认键
'''
if backspace_num > 0:
if backspace_num > len(result_command):
result_command += pattern_str
result_command = result_command[0:-backspace_num]
else:
result_command = result_command[0:-backspace_num]
result_command += pattern_str
del_len = len(match_str)-3
if del_len > 0:
result_command = result_command[0:-del_len]
return result_command, len(match_str)
@staticmethod
def deal_replace_char(match_str,result_command,backspace_num):
'''
处理替换命令
'''
str_lists = re.findall(r'(?<=\x1b\[1@)\w',match_str)
tmp_str =''.join(str_lists)
result_command_list = list(result_command)
if len(tmp_str) > 1:
result_command_list[-backspace_num:-(backspace_num-len(tmp_str))] = tmp_str
elif len(tmp_str) > 0:
if result_command_list[-backspace_num] == ' ':
result_command_list.insert(-backspace_num, tmp_str)
else:
result_command_list[-backspace_num] = tmp_str
result_command = ''.join(result_command_list)
return result_command, len(match_str)
def remove_control_char(self, result_command):
"""
处理日志特殊字符
"""
control_char = re.compile(r"""
\x1b[ #%()*+\-.\/]. |
\r | #匹配 回车符(CR)
(?:\x1b\[|\x9b) [ -?]* [@-~] | #匹配 控制顺序描述符(CSI)... Cmd
(?:\x1b\]|\x9d) .*? (?:\x1b\\|[\a\x9c]) | \x07 | #匹配 操作系统指令(OSC)...终止符或振铃符(ST|BEL)
(?:\x1b[P^_]|[\x90\x9e\x9f]) .*? (?:\x1b\\|\x9c) | #匹配 设备控制串或私讯或应用程序命令(DCS|PM|APC)...终止符(ST)
\x1b. #匹配 转义过后的字符
[\x80-\x9f] | (?:\x1b\]0.*) | \[.*@.*\][\$#] | (.*mysql>.*) #匹配 所有控制字符
""", re.X)
result_command = control_char.sub('', result_command.strip())
if not self.vim_flag:
if result_command.startswith('vi') or result_command.startswith('fg'):
self.vim_flag = True
return result_command.decode('utf8',"ignore")
else:
return ''
def deal_command(self, str_r):
""" """
处理命令中特殊字符 处理命令中如果有ps1或者mysql的特殊情况,极端情况下会有ps1和mysql
:param command:要处理的字符传
:return:返回去除PS1或者mysql字符串的结果
""" """
str_r = self.remove_obstruct_char(str_r) result = None
match = self.ps1_pattern.split(command)
result_command = '' # 最后的结果 if match:
backspace_num = 0 # 光标移动的个数 # 只需要最后的一个PS1后面的字符串
reach_backspace_flag = False # 没有检测到光标键则为true result = match[-1].strip()
pattern_str = ''
while str_r:
tmp = re.match(r'\s*\w+\s*', str_r)
if tmp:
str_r = str_r[len(str(tmp.group(0))):]
if reach_backspace_flag:
pattern_str += str(tmp.group(0))
continue
else:
result_command += str(tmp.group(0))
continue
tmp = re.match(r'\x1b\[K[\x08]*', str_r)
if tmp:
result_command, del_len = self.deal_backspace(str(tmp.group(0)), result_command, pattern_str, backspace_num)
reach_backspace_flag = False
backspace_num = 0
pattern_str = ''
str_r = str_r[del_len:]
continue
tmp = re.match(r'\x08+', str_r)
if tmp:
str_r = str_r[len(str(tmp.group(0))):]
if len(str_r) != 0:
if reach_backspace_flag:
result_command = result_command[0:-backspace_num] + pattern_str
pattern_str = ''
else: else:
reach_backspace_flag = True # PS1没找到,查找mysql
backspace_num = len(str(tmp.group(0))) match = re.split('mysql>\s', command)
continue if match:
# 只需要最后一个mysql后面的字符串
result = match[-1].strip()
return result
def deal_command(self):
"""
处理截获的命令
:return:返回最后的处理结果
"""
command = ''
# 从虚拟屏幕中获取处理后的数据
for line in reversed(self.screen.buffer):
line_data = "".join(map(operator.attrgetter("data"), line)).strip()
if len(line_data) > 0:
parser_result = self.command_parser(line_data)
if parser_result is not None:
# 2个条件写一起会有错误的数据
if len(parser_result) > 0:
command = parser_result
else: else:
command = line_data
break break
if command != '':
tmp = re.match(r'(\x1b\[1@\w)+', str_r) #处理替换的命令 # 判断用户输入的是否是vim 或者fg命令
if tmp: if self.vim_pattern.search(command):
result_command,del_len = self.deal_replace_char(str(tmp.group(0)), result_command, backspace_num) self.vim_flag = True
str_r = str_r[del_len:] # 虚拟屏幕清空
backspace_num = 0 self.screen.reset()
continue return command
if reach_backspace_flag:
pattern_str += str_r[0]
else:
result_command += str_r[0]
str_r = str_r[1:]
if backspace_num > 0:
result_command = result_command[0:-backspace_num] + pattern_str
result_command = self.remove_control_char(result_command)
return result_command
def get_log(self): def get_log(self):
""" """
...@@ -294,7 +214,7 @@ class Tty(object): ...@@ -294,7 +214,7 @@ class Tty(object):
# 发起ssh连接请求 Make a ssh connection # 发起ssh连接请求 Make a ssh connection
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()
#ssh.load_system_host_keys() # ssh.load_system_host_keys()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try: try:
role_key = connect_info.get('role_key') role_key = connect_info.get('role_key')
...@@ -367,6 +287,7 @@ class SshTty(Tty): ...@@ -367,6 +287,7 @@ class SshTty(Tty):
old_tty = termios.tcgetattr(sys.stdin) old_tty = termios.tcgetattr(sys.stdin)
pre_timestamp = time.time() pre_timestamp = time.time()
data = '' data = ''
input_str = ''
input_mode = False input_mode = False
try: try:
tty.setraw(sys.stdin.fileno()) tty.setraw(sys.stdin.fileno())
...@@ -411,6 +332,8 @@ class SshTty(Tty): ...@@ -411,6 +332,8 @@ class SshTty(Tty):
if input_mode and not self.is_output(x): if input_mode and not self.is_output(x):
data += x data += x
input_str = ''
except socket.timeout: except socket.timeout:
pass pass
...@@ -420,19 +343,25 @@ class SshTty(Tty): ...@@ -420,19 +343,25 @@ class SshTty(Tty):
except OSError: except OSError:
pass pass
input_mode = True input_mode = True
input_str += x
if str(x) in ['\r', '\n', '\r\n']: if str(x) in ['\r', '\n', '\r\n']:
# 这个是用来处理用户的复制操作
if input_str != x:
data += input_str
self.stream.feed(data)
if self.vim_flag: if self.vim_flag:
match = self.ps1_pattern.search(self.vim_data) match = self.ps1_pattern.search(self.vim_data)
if match: if match:
self.vim_flag = False self.vim_flag = False
data = self.deal_command(data)[0:200] data = self.deal_command()[0:200]
if len(data) > 0: if len(data) > 0:
TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save() TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save()
else: else:
data = self.deal_command(data)[0:200] data = self.deal_command()[0:200]
if len(data) > 0: if len(data) > 0:
TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save() TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save()
data = '' data = ''
input_str = ''
self.vim_data = '' self.vim_data = ''
input_mode = False input_mode = False
...@@ -466,6 +395,8 @@ class SshTty(Tty): ...@@ -466,6 +395,8 @@ class SshTty(Tty):
win_size = self.get_win_size() win_size = self.get_win_size()
#self.channel = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1], term='xterm') #self.channel = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1], term='xterm')
self.channel = channel = transport.open_session() self.channel = channel = transport.open_session()
self.screen = pyte.Screen(win_size[1], win_size[0])
self.stream.attach(self.screen)
channel.get_pty(term='xterm', height=win_size[0], width=win_size[1]) channel.get_pty(term='xterm', height=win_size[0], width=win_size[1])
channel.invoke_shell() channel.invoke_shell()
try: try:
......
jasset/asset_api.py
View file @ c022c811
...@@ -9,6 +9,8 @@ from jperm.ansible_api import MyRunner ...@@ -9,6 +9,8 @@ from jperm.ansible_api import MyRunner
from jperm.perm_api import gen_resource from jperm.perm_api import gen_resource
from jumpserver.templatetags.mytags import get_disk_info from jumpserver.templatetags.mytags import get_disk_info
import traceback
def group_add_asset(group, asset_id=None, asset_ip=None): def group_add_asset(group, asset_id=None, asset_ip=None):
""" """
...@@ -332,9 +334,11 @@ def get_ansible_asset_info(asset_ip, setup_info): ...@@ -332,9 +334,11 @@ def get_ansible_asset_info(asset_ip, setup_info):
# ip = setup_info.get("ansible_default_ipv4").get("address") # ip = setup_info.get("ansible_default_ipv4").get("address")
mac = setup_info.get("ansible_default_ipv4").get("macaddress") mac = setup_info.get("ansible_default_ipv4").get("macaddress")
brand = setup_info.get("ansible_product_name") brand = setup_info.get("ansible_product_name")
try:
cpu_type = setup_info.get("ansible_processor")[1] cpu_type = setup_info.get("ansible_processor")[1]
cpu_cores = setup_info.get("ansible_processor_vcpus") except IndexError:
cpu = cpu_type + ' * ' + unicode(cpu_cores) cpu_type = ' '.join(setup_info.get("ansible_processor")[0].split(' ')[:6])
memory = setup_info.get("ansible_memtotal_mb") memory = setup_info.get("ansible_memtotal_mb")
try: try:
memory_format = int(round((int(memory) / 1000), 0)) memory_format = int(round((int(memory) / 1000), 0))
...@@ -342,7 +346,13 @@ def get_ansible_asset_info(asset_ip, setup_info): ...@@ -342,7 +346,13 @@ def get_ansible_asset_info(asset_ip, setup_info):
memory_format = memory memory_format = memory
disk = disk_need disk = disk_need
system_type = setup_info.get("ansible_distribution") system_type = setup_info.get("ansible_distribution")
if system_type.lower() == "freebsd":
system_version = setup_info.get("ansible_distribution_release")
cpu_cores = setup_info.get("ansible_processor_count")
else:
system_version = setup_info.get("ansible_distribution_version") system_version = setup_info.get("ansible_distribution_version")
cpu_cores = setup_info.get("ansible_processor_vcpus")
cpu = cpu_type + ' * ' + unicode(cpu_cores)
system_arch = setup_info.get("ansible_architecture") system_arch = setup_info.get("ansible_architecture")
# asset_type = setup_info.get("ansible_system") # asset_type = setup_info.get("ansible_system")
sn = setup_info.get("ansible_product_serial") sn = setup_info.get("ansible_product_serial")
...@@ -358,10 +368,14 @@ def asset_ansible_update(obj_list, name=''): ...@@ -358,10 +368,14 @@ def asset_ansible_update(obj_list, name=''):
for asset in obj_list: for asset in obj_list:
try: try:
setup_info = ansible_asset_info['contacted'][asset.hostname]['ansible_facts'] setup_info = ansible_asset_info['contacted'][asset.hostname]['ansible_facts']
except KeyError: logger.debug("setup_info: %s" % setup_info)
except KeyError, e:
logger.error("获取setup_info失败: %s" % e)
continue continue
else: else:
try:
asset_info = get_ansible_asset_info(asset.ip, setup_info) asset_info = get_ansible_asset_info(asset.ip, setup_info)
print asset_info
other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand, system_arch = asset_info other_ip, mac, cpu, memory, disk, sn, system_type, system_version, brand, system_arch = asset_info
asset_dic = {"other_ip": other_ip, asset_dic = {"other_ip": other_ip,
"mac": mac, "mac": mac,
...@@ -376,6 +390,9 @@ def asset_ansible_update(obj_list, name=''): ...@@ -376,6 +390,9 @@ def asset_ansible_update(obj_list, name=''):
} }
ansible_record(asset, asset_dic, name) ansible_record(asset, asset_dic, name)
except Exception as e:
logger.error("save setup info failed! %s" % e)
traceback.print_exc()
def asset_ansible_update_all(): def asset_ansible_update_all():
......
templates/index.html
View file @ c022c811
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
{% if login_10 %} {% if login_10 %}
{% for login in login_10 %} {% for login in login_10 %}
<div class="feed-element"> <div class="feed-element">
<a href="profile.html" class="pull-left"> <a href="#" class="pull-left">
<img alt="image" class="img-circle" src="/static/img/root.png"> <img alt="image" class="img-circle" src="/static/img/root.png">
</a> </a>
<div class="media-body "> <div class="media-body ">
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<div class="feed-activity-list"> <div class="feed-activity-list">
{% for login in login_more_10 %} {% for login in login_more_10 %}
<div class="feed-element"> <div class="feed-element">
<a href="profile.html" class="pull-left"> <a href="#" class="pull-left">
<img alt="image" class="img-circle" src="/static/img/root.png"> <img alt="image" class="img-circle" src="/static/img/root.png">
</a> </a>
<div class="media-body "> <div class="media-body ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment