Skip to content

fix: add recovery user home dir to selinux policy #8817

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

Draft
r-birkner wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Draft

fix: add recovery user home dir to selinux policy #8817

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
2 changes: 2 additions & 0 deletions ic-os/components/guestos/selinux/ic-node/ic-node.fc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
/var/lib/admin -d gen_context(system_u:object_r:user_home_dir_t,s0)
/var/lib/readonly -d gen_context(system_u:object_r:user_home_dir_t,s0)
/var/lib/backup -d gen_context(system_u:object_r:user_home_dir_t,s0)
/var/lib/recovery -d gen_context(system_u:object_r:user_home_dir_t,s0)
/var/lib/admin/.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0)
/var/lib/readonly/.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0)
/var/lib/backup/.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0)
/var/lib/recovery/.ssh(/.*)? gen_context(system_u:object_r:ssh_home_t,s0)
4 changes: 2 additions & 2 deletions ic-os/components/ssh/setup-ssh-user-keys/setup-ssh-user-keys-guestos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ copy_ssh_keys() {

# Create home directories
echo "Creating user home directories"
for ACCOUNT in backup readonly admin; do
for ACCOUNT in backup readonly admin recovery; do
HOMEDIR=$(getent passwd "${ACCOUNT}" | cut -d: -f6)
echo "Creating home directory for ${ACCOUNT}: ${HOMEDIR}"
mkdir -p "${HOMEDIR}"
done

# Setup SSH keys
echo "Setting up SSH keys for accounts"
for ACCOUNT in backup readonly admin; do
for ACCOUNT in backup readonly admin recovery; do
HOMEDIR=$(getent passwd "${ACCOUNT}" | cut -d: -f6)
GROUP=$(id -ng "${ACCOUNT}")

Expand Down
2 changes: 1 addition & 1 deletion rs/ic_os/config/types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ pub struct ICOSSettings {
/// wrapper from the `ic_sev` crate, as this cannot be faked by a malicious HostOS.
#[serde(default)]
pub enable_trusted_execution_environment: bool,
/// This ssh keys directory contains individual files named `admin`, `backup`, `readonly`.
/// This ssh keys directory contains individual files named `admin`, `backup`, `readonly`, `recovery`.
/// The contents of these files serve as `authorized_keys` for their respective role account.
/// This means that, for example, `accounts_ssh_authorized_keys/admin`
/// is transferred to `~admin/.ssh/authorized_keys` on the target system.
Expand Down
Loading