RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Userland: Enhance jail-attach utility to support existing and new jails

Browse source 
The Core::System::create_jail function already provided the new jail
index as a result, so it was just a matter of using it when calling the
LibCore join_jail function to use the new jail.
This commit is contained in:
Liav A 2022-11-11 11:05:17 +02:00 • committed by Andrew Kaster
parent 1adc3530b2
commit 9f571e0dae
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Base/usr/share/man/man1/jail-attach.md
View file

@ -13,9 +13,19 @@ $ jail-attach <jail index> <command>
`jail-attach` attaches a new process by specifying a command, to an existing jail, with a `jail-attach` attaches a new process by specifying a command, to an existing jail, with a
specified jail index. specified jail index.
## Options
* `-i`, `--jail-index`: Use an already existing jail with its index
* `-n`, `--jail-name`: Create a new jail with a provided name
## Examples ## Examples
```sh ```sh
# Attach the command "ps -ef" to a jail with the index 0 # Attach the command "ps -ef" to an already existing jail with the index 0
$ jail-attach 0 ps -ef $ jail-attach -i 0 ps -ef
```
```sh
# Attach the command "/bin/Shell" to a new jail with the name "test jail"
$ jail-attach -n "test jail" /bin/Shell
``` ```

17
Userland/Utilities/jail-attach.cpp
View file

@ -11,18 +11,29 @@
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
unsigned jail_index = 0; StringView new_jail_name;
Vector<StringView> command; Vector<StringView> command;
Optional<size_t> existing_jail_index;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
bool preserve_env = false; bool preserve_env = false;
args_parser.set_stop_on_first_non_option(true); args_parser.set_stop_on_first_non_option(true);
args_parser.add_option(preserve_env, "Preserve user environment when running command", "preserve-env", 'E'); args_parser.add_option(preserve_env, "Preserve user environment when running command", "preserve-env", 'E');
args_parser.add_positional_argument(jail_index, "Jail Index", "jail index"); args_parser.add_option(new_jail_name, "Create a new jail with a name", "jail-name", 'n', "New jail name");
args_parser.add_option(existing_jail_index, "Use an existing jail index instead of creating new jail", "jail-index", 'i', "Existing jail index");
args_parser.add_positional_argument(command, "Command to execute", "command"); args_parser.add_positional_argument(command, "Command to execute", "command");
args_parser.parse(arguments); args_parser.parse(arguments);
TRY(Core::System::pledge("stdio rpath exec id jail tty")); TRY(Core::System::pledge("stdio rpath exec id jail tty"));
TRY(Core::System::join_jail(jail_index));
if (existing_jail_index.has_value() && !new_jail_name.is_null())
return Error::from_string_view("Can't launch process in a new jail with a name and use an existing jail index."sv);
if (existing_jail_index.has_value()) {
TRY(Core::System::join_jail(existing_jail_index.value()));
} else {
u64 new_jail_index = TRY(Core::System::create_jail(new_jail_name.is_null() ? ""sv : new_jail_name));
TRY(Core::System::join_jail(new_jail_index));
}
TRY(Core::System::exec_command(command, preserve_env)); TRY(Core::System::exec_command(command, preserve_env));
return 0; return 0;
} }