support for ssh password #167
Conversation
Emantor
left a comment
Emantor
left a comment
There was a problem hiding this comment.
Whats missing is an update to the NetworkService documentation in doc/configuration.rst, together with my review comments looks good to me 👍
labgrid/driver/sshdriver.py
Outdated
| (stdout, stderr, returncode) | ||
| """ | ||
| complete_cmd = "ssh -x {prefix} {user}@{host} {cmd}".format( | ||
| complete_cmd = "ssh -x{prefix} {user}@{host} {cmd}".format( |
There was a problem hiding this comment.
As above I'm wondering about the change here.
There was a problem hiding this comment.
i found these changes necessary to prevent 2 spaces following each other in the cmd line.
(2 spaces cause split(' ') to add an empty element in the list which will be treated by ssh as the hostname...)
There was a problem hiding this comment.
Ah, I see. In that case I would like you too shuffle the self.ssh_prefix += " -o LogLevel=ERROR" line to the top and handle the extra missing space there. Otherwise we would have to touch the get and put functions as well. I tested your changes against a local device, works fine :)
There was a problem hiding this comment.
damn - i missed put and get.
should work now with one change less ;-)
labgrid/driver/sshdriver.py
Outdated
|
|
||
| def on_activate(self): | ||
| self.ssh_prefix = "-i {}".format(os.path.abspath(self.keyfile) | ||
| self.ssh_prefix = " -i {}".format(os.path.abspath(self.keyfile) |
There was a problem hiding this comment.
Is this change with the change below necessary? Looks like an unnecessary change to me.
T-o-b-i
force-pushed
the
feature/ssh_password
branch
from
c438a81 to
61dd3fb
Compare
Codecov Report
@@ Coverage Diff @@
## master #167 +/- ##
========================================
- Coverage 51.2% 51.1% -0.1%
========================================
Files 88 88
Lines 4943 4949 +6
========================================
+ Hits 2532 2533 +1
- Misses 2411 2416 +5
Continue to review full report at Codecov.
|
|
was waiting with the documentation till we agreed on the rest ;-) |
labgrid/driver/sshdriver.py
Outdated
| (stdout, stderr, returncode) | ||
| """ | ||
| complete_cmd = "ssh -x {prefix} {user}@{host} {cmd}".format( | ||
| complete_cmd = "ssh -x{prefix} {user}@{host} {cmd}".format( |
There was a problem hiding this comment.
Ah, I see. In that case I would like you too shuffle the self.ssh_prefix += " -o LogLevel=ERROR" line to the top and handle the extra missing space there. Otherwise we would have to touch the get and put functions as well. I tested your changes against a local device, works fine :)
T-o-b-i
force-pushed
the
feature/ssh_password
branch
from
61dd3fb to
15a84a6
Compare
the networkservice resource has a new password property - if it is set the sshdriver will login with sshpass (needs to be installed) instead of the key file Signed-off-by: Tobi Gschwendtner <tg@bloks.de> [r.czerwinski@pengutronix.de: fix commit message, documentation and rebase] Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Emantor
force-pushed
the
feature/ssh_password
branch
from
15a84a6 to
8770d78
Compare
3 participants
the sshdriver will login with sshpass (needs to be installed) instead
of the key file
Signed-off-by: Tobi Gschwendtner tg@bloks.de