-
-
Notifications
You must be signed in to change notification settings - Fork 213
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: whitelist some commands #190
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -243,15 +243,27 @@ def execute_shell( | |
"""Executes a shell command and returns the output.""" | ||
shell = get_shell() | ||
assert not args | ||
whitelist_commands = ["ls", "stat", "cd", "cat", "pwd", "echo"] | ||
whitelisted = True | ||
|
||
cmd = code.strip() | ||
if cmd.startswith("$ "): | ||
cmd = cmd[len("$ ") :] | ||
|
||
print_preview(cmd, "bash") | ||
if not confirm("Run command?"): | ||
yield Message("system", "Command not run") | ||
return | ||
#NOTE: This does not handle control flow words like if, for, while. | ||
regex = r"(?:^|[|&;]|\|\||&&|\n)\s*([^\s|&;]+)" | ||
|
||
for match in re.finditer(regex, cmd): | ||
Comment on lines
+253
to
+256
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should compile this regex |
||
for group in match.groups(): | ||
if group and group not in whitelist_commands: | ||
whitelisted = False | ||
break | ||
|
||
if not whitelisted: | ||
print_preview(cmd, "bash") | ||
if not confirm("Run command?"): | ||
yield Message("system", "Command not run") | ||
return | ||
|
||
try: | ||
returncode, stdout, stderr = shell.run(cmd) | ||
|
@@ -261,7 +273,7 @@ def execute_shell( | |
stdout = _shorten_stdout(stdout.strip(), pre_tokens=2000, post_tokens=8000) | ||
stderr = _shorten_stdout(stderr.strip(), pre_tokens=2000, post_tokens=2000) | ||
|
||
msg = _format_block_smart("Ran command", cmd, lang="bash") + "\n\n" | ||
msg = _format_block_smart(f"Ran {'whitelisted ' if whitelisted else ''}command", cmd, lang="bash") + "\n\n" | ||
if stdout: | ||
msg += _format_block_smart("", stdout, "stdout") + "\n\n" | ||
if stderr: | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested the regex extensively but I guess it's the most unpredictable bit here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
regex testing site