##// END OF EJS Templates
ssh-keys: further sanitize data of inputted SSH keys.
marcink -
r2751:ea9069b3 stable
parent child Browse files
Show More
@@ -826,7 +826,7 b' class UsersView(UserAppView):'
826 fingerprint = key.hash_md5()
826 fingerprint = key.hash_md5()
827
827
828 ssh_key = SshKeyModel().create(
828 ssh_key = SshKeyModel().create(
829 c.user.user_id, fingerprint, key_data, description)
829 c.user.user_id, fingerprint, key.keydata, description)
830 ssh_key_data = ssh_key.get_api_data()
830 ssh_key_data = ssh_key.get_api_data()
831
831
832 audit_logger.store_web(
832 audit_logger.store_web(
@@ -98,7 +98,7 b' class MyAccountSshKeysView(BaseAppView, '
98 fingerprint = key.hash_md5()
98 fingerprint = key.hash_md5()
99
99
100 ssh_key = SshKeyModel().create(
100 ssh_key = SshKeyModel().create(
101 c.user.user_id, fingerprint, key_data, description)
101 c.user.user_id, fingerprint, key.keydata, description)
102 ssh_key_data = ssh_key.get_api_data()
102 ssh_key_data = ssh_key.get_api_data()
103
103
104 audit_logger.store_web(
104 audit_logger.store_web(
@@ -87,7 +87,8 b' def _generate_ssh_authorized_keys_file('
87 # replace all newline from ends and inside
87 # replace all newline from ends and inside
88 safe_key_data = user_key.ssh_key_data\
88 safe_key_data = user_key.ssh_key_data\
89 .strip()\
89 .strip()\
90 .replace('\n', ' ')\
90 .replace('\n', ' ') \
91 .replace('\t', ' ') \
91 .replace('\r', ' ')
92 .replace('\r', ' ')
92
93
93 line = line_tmpl.format(
94 line = line_tmpl.format(
General Comments 0
You need to be logged in to leave comments. Login now