YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use YunohostValidationError instead of raw Exceptions

Browse source
This commit is contained in:
Alexandre Aubin 2021-03-25 16:10:00 +01:00
parent fb1fddd07e
commit f158a4da9e
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/yunohost/ssh.py
View file

@ -13,7 +13,7 @@ SSHD_CONFIG_PATH = "/etc/ssh/sshd_config"
def user_ssh_list_keys(username): def user_ssh_list_keys(username):
user = _get_user_for_ssh(username, ["homeDirectory"]) user = _get_user_for_ssh(username, ["homeDirectory"])
if not user: if not user:
raise Exception("User with username '%s' doesn't exists" % username) raise YunohostValidationError("user_unknown", user=username)
authorized_keys_file = os.path.join( authorized_keys_file = os.path.join(
user["homeDirectory"][0], ".ssh", "authorized_keys" user["homeDirectory"][0], ".ssh", "authorized_keys"
@ -50,7 +50,7 @@ def user_ssh_list_keys(username):
def user_ssh_add_key(username, key, comment): def user_ssh_add_key(username, key, comment):
user = _get_user_for_ssh(username, ["homeDirectory", "uid"]) user = _get_user_for_ssh(username, ["homeDirectory", "uid"])
if not user: if not user:
raise Exception("User with username '%s' doesn't exists" % username) raise YunohostValidationError("user_unknown", user=username)
authorized_keys_file = os.path.join( authorized_keys_file = os.path.join(
user["homeDirectory"][0], ".ssh", "authorized_keys" user["homeDirectory"][0], ".ssh", "authorized_keys"
@ -90,21 +90,26 @@ def user_ssh_add_key(username, key, comment):
def user_ssh_remove_key(username, key): def user_ssh_remove_key(username, key):
user = _get_user_for_ssh(username, ["homeDirectory", "uid"]) user = _get_user_for_ssh(username, ["homeDirectory", "uid"])
if not user: if not user:
raise Exception("User with username '%s' doesn't exists" % username) raise YunohostValidationError("user_unknown", user=username)
authorized_keys_file = os.path.join( authorized_keys_file = os.path.join(
user["homeDirectory"][0], ".ssh", "authorized_keys" user["homeDirectory"][0], ".ssh", "authorized_keys"
) )
if not os.path.exists(authorized_keys_file): if not os.path.exists(authorized_keys_file):
raise Exception( raise YunohostValidationError(
"this key doesn't exists ({} dosesn't exists)".format(authorized_keys_file) "this key doesn't exists ({} dosesn't exists)".format(authorized_keys_file),
raw_msg=True
) )
authorized_keys_content = read_file(authorized_keys_file) authorized_keys_content = read_file(authorized_keys_file)
if key not in authorized_keys_content: if key not in authorized_keys_content:
raise Exception("Key '{}' is not present in authorized_keys".format(key)) raise YunohostValidationError(
"Key '{}' is not present in authorized_keys".format(key),
raw_msg=True
)
# don't delete the previous comment because we can't verify if it's legit # don't delete the previous comment because we can't verify if it's legit