Use run_command instead of run_get_output for OSUtil functions #1858
Conversation
This file contains 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
larohra
commented
Apr 18, 2020
| @@ -211,8 +199,8 @@ def del_account(self, username): | |||
| :param username: | |||
| :return: | |||
| """ | |||
| shellutil.run("> /var/run/utmp") | |||
There was a problem hiding this comment.
This command was just using redirection to create empty files, replaced it with touch command
Codecov Report
@@ Coverage Diff @@
## develop #1858 +/- ##
===========================================
- Coverage 69.45% 69.43% -0.03%
===========================================
Files 82 82
Lines 11469 11481 +12
Branches 1619 1610 -9
===========================================
+ Hits 7966 7972 +6
- Misses 3166 3171 +5
- Partials 337 338 +1
Continue to review full report at Codecov.
|
larohra
commented
Apr 20, 2020
| "/bin/clish -s -c '" + cmd + "'", log_cmd=log_cmd) | ||
| if not ret: | ||
| try: | ||
| final_command = ["/bin/clish", "-s", "-c", "'{0}'".format(cmd)] |
There was a problem hiding this comment.
Since this command is opening a new shell, we dont need to tokenise the cmd variable.
Eg:
shlex.split("/bin/clish -s -c 'set user admin password-hash *LOCK*'")
['/bin/clish', '-s', '-c', 'set user admin password-hash *LOCK*']
larohra
commented
Apr 23, 2020
| @@ -106,7 +106,7 @@ def chpasswd(self, username, password, crypt_id=6, salt_len=10): | |||
| if self.is_sys_user(username): | |||
| raise OSUtilError(("User {0} is a system user. " | |||
| "Will not set passwd.").format(username)) | |||
| output = self._run_command_raising_OSUtilError(['echo', '-n', '{0}|encrypt'.format(password)], | |||
There was a problem hiding this comment.
echo -n basically just does not append \n at the end of the string. They were using echo to redirect password to the encrypt command. Passing it through Popen now
narrieta
previously approved these changes
Apr 23, 2020
|
LGTM |
anhvoms
approved these changes
Apr 24, 2020
narrieta
approved these changes
Apr 24, 2020
pgombar
approved these changes
Apr 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Changed the internals of certain OSUtil functions to use shellutil.run_command instead of run_get_output or run() because the former is securer as it doesn't create a new shell during Popen. i.e. shell=False in Popen
Issue #
PR information
Quality of Code and Contribution Guidelines