Commit fe70ca80 authored by ibuler's avatar ibuler

修改bUg

parent 17ef381d
...@@ -11,6 +11,7 @@ import fcntl ...@@ -11,6 +11,7 @@ import fcntl
import signal import signal
import textwrap import textwrap
import django import django
import getpass
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from Crypto.Cipher import AES from Crypto.Cipher import AES
from binascii import b2a_hex, a2b_hex from binascii import b2a_hex, a2b_hex
...@@ -154,7 +155,7 @@ def get_user_host(username): ...@@ -154,7 +155,7 @@ def get_user_host(username):
hosts = {} hosts = {}
try: try:
user = User.objects.get(username=username) user = User.objects.get(username=username)
except AttributeError: except AttributeError, ObjectDoesNotExist:
red_print("Don't Use Root To Do That or User isn't Exist.") red_print("Don't Use Root To Do That or User isn't Exist.")
else: else:
perm_all = user.permission_set.all() perm_all = user.permission_set.all()
...@@ -164,8 +165,7 @@ def get_user_host(username): ...@@ -164,8 +165,7 @@ def get_user_host(username):
def print_prompt(): def print_prompt():
msg = """ msg = """\033[1;32m### Welcome Use JumpServer To Login. ### \033[0m
\033[1;32m### Welcome Use JumpServer To Login. ### \033[0m
1) Type \033[32mIP ADDRESS\033[0m To Login. 1) Type \033[32mIP ADDRESS\033[0m To Login.
2) Type \033[32mP/p\033[0m To Print The Servers You Available. 2) Type \033[32mP/p\033[0m To Print The Servers You Available.
3) Type \033[32mE/e\033[0m To Execute Command On Several Servers. 3) Type \033[32mE/e\033[0m To Execute Command On Several Servers.
...@@ -222,7 +222,8 @@ def connect(username, password, host, port): ...@@ -222,7 +222,8 @@ def connect(username, password, host, port):
if __name__ == '__main__': if __name__ == '__main__':
login_name = os.getlogin() #login_name = os.getlogin()
login_name = getpass.getuser()
print_prompt() print_prompt()
try: try:
while True: while True:
......
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