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.

Sign up for GitHub

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

Jump to bottom

[WIP] Limit parser target redirect to allowed list #133

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Limit parser target redirect to allowed list #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions qrexec/policy/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,17 @@
elif target == "@adminvm":
target = "dom0"

available_targets = list(
self.rule.policy.collect_targets_for_ask(request)
)
if target not in available_targets:
raise AccessDenied(
"policy define 'allow' action at {}:{} but target {} was "
"denied in a previous rule".format(
self.rule.filepath, self.rule.lineno, target
)
)

if not self.autostart and not self.allow_no_autostart(
target, request.system_info
):
Expand Down Expand Up @@ -1076,12 +1087,20 @@
assert self.rule.is_match(request)

targets_for_ask: Iterable[str]
available_targets = list(
self.rule.policy.collect_targets_for_ask(request)
)
if self.target is not None:
if self.target not in available_targets:
raise AccessDenied(

Check warning on line 1095 in qrexec/policy/parser.py

View check run for this annotation

Codecov / codecov/patch

qrexec/policy/parser.py#L1094-L1095 

Added lines #L1094 - L1095 were not covered by tests
"policy define 'ask' action at {}:{} but target {} was "
"denied in a previous rule".format(
self.rule.filepath, self.rule.lineno, self.target
)
)
targets_for_ask = [self.target]
else:
targets_for_ask = list(
self.rule.policy.collect_targets_for_ask(request)
)
targets_for_ask = available_targets

if not self.autostart:
targets_for_ask = [
Expand Down
10 changes: 10 additions & 0 deletions qrexec/tests/policy_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,10 @@ def test_020_collect_targets_for_ask(self):
* * test-vm1 @anyvm ask
* * test-vm2 @tag:tag1 deny
* * test-vm2 @tag:tag2 allow
* * test-vm3 @tag:tag1 deny
* * test-vm3 @tag:tag1 allow target=test-vm1
* * test-vm3 @tag:tag2 deny
* * test-vm3 @tag:tag2 ask default_target=test-vm2 target=test-vm2
* * test-no-dvm @type:AppVM deny
* * @type:AppVM @default allow target=test-vm3
* * @tag:tag1 @type:AppVM allow
Expand Down Expand Up @@ -1207,6 +1211,12 @@ def test_020_collect_targets_for_ask(self):
self.assertCountEqual(
policy.collect_targets_for_ask(_req("test-vm3", "@default")), []
)
self.assertCountEqual(
policy.collect_targets_for_ask(_req("test-vm3", "test-vm1")), [],
)
self.assertCountEqual(
policy.collect_targets_for_ask(_req("test-vm3", "test-vm2")), [],
)
self.assertCountEqual(
policy.collect_targets_for_ask(_req("test-standalone", "@default")),
[
Expand Down