Shelldriver: make destination authorized keys file an arguement #1732
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmelange
force-pushed
the
25.0.1-shelldriver_authorized_keys_file
branch
5 times, most recently
from
0eebd4b to
75a5828
Compare
Add an addition optional arg "dest_authorized_keys" with the default value of ```~/.ssh/authorized_keys```, An example where this might be used is when an embedded system uses dropbear as it's ssh server daemon. In such a case, the authorized_keys file is ```/etc/dropbear/authorized_keys``` Additionally, the ```put_key_file``` takes an optional ```dest_authorized_keys``` function parameter which defaults to the above arg. Fixes: #labgrid-project#1626 Signed-off-by: Perry Melange <[email protected]>
pmelange
force-pushed
the
25.0.1-shelldriver_authorized_keys_file
branch
from
75a5828 to
b56722e
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1732 +/- ##
=========================================
- Coverage 55.6% 45.4% -10.3%
=========================================
Files 172 172
Lines 13495 13499 +4
=========================================
- Hits 7514 6131 -1383
- Misses 5981 7368 +1387
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Emantor
requested changes
Dec 17, 2025
| def _put_ssh_key(self, keyfile_path): | ||
| @step(args=['keyfile_path', 'dest_authorized_keys']) | ||
| def _put_ssh_key(self, keyfile_path, dest_authorized_keys): | ||
| """Upload an SSH Key to a target""" |
Member
There was a problem hiding this comment.
This documentation comment should be moved with the function.
| @Driver.check_active | ||
| def put_ssh_key(self, keyfile_path): | ||
| self._put_ssh_key(keyfile_path) | ||
| def put_ssh_key(self, keyfile_path, dest_authorized_keys = None): |
Member
There was a problem hiding this comment.
While moving the documentation comment, please extend it for all arguments of the function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Change the ShellDriver so that the authorized_keys file can be set to something other than
~/.ssh. This is necessary if the DUT is running dropbear, where the authorized_keys file is located (on OpenWrt) in/etc/dropbear/authorized_keys.The default value for the new arguement is
~/.sshand therefore any old code should not need to be updated. In addition, the call to put_ssh_key() has a new optional arg where the user can set the destination authorized_keys file. This could also be useful for setting up a multi-user system and to put the authorized_keys file for each user in their own home directory.Checklist
Fixes: #1626