modif: drop deprecated 'shell' option references #5894
Merged
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
kmk3
force-pushed
the
shell-none-cleaning
branch
2 times, most recently
from
46a1dc8
to
8c86fae
Compare
|
I fixed the tests and removed a few more references, as I had a branch with But note that it is still referenced in more places: $ git grep -In 'shell.none' -- src test
src/firejail/cmdline.c:140: // index == -1 could happen if we have --shell=none and no program was specified
src/firejail/cmdline.c:167: // index == -1 could happen if we have --shell=none and no program was specified
src/firejail/fs_lib.c:434:// if (!arg_shell_none) {
src/firejail/join.c:416:// if (!arg_shell_none)
src/firejail/main.c:2967: fprintf(stderr, "Error: command must be specified when --shell=none used.\n");
src/firejail/profile.c:374: else if (strcmp(ptr, "shell none") == 0) {
src/firejail/profile.c:375: fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n");
src/firejail/sandbox.c:416:// we are here because of --shell=none
src/firejail/sandbox.c:551: fprintf(stderr, "Error: --shell=none configured, but no program specified\n");
test/environment/shell-none.profile:1:shell none
test/profiles/ignore.profile:3:shell none
test/profiles/ignore2.profile:5:shell none
test/profiles/ignore3.profile:4:shell noneI'm not sure about the source code and the tests should probably be changed to |
rusty-snake
reviewed
Jul 11, 2023
| @@ -160,8 +160,6 @@ _firejail_args=( | |||
| '*--seccomp.32.keep=-[enable seccomp filter, and whitelist the 32 bit syscalls specified by the command]: :' | |||
| # FIXME: Add errnos | |||
| '--seccomp-error-action=-[change error code, kill process or log the attempt]: :(kill log)' | |||
| '--shell=none[run the program directly without a user shell]' | |||
| '--shell=-[set default user shell]: :_values $(cat /etc/shells)' | |||
There was a problem hiding this comment.
Was shell removed too?
There was a problem hiding this comment.
Was shell removed too?
Yes:
$ firejail --quiet --shell=/bin/sh true; echo $?
Warning: --shell feature has been deprecated
1
$ cat test.profile
shell none
shell /bin/sh
$ firejail --quiet --profile=./test.profile true
Warning: "shell none" command in the profile file is done by default; the command will be deprecated
Error: line 2 in ./test.profile is invalid(The first warning is actually an error)
kmk3
force-pushed
the
shell-none-cleaning
branch
2 times, most recently
from
26b5aca
to
7714a5b
Compare
kmk3
changed the title
kmk3
force-pushed
the
shell-none-cleaning
branch
2 times, most recently
from
a2b4d62
to
a6d6a39
Compare
|
(Rebased to master to fix conflicts with #5898 and improved the error messages) |
kmk3
force-pushed
the
shell-none-cleaning
branch
from
a6d6a39
to
72746f9
Compare
The `shell` option has been removed. Remove stale references. This does NOT remove `shell none`-related code comments in: - src/firejail/fs_lib.c (L433-L441) - src/firejail/join.c (L415-L417) Relates to netblue30#5196. Suggested by netblue30#5891.
kmk3
force-pushed
the
shell-none-cleaning
branch
from
72746f9
to
d8ab6d9
Compare
kmk3
approved these changes
Jul 19, 2023
|
@kmk3 A big thank you for doing the additional work on this! |
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.
The
shelloption has been removed. Remove stale references.This does NOT remove
shell none-related code comments in:Relates to #5196.
Suggested by #5891.