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

Adjust tests related to /etc/shadow #510

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Adjust tests related to /etc/shadow #510

merged 2 commits into from
Jul 26, 2022

Conversation

smcv
Copy link
Collaborator

@smcv smcv commented May 11, 2022

  • test-run: Skip a test if we can read /etc/shadow

    Ordinarily, we would not be able to read /etc/shadow if we're not uid 0;
    but when building in a sysroot owned by the current user (for example
    by setting it up using bwrap, as steam-runtime-tools does), we might
    actually be able to read it. Skip the assertion that we cannot read it
    in this case.

  • test-run: Add another assertion that we cannot read /etc/shadow

    The goal of this assertion was to demonstrate that a setuid bwrap does
    not give us access to otherwise unreadable files, but if we want to
    check that, we should probably be looking at the bind-mount destination
    instead of the source file.

    Leave the old assertion in too, just in case that fails.


@RyuzakiKK will probably find this useful.

smcv added 2 commits May 11, 2022 15:55
Ordinarily, we would not be able to read /etc/shadow if we're not uid 0;
but when building in a sysroot owned by the current user (for example
by setting it up using bwrap, as steam-runtime-tools does), we might
actually be able to read it. Skip the assertion that we cannot read it
in this case.

Signed-off-by: Simon McVittie <smcv@collabora.com>
The goal of this assertion was to demonstrate that a setuid bwrap does
not give us access to otherwise unreadable files, but if we want to
check that, we should probably be looking at the bind-mount destination
instead of the source file.

Leave the old assertion in too, just in case *that* fails.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Copy link
Contributor

@RyuzakiKK RyuzakiKK left a comment

Choose a reason for hiding this comment

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

I reviewed this patch as part of a steam-runtime-tools MR.
Not a maintainer but LGTM.

@smcv
Copy link
Collaborator Author

smcv commented Jul 26, 2022

Timed out waiting for review from another maintainer, merging based on positive review from my colleague @RyuzakiKK.

@smcv smcv merged commit 8af578d into containers:main Jul 26, 2022
zeyusteel added a commit to zeyusteel/bubblewrap-annotated that referenced this pull request Nov 8, 2022
bubblewrap 0.7.0

New features:

* `--size` option controls the size of a subsequent `--tmpfs` (containers#509)
* Better error messages if a mount operation fails (containers#472)
* Better error message if creating the new user namespace fails with
  `ENOSPC` (containers#487)
* When building as a Meson subproject, a `RUNPATH` can be set on the
  executable to make it easier to bundle its `libcap` dependency

Bug fixes:

* When building with Autotools, ensure initial setup for `pkg-config`
  is not disabled by `--with-bash-completion-dir=PATH` (containers#316, containers#342, containers#441)
* Fix test failures when running as uid 0 but with limited capabilities
  (containers#510)
* Use POSIX `command -v` in preference to non-standard `which` (containers#527)
* Fix a copy/paste error in `--help` (containers#531)

Git-EVTag-v0-SHA512: f4f6e2a92493461c2c39bacc1c3003167162113c88d2142f2041dcb830f3bd3a7df541aad361d1e6ce99576d66bd7eac1065340406e294cd4769b9c4c81c2a2c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants