Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
coco
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
coco
Commits
e1c9e93c
Unverified
Commit
e1c9e93c
authored
Mar 07, 2018
by
liuzheng712
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev
parents
afba37f4
1c8dfae8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
65 additions
and
16 deletions
+65
-16
app.py
coco/app.py
+2
-1
char.py
coco/char.py
+2
-0
interactive.py
coco/interactive.py
+13
-8
models.py
coco/models.py
+29
-5
proxy.py
coco/proxy.py
+1
-1
session.py
coco/session.py
+4
-0
utils.py
coco/utils.py
+13
-0
requirements.txt
requirements/requirements.txt
+1
-1
No files found.
coco/app.py
View file @
e1c9e93c
...
@@ -205,6 +205,7 @@ class Coco:
...
@@ -205,6 +205,7 @@ class Coco:
for
client
in
self
.
clients
:
for
client
in
self
.
clients
:
self
.
remove_client
(
client
)
self
.
remove_client
(
client
)
time
.
sleep
(
1
)
time
.
sleep
(
1
)
self
.
heartbeat
()
self
.
stop_evt
.
set
()
self
.
stop_evt
.
set
()
self
.
sshd
.
shutdown
()
self
.
sshd
.
shutdown
()
self
.
httpd
.
shutdown
()
self
.
httpd
.
shutdown
()
...
@@ -234,4 +235,4 @@ class Coco:
...
@@ -234,4 +235,4 @@ class Coco:
with
self
.
lock
:
with
self
.
lock
:
logger
.
info
(
"Remove session: {}"
.
format
(
session
))
logger
.
info
(
"Remove session: {}"
.
format
(
session
))
self
.
sessions
.
remove
(
session
)
self
.
sessions
.
remove
(
session
)
self
.
service
.
finish_session
(
session
.
id
)
self
.
service
.
finish_session
(
session
.
to_json
()
)
coco/char.py
View file @
e1c9e93c
...
@@ -4,7 +4,9 @@
...
@@ -4,7 +4,9 @@
BACKSPACE_CHAR
=
{
b
'
\x08
'
:
b
'
\x08\x1b
[K'
,
b
'
\x7f
'
:
b
'
\x08\x1b
[K'
}
BACKSPACE_CHAR
=
{
b
'
\x08
'
:
b
'
\x08\x1b
[K'
,
b
'
\x7f
'
:
b
'
\x08\x1b
[K'
}
ENTER_CHAR
=
[
b
'
\r
'
,
b
'
\n
'
,
b
'
\r\n
'
]
ENTER_CHAR
=
[
b
'
\r
'
,
b
'
\n
'
,
b
'
\r\n
'
]
ENTER_CHAR_ORDER
=
[
ord
(
b
'
\r
'
),
ord
(
b
'
\n
'
)]
UNSUPPORTED_CHAR
=
{
b
'
\x15
'
:
'Ctrl-U'
,
b
'
\x0c
'
:
'Ctrl-L'
,
b
'
\x05
'
:
'Ctrl-E'
}
UNSUPPORTED_CHAR
=
{
b
'
\x15
'
:
'Ctrl-U'
,
b
'
\x0c
'
:
'Ctrl-L'
,
b
'
\x05
'
:
'Ctrl-E'
}
CLEAR_CHAR
=
b
'
\x1b
[H
\x1b
[2J'
CLEAR_CHAR
=
b
'
\x1b
[H
\x1b
[2J'
BELL_CHAR
=
b
'
\x07
'
BELL_CHAR
=
b
'
\x07
'
NEW_LINE
=
b
'
\r\n
'
NEW_LINE
=
b
'
\r\n
'
RZ_PROTOCOL_CHAR
=
b
'**
\x18
B0900000000a87c
\r\x8a\x11
'
coco/interactive.py
View file @
e1c9e93c
...
@@ -80,6 +80,7 @@ class InteractiveServer:
...
@@ -80,6 +80,7 @@ class InteractiveServer:
input_data
=
[]
input_data
=
[]
parser
=
TtyIOParser
()
parser
=
TtyIOParser
()
self
.
client
.
send
(
wr
(
prompt
,
before
=
1
,
after
=
0
))
self
.
client
.
send
(
wr
(
prompt
,
before
=
1
,
after
=
0
))
while
True
:
while
True
:
data
=
self
.
client
.
recv
(
10
)
data
=
self
.
client
.
recv
(
10
)
logger
.
debug
(
data
)
logger
.
debug
(
data
)
...
@@ -113,7 +114,7 @@ class InteractiveServer:
...
@@ -113,7 +114,7 @@ class InteractiveServer:
# handle shell expect
# handle shell expect
multi_char_with_enter
=
False
multi_char_with_enter
=
False
if
len
(
data
)
>
1
and
data
[
-
1
]
in
char
.
ENTER_CHAR
:
if
len
(
data
)
>
1
and
data
[
-
1
]
in
char
.
ENTER_CHAR
_ORDER
:
self
.
client
.
send
(
data
)
self
.
client
.
send
(
data
)
input_data
.
append
(
data
[:
-
1
])
input_data
.
append
(
data
[:
-
1
])
multi_char_with_enter
=
True
multi_char_with_enter
=
True
...
@@ -182,7 +183,7 @@ class InteractiveServer:
...
@@ -182,7 +183,7 @@ class InteractiveServer:
self
.
get_user_asset_groups
()
self
.
get_user_asset_groups
()
if
len
(
self
.
asset_groups
)
==
0
:
if
len
(
self
.
asset_groups
)
==
0
:
self
.
client
.
send
(
warning
(
_
(
"
Nothing
"
)))
self
.
client
.
send
(
warning
(
_
(
"
无
"
)))
return
return
fake_group
=
AssetGroup
(
name
=
_
(
"Name"
),
assets_amount
=
_
(
"Assets"
),
comment
=
_
(
"Comment"
))
fake_group
=
AssetGroup
(
name
=
_
(
"Name"
),
assets_amount
=
_
(
"Assets"
),
comment
=
_
(
"Comment"
))
...
@@ -196,11 +197,11 @@ class InteractiveServer:
...
@@ -196,11 +197,11 @@ class InteractiveServer:
self
.
client
.
send
(
title
(
header
.
format
(
fake_group
,
"ID"
)))
self
.
client
.
send
(
title
(
header
.
format
(
fake_group
,
"ID"
)))
for
index
,
group
in
enumerate
(
self
.
asset_groups
,
1
):
for
index
,
group
in
enumerate
(
self
.
asset_groups
,
1
):
self
.
client
.
send
(
wr
(
line
.
format
(
group
,
index
)))
self
.
client
.
send
(
wr
(
line
.
format
(
group
,
index
)))
self
.
client
.
send
(
wr
(
_
(
"
Total
: {}"
)
.
format
(
len
(
self
.
asset_groups
)),
before
=
1
))
self
.
client
.
send
(
wr
(
_
(
"
总共
: {}"
)
.
format
(
len
(
self
.
asset_groups
)),
before
=
1
))
def
display_group_assets
(
self
,
_id
):
def
display_group_assets
(
self
,
_id
):
if
_id
>
len
(
self
.
asset_groups
)
or
_id
<=
0
:
if
_id
>
len
(
self
.
asset_groups
)
or
_id
<=
0
:
self
.
client
.
send
(
wr
(
warning
(
"
No matched group, select again
"
)))
self
.
client
.
send
(
wr
(
warning
(
"
没有匹配分组,请重新输入
"
)))
self
.
display_asset_groups
()
self
.
display_asset_groups
()
return
return
...
@@ -222,7 +223,7 @@ class InteractiveServer:
...
@@ -222,7 +223,7 @@ class InteractiveServer:
self
.
client
.
send
(
wr
(
title
(
header
.
format
(
fake_asset
,
"ID"
))))
self
.
client
.
send
(
wr
(
title
(
header
.
format
(
fake_asset
,
"ID"
))))
for
index
,
asset
in
enumerate
(
self
.
search_result
,
1
):
for
index
,
asset
in
enumerate
(
self
.
search_result
,
1
):
self
.
client
.
send
(
wr
(
line
.
format
(
asset
,
index
)))
self
.
client
.
send
(
wr
(
line
.
format
(
asset
,
index
)))
self
.
client
.
send
(
wr
(
_
(
"
Total: {} Matched
: {}"
)
.
format
(
self
.
client
.
send
(
wr
(
_
(
"
总共: {} 匹配
: {}"
)
.
format
(
len
(
self
.
assets
),
len
(
self
.
search_result
)),
before
=
1
)
len
(
self
.
assets
),
len
(
self
.
search_result
)),
before
=
1
)
)
)
...
@@ -264,7 +265,7 @@ class InteractiveServer:
...
@@ -264,7 +265,7 @@ class InteractiveServer:
return
None
return
None
while
True
:
while
True
:
self
.
client
.
send
(
wr
(
_
(
"
Choose one to login
: "
),
after
=
1
))
self
.
client
.
send
(
wr
(
_
(
"
选择一个登陆
: "
),
after
=
1
))
self
.
display_system_users
(
system_users
)
self
.
display_system_users
(
system_users
)
opt
=
self
.
get_option
(
"ID> "
)
opt
=
self
.
get_option
(
"ID> "
)
if
opt
.
isdigit
()
and
len
(
system_users
)
>
int
(
opt
):
if
opt
.
isdigit
()
and
len
(
system_users
)
>
int
(
opt
):
...
@@ -283,14 +284,18 @@ class InteractiveServer:
...
@@ -283,14 +284,18 @@ class InteractiveServer:
def
search_and_proxy
(
self
,
opt
):
def
search_and_proxy
(
self
,
opt
):
self
.
search_assets
(
opt
)
self
.
search_assets
(
opt
)
if
self
.
search_result
and
len
(
self
.
search_result
)
==
1
:
if
self
.
search_result
and
len
(
self
.
search_result
)
==
1
:
self
.
proxy
(
self
.
search_result
[
0
])
asset
=
self
.
search_result
[
0
]
if
asset
.
platform
==
"Windows"
:
self
.
client
.
send
(
warning
(
_
(
"终端不支持登录windows, 请使用web terminal访问"
)))
return
self
.
proxy
(
asset
)
else
:
else
:
self
.
display_search_result
()
self
.
display_search_result
()
def
proxy
(
self
,
asset
):
def
proxy
(
self
,
asset
):
system_user
=
self
.
choose_system_user
(
asset
.
system_users_granted
)
system_user
=
self
.
choose_system_user
(
asset
.
system_users_granted
)
if
system_user
is
None
:
if
system_user
is
None
:
self
.
client
.
send
(
_
(
"
No user
"
))
self
.
client
.
send
(
_
(
"
没有系统用户
"
))
return
return
forwarder
=
ProxyServer
(
self
.
app
,
self
.
client
)
forwarder
=
ProxyServer
(
self
.
app
,
self
.
client
)
forwarder
.
proxy
(
asset
,
system_user
)
forwarder
.
proxy
(
asset
,
system_user
)
...
...
coco/models.py
View file @
e1c9e93c
...
@@ -22,6 +22,18 @@ class Request:
...
@@ -22,6 +22,18 @@ class Request:
self
.
date_start
=
datetime
.
datetime
.
now
()
self
.
date_start
=
datetime
.
datetime
.
now
()
class
SizedList
(
list
):
def
__init__
(
self
,
maxsize
=
0
):
self
.
maxsize
=
maxsize
self
.
size
=
0
super
()
.
__init__
()
def
append
(
self
,
b
):
if
self
.
maxsize
==
0
or
self
.
size
<
self
.
maxsize
:
super
()
.
append
(
b
)
self
.
size
+=
len
(
b
)
class
Client
:
class
Client
:
"""
"""
Client is the request client. Nothing more to say
Client is the request client. Nothing more to say
...
@@ -78,8 +90,8 @@ class Server:
...
@@ -78,8 +90,8 @@ class Server:
self
.
recv_bytes
=
0
self
.
recv_bytes
=
0
self
.
stop_evt
=
threading
.
Event
()
self
.
stop_evt
=
threading
.
Event
()
self
.
input_data
=
[]
self
.
input_data
=
SizedList
(
maxsize
=
1024
)
self
.
output_data
=
[]
self
.
output_data
=
SizedList
(
maxsize
=
1024
)
self
.
_in_input_state
=
True
self
.
_in_input_state
=
True
self
.
_input_initial
=
False
self
.
_input_initial
=
False
self
.
_in_vim_state
=
False
self
.
_in_vim_state
=
False
...
@@ -101,7 +113,7 @@ class Server:
...
@@ -101,7 +113,7 @@ class Server:
else
:
else
:
return
None
return
None
def
send
(
self
,
b
):
def
parse
(
self
,
b
):
if
isinstance
(
b
,
str
):
if
isinstance
(
b
,
str
):
b
=
b
.
encode
(
"utf-8"
)
b
=
b
.
encode
(
"utf-8"
)
if
not
self
.
_input_initial
:
if
not
self
.
_input_initial
:
...
@@ -118,10 +130,14 @@ class Server:
...
@@ -118,10 +130,14 @@ class Server:
self
.
_input
,
self
.
_output
,
self
.
_input
,
self
.
_output
,
"#"
*
30
+
" End "
+
"#"
*
30
,
"#"
*
30
+
" End "
+
"#"
*
30
,
))
))
self
.
session
.
put_command
(
self
.
_input
,
self
.
_output
)
if
self
.
_input
:
self
.
session
.
put_command
(
self
.
_input
,
self
.
_output
)
del
self
.
input_data
[:]
del
self
.
input_data
[:]
del
self
.
output_data
[:]
del
self
.
output_data
[:]
self
.
_in_input_state
=
True
self
.
_in_input_state
=
True
def
send
(
self
,
b
):
self
.
parse
(
b
)
return
self
.
chan
.
send
(
b
)
return
self
.
chan
.
send
(
b
)
def
recv
(
self
,
size
):
def
recv
(
self
,
size
):
...
@@ -136,7 +152,7 @@ class Server:
...
@@ -136,7 +152,7 @@ class Server:
def
close
(
self
):
def
close
(
self
):
logger
.
info
(
"Closed server {}"
.
format
(
self
))
logger
.
info
(
"Closed server {}"
.
format
(
self
))
self
.
send
(
b
''
)
self
.
parse
(
b
''
)
self
.
chan
.
close
()
self
.
chan
.
close
()
self
.
stop_evt
.
set
()
self
.
stop_evt
.
set
()
self
.
chan
.
close
()
self
.
chan
.
close
()
...
@@ -149,10 +165,14 @@ class Server:
...
@@ -149,10 +165,14 @@ class Server:
return
False
return
False
def
_parse_output
(
self
):
def
_parse_output
(
self
):
if
not
self
.
output_data
:
return
''
parser
=
utils
.
TtyIOParser
()
parser
=
utils
.
TtyIOParser
()
return
parser
.
parse_output
(
self
.
output_data
)
return
parser
.
parse_output
(
self
.
output_data
)
def
_parse_input
(
self
):
def
_parse_input
(
self
):
if
not
self
.
input_data
or
self
.
input_data
[
0
]
==
char
.
RZ_PROTOCOL_CHAR
:
return
parser
=
utils
.
TtyIOParser
()
parser
=
utils
.
TtyIOParser
()
return
parser
.
parse_input
(
self
.
input_data
)
return
parser
.
parse_input
(
self
.
input_data
)
...
@@ -231,3 +251,7 @@ class WSProxy:
...
@@ -231,3 +251,7 @@ class WSProxy:
self
.
child
.
close
()
self
.
child
.
close
()
self
.
ws
.
logout
(
self
.
connection
)
self
.
ws
.
logout
(
self
.
connection
)
logger
.
debug
(
"Proxy {} closed"
.
format
(
self
))
logger
.
debug
(
"Proxy {} closed"
.
format
(
self
))
coco/proxy.py
View file @
e1c9e93c
...
@@ -92,7 +92,7 @@ class ProxyServer:
...
@@ -92,7 +92,7 @@ class ProxyServer:
timeout
=
TIMEOUT
,
compress
=
True
,
auth_timeout
=
10
,
timeout
=
TIMEOUT
,
compress
=
True
,
auth_timeout
=
10
,
look_for_keys
=
False
look_for_keys
=
False
)
)
except
(
paramiko
.
AuthenticationException
,
paramiko
.
BadAuthenticationType
):
except
(
paramiko
.
AuthenticationException
,
paramiko
.
BadAuthenticationType
,
SSHException
):
admins
=
self
.
app
.
config
[
'ADMINS'
]
or
'administrator'
admins
=
self
.
app
.
config
[
'ADMINS'
]
or
'administrator'
self
.
client
.
send
(
warning
(
wr
(
self
.
client
.
send
(
warning
(
wr
(
"Authenticate with server failed, contact {}"
.
format
(
admins
),
"Authenticate with server failed, contact {}"
.
format
(
admins
),
...
...
coco/session.py
View file @
e1c9e93c
...
@@ -28,6 +28,7 @@ class Session:
...
@@ -28,6 +28,7 @@ class Session:
self
.
_command_recorder
=
command_recorder
self
.
_command_recorder
=
command_recorder
self
.
_replay_recorder
=
replay_recorder
self
.
_replay_recorder
=
replay_recorder
self
.
server
.
set_session
(
self
)
self
.
server
.
set_session
(
self
)
self
.
date_last_active
=
datetime
.
datetime
.
utcnow
()
def
add_watcher
(
self
,
watcher
,
silent
=
False
):
def
add_watcher
(
self
,
watcher
,
silent
=
False
):
"""
"""
...
@@ -129,6 +130,8 @@ class Session:
...
@@ -129,6 +130,8 @@ class Session:
logger
.
info
(
msg
)
logger
.
info
(
msg
)
self
.
close
()
self
.
close
()
break
break
self
.
date_last_active
=
datetime
.
datetime
.
utcnow
()
for
watcher
in
[
self
.
client
]
+
self
.
_watchers
+
self
.
_sharers
:
for
watcher
in
[
self
.
client
]
+
self
.
_watchers
+
self
.
_sharers
:
watcher
.
send
(
data
)
watcher
.
send
(
data
)
elif
sock
==
self
.
client
:
elif
sock
==
self
.
client
:
...
@@ -171,6 +174,7 @@ class Session:
...
@@ -171,6 +174,7 @@ class Session:
"login_from"
:
"ST"
,
"login_from"
:
"ST"
,
"remote_addr"
:
self
.
client
.
addr
[
0
],
"remote_addr"
:
self
.
client
.
addr
[
0
],
"is_finished"
:
True
if
self
.
stop_evt
.
is_set
()
else
False
,
"is_finished"
:
True
if
self
.
stop_evt
.
is_set
()
else
False
,
"date_last_active"
:
self
.
date_last_active
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
+
" +0000"
,
"date_start"
:
self
.
date_created
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
+
" +0000"
,
"date_start"
:
self
.
date_created
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
+
" +0000"
,
"date_end"
:
self
.
date_end
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
+
" +0000"
if
self
.
date_end
else
None
"date_end"
:
self
.
date_end
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
)
+
" +0000"
if
self
.
date_end
else
None
}
}
...
...
coco/utils.py
View file @
e1c9e93c
...
@@ -289,4 +289,17 @@ def get_logger(file_name):
...
@@ -289,4 +289,17 @@ def get_logger(file_name):
return
logging
.
getLogger
(
'coco.'
+
file_name
)
return
logging
.
getLogger
(
'coco.'
+
file_name
)
zh_pattern
=
re
.
compile
(
u'[
\u4e00
-
\u9fa5
]+'
)
def
len_display
(
s
):
length
=
0
for
i
in
s
:
if
zh_pattern
.
match
(
i
):
length
+=
2
else
:
length
+=
1
return
length
ugettext
=
_gettext
()
ugettext
=
_gettext
()
requirements/requirements.txt
View file @
e1c9e93c
...
@@ -30,5 +30,5 @@ tornado==4.5.2
...
@@ -30,5 +30,5 @@ tornado==4.5.2
urllib3==1.22
urllib3==1.22
wcwidth==0.1.7
wcwidth==0.1.7
werkzeug==0.12.2
werkzeug==0.12.2
jumpserver-python-sdk==0.0.3
0
jumpserver-python-sdk==0.0.3
1
jms-es-sdk
jms-es-sdk
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