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
f511802d
Commit
f511802d
authored
9 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
fix asset group judge
reviewed by: ibuler <ibuler@qq.com>
parents
cd80fbcd
30c74b84
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
connect.py
connect.py
+7
-4
No files found.
connect.py
View file @
f511802d
...
@@ -470,7 +470,7 @@ class Nav(object):
...
@@ -470,7 +470,7 @@ class Nav(object):
gid
=
int
(
str_r
.
lstrip
(
'g'
))
gid
=
int
(
str_r
.
lstrip
(
'g'
))
# 获取资产组包含的资产
# 获取资产组包含的资产
asset_group
=
get_object
(
AssetGroup
,
id
=
gid
)
asset_group
=
get_object
(
AssetGroup
,
id
=
gid
)
if
asset_group
:
if
asset_group
and
asset_group
in
self
.
perm_asset_groups
:
self
.
search_result
=
list
(
asset_group
.
asset_set
.
all
())
self
.
search_result
=
list
(
asset_group
.
asset_set
.
all
())
else
:
else
:
color_print
(
'没有该资产组或没有权限'
)
color_print
(
'没有该资产组或没有权限'
)
...
@@ -489,8 +489,10 @@ class Nav(object):
...
@@ -489,8 +489,10 @@ class Nav(object):
except
(
ValueError
,
TypeError
):
except
(
ValueError
,
TypeError
):
# 匹配 ip, hostname, 备注
# 匹配 ip, hostname, 备注
self
.
search_result
=
[
asset
for
asset
in
self
.
perm_assets
if
str_r
in
str
(
asset
.
ip
)
str_r
=
str_r
.
lower
()
or
str_r
in
str
(
asset
.
hostname
)
or
str_r
in
str
(
asset
.
comment
)]
self
.
search_result
=
[
asset
for
asset
in
self
.
perm_assets
if
str_r
in
str
(
asset
.
ip
)
.
lower
()
or
str_r
in
str
(
asset
.
hostname
)
.
lower
()
or
str_r
in
str
(
asset
.
comment
)
.
lower
()]
else
:
else
:
# 如果没有输入就展现所有
# 如果没有输入就展现所有
self
.
search_result
=
self
.
perm_assets
self
.
search_result
=
self
.
perm_assets
...
@@ -532,8 +534,8 @@ class Nav(object):
...
@@ -532,8 +534,8 @@ class Nav(object):
color_print
(
'没有映射用户'
,
'red'
)
color_print
(
'没有映射用户'
,
'red'
)
return
return
ssh_tty
=
SshTty
(
login_user
,
asset
,
role
)
print
(
'Connecting
%
s ...'
%
asset
.
hostname
)
print
(
'Connecting
%
s ...'
%
asset
.
hostname
)
ssh_tty
=
SshTty
(
login_user
,
asset
,
role
)
ssh_tty
.
connect
()
ssh_tty
.
connect
()
except
(
KeyError
,
ValueError
):
except
(
KeyError
,
ValueError
):
color_print
(
'请输入正确ID'
,
'red'
)
color_print
(
'请输入正确ID'
,
'red'
)
...
@@ -781,6 +783,7 @@ def main():
...
@@ -781,6 +783,7 @@ def main():
else
:
else
:
nav
.
search
(
option
)
nav
.
search
(
option
)
if
len
(
nav
.
search_result
)
==
1
:
if
len
(
nav
.
search_result
)
==
1
:
print
(
'Only match Host:
%
s '
%
nav
.
search_result
[
0
]
.
hostname
)
nav
.
try_connect
()
nav
.
try_connect
()
else
:
else
:
nav
.
print_search_result
()
nav
.
print_search_result
()
...
...
This diff is collapsed.
Click to expand it.
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