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

Reset RCC binary and profile permissions during setup #655

Closed
wants to merge 1 commit into from
Closed

Reset RCC binary and profile permissions during setup #655

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
72 changes: 65 additions & 7 deletions src/bin/scheduler/setup/steps/rcc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use super::{
use crate::internal_config::{GlobalConfig, Plan};
use crate::logging::log_and_return_error;
#[cfg(windows)]
use crate::setup::windows_permissions::run_icacls_command;
use crate::setup::windows_permissions::{reset_access, run_icacls_command};

use robotmk::config::RCCProfileConfig;
use robotmk::environment::RCCEnvironment;
Expand All @@ -22,14 +22,32 @@ use std::vec;
use tokio_util::sync::CancellationToken;

#[cfg(windows)]
struct StepFilePermissions {
struct StepResetFilePermissions {
target: Utf8PathBuf,
}

#[cfg(windows)]
impl SetupStep for StepResetFilePermissions {
fn setup(&self) -> Result<(), api::Error> {
log::info!("Resetting permissions of {}.", self.target);
reset_access(&self.target).map_err(|err| {
api::Error::new(
format!("Resetting permissions of {} failed", self.target),
err,
)
})
}
}

#[cfg(windows)]
struct StepGrantFilePermissions {
target: Utf8PathBuf,
session: Session,
icacls_permissions: String,
}

#[cfg(windows)]
impl SetupStep for StepFilePermissions {
impl SetupStep for StepGrantFilePermissions {
fn setup(&self) -> Result<(), api::Error> {
if let Session::User(user_session) = &self.session {
log::info!(
Expand Down Expand Up @@ -249,7 +267,47 @@ impl SetupStep for StepDisableSharedHolotree {
}

#[cfg(windows)]
pub fn gather_rcc_binary_permissions(
pub fn gather_reset_rcc_binary_permissions(
config: &GlobalConfig,
plans: Vec<Plan>,
) -> Vec<StepWithPlans> {
let (rcc_plans, system_plans): (Vec<Plan>, Vec<Plan>) =
partition_into_rcc_and_system_plans(plans);
vec![
(
Box::new(StepResetFilePermissions {
target: config.rcc_config.binary_path.clone(),
}),
rcc_plans,
),
skip(system_plans),
]
}

#[cfg(windows)]
pub fn gather_reset_rcc_profile_permissions(
config: &GlobalConfig,
plans: Vec<Plan>,
) -> Vec<StepWithPlans> {
let (rcc_plans, system_plans): (Vec<Plan>, Vec<Plan>) =
partition_into_rcc_and_system_plans(plans);
let mut steps: Vec<StepWithPlans> = vec![skip(system_plans)];
match &config.rcc_config.profile_config {
RCCProfileConfig::Default => steps.push(skip(rcc_plans)),
RCCProfileConfig::Custom(custom_profile) => {
steps.push((
Box::new(StepResetFilePermissions {
target: custom_profile.path.clone(),
}),
rcc_plans,
));
}
}
steps
}

#[cfg(windows)]
pub fn gather_grant_rcc_binary_permissions(
config: &GlobalConfig,
plans: Vec<Plan>,
) -> Vec<StepWithPlans> {
Expand All @@ -258,7 +316,7 @@ pub fn gather_rcc_binary_permissions(
let mut steps: Vec<StepWithPlans> = vec![skip(system_plans)];
for (session, plans_in_session) in plans_by_sessions(rcc_plans) {
steps.push((
Box::new(StepFilePermissions {
Box::new(StepGrantFilePermissions {
target: config.rcc_config.binary_path.clone(),
session,
icacls_permissions: "(RX)".to_string(),
Expand All @@ -270,7 +328,7 @@ pub fn gather_rcc_binary_permissions(
}

#[cfg(windows)]
pub fn gather_rcc_profile_permissions(
pub fn gather_grant_rcc_profile_permissions(
config: &GlobalConfig,
plans: Vec<Plan>,
) -> Vec<StepWithPlans> {
Expand All @@ -282,7 +340,7 @@ pub fn gather_rcc_profile_permissions(
RCCProfileConfig::Custom(custom_profile) => {
for (session, plans_in_session) in plans_by_sessions(rcc_plans) {
steps.push((
Box::new(StepFilePermissions {
Box::new(StepGrantFilePermissions {
target: custom_profile.path.clone(),
session,
icacls_permissions: "(R)".to_string(),
Expand Down
10 changes: 7 additions & 3 deletions src/bin/scheduler/setup/steps/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Gatherer = fn(&GlobalConfig, Vec<Plan>) -> Vec<StepWithPlans>;
#[cfg(unix)]
type Steps = [Gatherer; 10];
#[cfg(windows)]
type Steps = [Gatherer; 16];
type Steps = [Gatherer; 18];

const STEPS: Steps = [
directories::gather_managed_directories,
Expand All @@ -46,9 +46,13 @@ const STEPS: Steps = [
directories::gather_rcc_longpath_directory,
directories::gather_rcc_working_per_user,
#[cfg(windows)]
rcc::gather_rcc_binary_permissions,
rcc::gather_reset_rcc_binary_permissions,
#[cfg(windows)]
rcc::gather_rcc_profile_permissions,
rcc::gather_reset_rcc_profile_permissions,
#[cfg(windows)]
rcc::gather_grant_rcc_binary_permissions,
#[cfg(windows)]
rcc::gather_grant_rcc_profile_permissions,
rcc::gather_disable_rcc_telemetry,
rcc::gather_configure_default_rcc_profile,
rcc::gather_import_custom_rcc_profile,
Expand Down