mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-10-23 04:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/jail/Cargo.toml

38 lines
768 B
TOML
Raw Permalink Normal View History

jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
[package]
name = "jail"
version = "0.1.0"
authors = ["The ChromiumOS Authors"]
edition = "2021"
base: move fork_process to jail crate This API directly depends on Minijail, so it does not make sense for it to be in the base crate that should be cross platform. Move it into the jail crate, which already wraps other Linux-specific Minijail functionality. If we need to add a fork API that works on all unix platforms (including non-Linux), that could be re-added in base, but for now, this is only needed for Linux. This removes the `base` crate's dependency on minijail, as well as the special case test harness (which is moved to `jail` instead). Change-Id: Iabefff03ab18222b71b82571bd815d5f028236c8 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5556681 Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-05-22 01:14:03 +00:00
# The process tests will use fork, which requires a custom test harness to enforce single threaded
# execution.
[[test]]
name = "fork"
path = "tests/fork.rs"
harness = false
crosvm: Add seccomp_trace feature Add a minijail's mode of operation where an always-allow seccomp filter is attached to forked device processes. This facilitates capturing seccomp filters used by each device process separately. TESTED=./tools/build_release -- --features seccomp_trace && strace -ff crosvm --log-level debug run <args> BUG=b:258316090 Change-Id: Ic4d3f5178e6a2dcbd748d101db43574f3224ff78 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4289510 Commit-Queue: Zihan Chen <zihanchen@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com>
2023-02-23 23:21:55 +00:00
[features]
seccomp_trace = []
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
[dependencies]
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
anyhow = "1"
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
base = { path = "../base" }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
libc = "0.2"
base: move fork_process to jail crate This API directly depends on Minijail, so it does not make sense for it to be in the base crate that should be cross platform. Move it into the jail crate, which already wraps other Linux-specific Minijail functionality. If we need to add a fork API that works on all unix platforms (including non-Linux), that could be re-added in base, but for now, this is only needed for Linux. This removes the `base` crate's dependency on minijail, as well as the special case test harness (which is moved to `jail` instead). Change-Id: Iabefff03ab18222b71b82571bd815d5f028236c8 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5556681 Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-05-22 01:14:03 +00:00
log = "0.4"
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
once_cell = "1.7"
serde = "1"
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
serde_keyvalue = { path = "../serde_keyvalue", features = ["argh_derive"] }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
static_assertions = "1.1"
crosvm: Uprev zerocopy to 0.7.x zerocopy 0.7.x has finally released as a stable version, uprev it to allow some remaining structs to be derivable. TEST=CQ BUG=b:300969352 FIXED=b:300969352 Change-Id: I90f0dfb09494f875fef1cd11bfcbd48030846092 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4878761 Auto-Submit: Zihan Chen <zihanchen@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Zihan Chen <zihanchen@google.com>
2023-09-20 19:11:35 +00:00
zerocopy = { version = "0.7", features = ["derive"] }
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
Replace #[cfg(unix)] with #[cfg(any(target_os = "android", target_os = "linux"))] Updates are made to source and documentation. This more accurately represents the currently supported platforms of Android/Linux and Windows, without unexpectedly including other unix-like operating systems. Command to reproduce: $ find . -type f -not -path '*/\.git/*' | xargs -I {} sed -i 's/cfg(unix)/cfg(any(target_os = "android", target_os = "linux"))/g' {} $ cargo fmt md files manually updated to fix line lengths. Renaming `unix` modules to `linux` will be done in a later CL. Test: ./tools/dev_container ./tools/presubmit Bug: b/298269162 Change-Id: I42c1bf0abf80b9a0df25551613910293217c7295 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4909059 Commit-Queue: Cody Schuffelen <schuffelen@google.com> Reviewed-by: Frederick Mayle <fmayle@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com>
2023-10-03 01:33:00 +00:00
[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
minijail = "*"
[build-dependencies]
which = "4"
jail: Compile seccomp policies in parallel Allow running `compile_seccomp_policy` script in parallel in build.rs so the build time would change from 19 sec to 1.6 sec on my Linux workstation. With combinining with crrev.com/c/4546480, time of clean build of crosvm changed from 73.5 sec to 67.8 sec. BUG=b:283197076 TEST=cargo build Change-Id: I60197e29d623ccc3638fc464373fdf1d71b00ae1 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4546818 Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
2023-05-18 06:20:49 +00:00
rayon = "1.5.3"
jail: create jail crate from jail_helpers.rs Creates the jail create and move all policy files and helper methods to the crate to make jail helpers available to outside of the main crate (i.e. swap crate). This also move devices::Minijail and JailConfig to jail crate. BUG=b:258351526 TEST=cargo build Change-Id: If9a148bdb3b18f8b746875d47d1077fb17707c18 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4230456 Commit-Queue: Shin Kawamura <kawasin@google.com> Reviewed-by: Dennis Kempin <denniskempin@google.com> Reviewed-by: Noah Gold <nkgold@google.com> Reviewed-by: David Stevens <stevensd@chromium.org> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
2023-02-08 07:36:08 +00:00
[dev-dependencies]
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
cfg-if = "1"
base: move fork_process to jail crate This API directly depends on Minijail, so it does not make sense for it to be in the base crate that should be cross platform. Move it into the jail crate, which already wraps other Linux-specific Minijail functionality. If we need to add a fork API that works on all unix platforms (including non-Linux), that could be re-added in base, but for now, this is only needed for Linux. This removes the `base` crate's dependency on minijail, as well as the special case test harness (which is moved to `jail` instead). Change-Id: Iabefff03ab18222b71b82571bd815d5f028236c8 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5556681 Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Frederick Mayle <fmayle@google.com>
2024-05-22 01:14:03 +00:00
libtest-mimic = "0.6"
Reference in a new issue Copy permalink