BZ #1693136 - always add a newline before writing the REX key #304
Conversation
also strip any possibly present newlines from the key before writing
| @@ -707,6 +708,7 @@ def install_ssh_key_from_string(foreman_ssh_key): | |||
| print_generic("Foreman's SSH key already present in %s" % options.remote_exec_authpath) | |||
| return | |||
| output = os.fdopen(os.open(options.remote_exec_authpath, os.O_WRONLY | os.O_CREAT, OWNER_ONLY_FILE), 'a') | |||
| output.write("\n") | |||
| output.write(foreman_ssh_key) | |||
There was a problem hiding this comment.
Would this now need a newline at the end?
There was a problem hiding this comment.
Nah, the file will just not have an ending \n, which I think is fine.
There was a problem hiding this comment.
I think I've seen some tools fail on that so perhaps better to be safe than sorry?
There was a problem hiding this comment.
OpenSSH is fine with this. And adding a newline here would technically add two newslines between each key we added. Or we'd need to read the whole file, strip() it, and then add stuff, which I'd like to avoid.
There was a problem hiding this comment.
It's already likely the user has a line ending so you might be injecting additional newlines anyway. But I'm fine either way.
| @@ -707,6 +708,7 @@ def install_ssh_key_from_string(foreman_ssh_key): | |||
| print_generic("Foreman's SSH key already present in %s" % options.remote_exec_authpath) | |||
| return | |||
| output = os.fdopen(os.open(options.remote_exec_authpath, os.O_WRONLY | os.O_CREAT, OWNER_ONLY_FILE), 'a') | |||
| output.write("\n") | |||
| output.write(foreman_ssh_key) | |||
There was a problem hiding this comment.
It's already likely the user has a line ending so you might be injecting additional newlines anyway. But I'm fine either way.
also strip any possibly present newlines from the key before writing