zlax/sshch
zlax
/
sshch
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

blank password for remove password field

This commit is contained in:
ivan 2018-04-22 19:53:12 +03:00
parent b48081be65
commit b7fdcf119d
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -10,7 +10,7 @@ def main():
url='https://github.com/zlaxy/sshch/', url='https://github.com/zlaxy/sshch/',
description='Ssh connection manager', description='Ssh connection manager',
license='DWTWL 2.55', license='DWTWL 2.55',
version='0.998', version='0.999',
py_modules=['sshch'], py_modules=['sshch'],
scripts=['sshch/sshch'], scripts=['sshch/sshch'],

25
sshch/sshch
View File

@ -20,7 +20,7 @@ import curses
from curses import textpad, panel from curses import textpad, panel
# https://github.com/zlaxy/sshch # https://github.com/zlaxy/sshch
version = "0.998" version = "0.999"
# path to conf file, default: ~/.config/sshch.conf # path to conf file, default: ~/.config/sshch.conf
conf_file = path.expanduser("~") + '/.config/sshch.conf' conf_file = path.expanduser("~") + '/.config/sshch.conf'
# expand groups by default # expand groups by default
@ -47,9 +47,14 @@ def SetGroupString(alias, string):
def SetPassword(alias, string): def SetPassword(alias, string):
string = base64.b64encode(base64.b16encode( if string == "" or string == b'':
base64.b32encode(string))) conf.remove_option(alias, "password")
conf.set(alias, "password", string) else:
string = string.encode()
string = base64.b64encode(base64.b16encode(
base64.b32encode(string)))
string = string.decode('utf-8')
conf.set(alias, "password", string)
conf.write(open(conf_file, "w")) conf.write(open(conf_file, "w"))
@ -64,7 +69,7 @@ def ConnectAlias(alias, command=False):
if conf.has_option(alias, "password"): if conf.has_option(alias, "password"):
password = base64.b32decode(base64.b16decode( password = base64.b32decode(base64.b16decode(
base64.b64decode(conf.get(alias, "password")))) base64.b64decode(conf.get(alias, "password"))))
exec_string = 'sshpass -p "' + password + '" ' exec_string = 'sshpass -p "' + password.decode('utf-8') + '" '
if conf.has_option(alias, "exec_string"): if conf.has_option(alias, "exec_string"):
exec_string = exec_string + conf.get(alias, "exec_string") exec_string = exec_string + conf.get(alias, "exec_string")
if command: if command:
@ -118,7 +123,7 @@ def CMDGroup(group):
def CMDEdit(alias): def CMDEdit(alias):
if conf.has_section(alias): if conf.has_section(alias):
if conf.has_option(alias, "string"): if conf.has_option(alias, "exec_string"):
prompt_edit = ("".join(["Enter connection string for existing alias ", prompt_edit = ("".join(["Enter connection string for existing alias ",
"(example: ssh user@somehost.com):\n"])) "(example: ssh user@somehost.com):\n"]))
string = "" string = ""
@ -148,11 +153,10 @@ def CMDPassword(alias):
print("Can't set password for group.") print("Can't set password for group.")
else: else:
if conf.has_section(alias): if conf.has_section(alias):
prompt_pass = ("[UNSAFE] Enter password for sshpass: ") prompt_pass = ("[UNSAFE] Enter password for sshpass (Ctrl+C - cancel, blank - clear password):\n")
string = "" string = ""
string = getpass(prompt_pass) string = getpass(prompt_pass)
if not string == "": SetPassword(alias, string)
SetPassword(alias, string)
else: else:
print("error: '" + alias + "' alias does not exists") print("error: '" + alias + "' alias does not exists")
@ -600,8 +604,7 @@ def CursesMain():
(height // 2) - 1, 3, (height // 2) - 1, 3,
" Enter user password for sshpass and press 'enter':\n>", " Enter user password for sshpass and press 'enter':\n>",
normal_text, highlight_text, "password") normal_text, highlight_text, "password")
if not set_password == "": SetPassword(strings[position - 1].split()[0].strip(), set_password)
SetPassword(strings[position - 1].split()[0].strip(), set_password)
strings = GetTreeList(False, expanded) strings = GetTreeList(False, expanded)
stringsfull = GetTreeList(True, expanded) stringsfull = GetTreeList(True, expanded)
if (key_pressed == ord('r') or key_pressed == ord( if (key_pressed == ord('r') or key_pressed == ord(