Add support for security-context-v1 #7648
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
|
Additional privileged protocols to consider: input inhibit, shortcut inhibit, virtual keyboard and pointer. |
WhyNotHugo
approved these changes
Jul 4, 2023
There was a problem hiding this comment.
I've created a little helper to create secure contexts via the command line and used it to test this branch along with wlroot's secure-context branch (to be honest, this procedure tested both the sway/wlroots changes as well as my own helper).
I created a secure context with way-secure --socket-path /tmp/test-socket and the exported WAYLAND_DISPLAY=/tmp/test-socket. The following steps all happened with this environment variable exported.
- Running
wayland-infodoes not list thezwlr_screencopy_manager_v1privileged procotol (as expected). - Running
footon this environment also worked (again, as expected). - After closing the
close_fd, clients could not longer connect to the socket:failed to create display: Connection refused(yet again, as expected).
emersion
force-pushed
the
security-context
branch
from
0c97c1b
to
54d0a5c
Compare
|
Thanks! |
emersion
force-pushed
the
security-context
branch
from
54d0a5c
to
fd90e61
Compare
|
Building with wlroots 2ef51ad5d50f8f258c96cba712918acc58554d88 and this branch (fd90e61) is currently failing: You need to apply this patch: diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 476bfd252..11404ae1e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -530,7 +530,7 @@ static bool scan_out_fullscreen_view(struct sway_output *output,
return false;
}
- wlr_presentation_surface_sampled_on_output(server.presentation, surface,
+ wlr_presentation_surface_textured_on_output(server.presentation, surface,
wlr_output);
return wlr_output_commit_state(wlr_output, pending);
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index f08e2c6c4..c4c0004e7 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -150,7 +150,7 @@ static void render_surface_iterator(struct sway_output *output,
render_texture(data->ctx, texture,
&src_box, &dst_box, &clip_box, surface->current.transform, alpha);
- wlr_presentation_surface_sampled_on_output(server.presentation, surface,
+ wlr_presentation_surface_textured_on_output(server.presentation, surface,
wlr_output);
}And cherry pick 363c579 (or just rebase onto |
|
Actually, just rebasing onto |
As a first step, deny access to privileged protocols to sandboxed apps. References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3589
emersion
force-pushed
the
security-context
branch
from
fd90e61
to
550eb07
Compare
agx
added a commit
to agx/phoc
that referenced
this pull request
Jan 19, 2024
…ents Clients that have a security-context-v1 attached shouldn't see those globals so filter them out. This is inspired by sway's MR swaywm/sway#7648 Signed-off-by: Guido Günther <agx@sigxcpu.org> Part-of: <https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/463>
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.
As a first step, deny access to privileged protocols to sandboxed
apps.
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3589
Depends on #7647