Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
c0e91896
Commit
c0e91896
authored
May 11, 2016
by
kelianchun_miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix passwd input
parent
3ef3b452
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
run_server.py
run_server.py
+4
-7
No files found.
run_server.py
View file @
c0e91896
...
@@ -373,15 +373,13 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
...
@@ -373,15 +373,13 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
self
.
termlog
.
recoder
=
True
self
.
termlog
.
recoder
=
True
self
.
term
.
input_mode
=
True
self
.
term
.
input_mode
=
True
if
str
(
jsondata
[
'data'
])
in
[
'
\r
'
,
'
\n
'
,
'
\r\n
'
]:
if
str
(
jsondata
[
'data'
])
in
[
'
\r
'
,
'
\n
'
,
'
\r\n
'
]:
if
self
.
term
.
vim_flag
:
match
=
re
.
compile
(
r'\x1b\[\?1049'
,
re
.
X
)
.
findall
(
self
.
term
.
vim_data
)
match
=
re
.
compile
(
r'\x1b\[\?1049'
,
re
.
X
)
.
findall
(
self
.
term
.
vim_data
)
if
match
:
if
match
:
if
self
.
term
.
vim_end
_flag
or
len
(
match
)
==
2
:
if
self
.
term
.
vim
_flag
or
len
(
match
)
==
2
:
self
.
term
.
vim_flag
=
False
self
.
term
.
vim_flag
=
False
self
.
term
.
vim_end_flag
=
False
else
:
self
.
term
.
vim_end_flag
=
True
else
:
else
:
self
.
term
.
vim_flag
=
True
elif
not
self
.
term
.
vim_flag
:
result
=
self
.
term
.
deal_command
(
self
.
term
.
data
)[
0
:
200
]
result
=
self
.
term
.
deal_command
(
self
.
term
.
data
)[
0
:
200
]
if
len
(
result
)
>
0
:
if
len
(
result
)
>
0
:
TtyLog
(
log
=
self
.
log
,
datetime
=
datetime
.
datetime
.
now
(),
cmd
=
result
)
.
save
()
TtyLog
(
log
=
self
.
log
,
datetime
=
datetime
.
datetime
.
now
(),
cmd
=
result
)
.
save
()
...
@@ -424,7 +422,6 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
...
@@ -424,7 +422,6 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
if
not
len
(
recv
):
if
not
len
(
recv
):
return
return
data
+=
recv
data
+=
recv
if
self
.
term
.
vim_flag
:
self
.
term
.
vim_data
+=
recv
self
.
term
.
vim_data
+=
recv
try
:
try
:
self
.
write_message
(
data
.
decode
(
'utf-8'
,
'replace'
))
self
.
write_message
(
data
.
decode
(
'utf-8'
,
'replace'
))
...
@@ -436,7 +433,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
...
@@ -436,7 +433,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
pre_timestamp
=
now_timestamp
pre_timestamp
=
now_timestamp
self
.
log_file_f
.
flush
()
self
.
log_file_f
.
flush
()
self
.
log_time_f
.
flush
()
self
.
log_time_f
.
flush
()
if
self
.
term
.
input_mode
and
not
self
.
term
.
is_output
(
data
)
:
if
self
.
term
.
input_mode
:
self
.
term
.
data
+=
data
self
.
term
.
data
+=
data
data
=
''
data
=
''
except
UnicodeDecodeError
:
except
UnicodeDecodeError
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment