files.Block: fixed couple of bugs, added try_prevent_shell_expansion and support for content: list[str]
#1030
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
stone-w4tch3r
changed the title
try_prevent_shell_expansion and support for content: list[str]try_prevent_shell_expansion and support for content: list[str]
stone-w4tch3r
changed the title
try_prevent_shell_expansion and support for content: list[str]files.Block: fixed couple of bugs, added try_prevent_shell_expansion and support for content: list[str]
stone-w4tch3r
commented
Nov 11, 2023
| @@ -1661,7 +1666,7 @@ def block( | |||
| ) | |||
|
|
|||
| # have two entries in /etc/host | |||
| files.marked_block( | |||
| files.block( | |||
There was a problem hiding this comment.
stone-w4tch3r
commented
Nov 11, 2023
| @@ -1614,6 +1614,7 @@ def block( | |||
| line=None, | |||
| backup=False, | |||
| escape_regex_characters=False, | |||
| try_prevent_shell_expansion=False, | |||
There was a problem hiding this comment.
#1029
helps with mentioned issue
stone-w4tch3r
commented
Nov 11, 2023
| @@ -1748,21 +1773,30 @@ def block( | |||
| f"{print_after} f!=1 && /{regex}/ {{ print x; f=1}} " | |||
| f"END {{if (f==0) print ARGV[2] }} {print_before}'" | |||
| ) | |||
| cmd = StringCommand(out_prep, prog, q_path, f'$"{the_block}"', "> $OUT &&", real_out) | |||
There was a problem hiding this comment.
...f'$"{the_block}"'...
Removed $
stone-w4tch3r
commented
Nov 11, 2023
| ) | ||
| cmd = StringCommand( | ||
| out_prep, | ||
| prog, | ||
| q_path, | ||
| '$"' + content + '"', |
There was a problem hiding this comment.
'$"' + content + '"',
Removed $
stone-w4tch3r
commented
Nov 11, 2023
| ): # marked_block found but text is different | ||
| prog = ( | ||
| 'awk \'BEGIN {{f=1; x=ARGV[2]; ARGV[2]=""}}' | ||
| f"/{mark_1}/ {{print; print x; f=0}} /{mark_2}/ {{print; f=1}} f'" | ||
| f"/{mark_1}/ {{print; print x; f=0}} /{mark_2}/ {{print; f=1; next}} f'" |
There was a problem hiding this comment.
#1031
Fixes this issue
Fizzadar
approved these changes
Jan 13, 2024
There was a problem hiding this comment.
@stone-w4tch3r huge thank you for working on this, I have to admit I have been struggling greatly to wrap my head around this operation, hugely appreciate your work here. Finally have pushed up some minor changes and fixed the tests to get this in.
|
(force push to get github to actually run actions, being very flakey at the moment) |
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.
#1028
Removed dollar signs, looks like they were typo
#984
As #984 (comment), renamed
files.marked_blockin documentation tofiles.block#1031
Adjusted
awkto prevent duplications#1029
Added
try_prevent_shell_expansionparameter to partially help with mentioned issueAnd also changed type for
contenttostr | list[str]. This makes it more unified withfacts.files.Block, that already returnslist[str]