Skip to content
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

modif: stop hiding blacklisted files in /etc by default and add a new etc-no-blacklisted option #5591

Merged
merged 2 commits into from
Jan 16, 2023

Conversation

smitsohu
Copy link
Collaborator

Closes #5010
Closes #5230

@smitsohu smitsohu changed the title opt-in: skip blacklisted files in private-etc opt-in: hide blacklisted files in /etc Jan 15, 2023
Copy link
Collaborator

@glitsj16 glitsj16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Nice to get these fixes in 0.9.72 (I hope)!

@smitsohu
Copy link
Collaborator Author

Thanks @glitsj16

Unfortunately I think I will need to update the pull request one more time, also to fix the failing test, sorry for that! Converting to draft ...

@smitsohu smitsohu marked this pull request as draft January 15, 2023 16:14
@smitsohu smitsohu marked this pull request as ready for review January 15, 2023 21:43
@netblue30
Copy link
Owner

The fix is straightforward - @smitsohu, let's do like this:

I'll grab it as is and fix whatever is to fix in "make test", and you check in directly whatever else you need to modify. Then, I'll release it, quite simple!

@netblue30 netblue30 merged commit e0f87dd into netblue30:master Jan 16, 2023
@smitsohu smitsohu deleted the private-etc-no-blacklisted branch January 16, 2023 01:14
@smitsohu
Copy link
Collaborator Author

@netblue30 I think it should be ok the way it is now. Maybe I rearrange it at a later timepoint, after the release is out.

kmk3 added a commit to kmk3/firejail that referenced this pull request Jan 16, 2023
To avoid boolean confusion (`no-foo no` / `no-foo yes`) in
firejail.config:

    etc-no-blacklisted no
    etc-no-blacklisted yes

Commands used to search and replace:

    git grep -Ilz -i 'etc.no.blacklisted' -- etc src |
      xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \
        -e 's/etc-no-blacklisted/etc-hide-blacklisted/' \
        -e 's/ETC_NO_BLACKLISTED/ETC_HIDE_BLACKLISTED/' \
        '{}')\" >'{}'"

Added on commit ded5020 ("opt-in: skip blacklisted files in
private-etc - netblue30#5010, netblue30#5230", 2023-01-15) / PR netblue30#5591.
kmk3 added a commit to kmk3/firejail that referenced this pull request Jan 16, 2023
To make it clearer.

Added on commit ded5020 ("opt-in: skip blacklisted files in
private-etc - netblue30#5010, netblue30#5230", 2023-01-15) / PR netblue30#5591.
kmk3 added a commit to kmk3/firejail that referenced this pull request Jan 16, 2023
Let users know that enabling this may break /etc/resolv.conf.

Added on commit ded5020 ("opt-in: skip blacklisted files in
private-etc - netblue30#5010, netblue30#5230", 2023-01-15) / PR netblue30#5591.
@kmk3 kmk3 added this to In progress in Release 0.9.72 via automation Jan 16, 2023
@kmk3 kmk3 changed the title opt-in: hide blacklisted files in /etc firejail.config: add etc-no-blacklisted option to hide blacklisted files in /etc (opt-in) Jan 16, 2023
@kmk3
Copy link
Collaborator

kmk3 commented Jan 16, 2023

Related commit: ba9c969 ("Removing blacklisted files from top level /etc
directory if the filse were blacklisted", 2021-07-14).

For future reference, the default behavior on 0.9.68 and 0.9.70 (due to the
above commit) is likely similar to having etc-no-blacklisted yes.

kmk3 added a commit that referenced this pull request Jan 16, 2023
@kmk3 kmk3 changed the title firejail.config: add etc-no-blacklisted option to hide blacklisted files in /etc (opt-in) modif: stop hiding blacklisted files in /etc by default and add a new etc-no-blacklisted option Jan 16, 2023
@kmk3 kmk3 moved this from In progress to Done (on RELNOTES) in Release 0.9.72 Jan 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Release 0.9.72
  
Done (on RELNOTES)
4 participants