Skip to content

Commit

Permalink
More verification cleanup, and changing of FS rule structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@matt-sheets
matt-sheets committed Jan 11, 2023
1 parent 8eb5ab7 commit 72cd9b4
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 99 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ atty = "0.2"
backtrace = "0.3"
clap = { version = "4", features = ["derive"] }
codespan-reporting = "0.11"
derivative = "2.2.0"
flate2 = "1"
lalrpop-util = "0.19"
regex = "1"
Expand Down
96 changes: 25 additions & 71 deletions src/compile.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::borrow::Cow;
use std::collections::hash_map::Entry;
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
use std::convert::TryFrom;
use std::ops::Range;

use crate::ast::{
Argument, CascadeString, Declaration, Expression, FuncCall, LetBinding, Machine, Module,
Expand Down Expand Up @@ -348,122 +347,74 @@ pub fn build_func_map<'a>(
}

pub fn validate_fs_context_duplicates(
fsc_rules: BTreeMap<&String, BTreeSet<&FileSystemContextRule>>,
fsc_rules: BTreeMap<String, BTreeSet<&FileSystemContextRule>>,
) -> Result<(), CascadeErrors> {
let mut errors = CascadeErrors::new();

'key_loop: for (_, v) in fsc_rules {
'key_loop: for v in fsc_rules.values() {
// We only have 1 or 0 elements, thus we cannot have a semi duplicate
if v.len() <= 1 {
continue;
}
let mut error: Option<CompileError> = None;
for rule in &v {
for rule in v {
match rule.fscontext_type {
// If we ever see a duplicate of xattr task or trans we know something is wrong
FSContextType::XAttr | FSContextType::Task | FSContextType::Trans => {
let mut range: Range<usize> = 1..1;
for arg in &rule.func_call.args {
if let Argument::Quote(cas_arg) = &arg.0 {
if *cas_arg == rule.fs_name {
range = cas_arg.get_range().unwrap_or_default();
}
}
}
error = Some(add_or_create_compile_error(error,
"Duplicate filesystem context.",
&rule.file,
range,
// TODO once Issue #92 is resolved we would rather do a unwrap_or make internal error
rule.fs_name.get_range().unwrap_or_default(),
&format!("Found multiple different filesystem type declarations for filesystem: {}", rule.fs_name)));
}
FSContextType::GenFSCon => {
// genfscon gets more complicated. We can have similar rules as long as the paths are different.
// If we find a genfscon with the same path, they must have the same context and object type.
if let Some(path) = &rule.path {
// Look through the rules again
for inner_rule in &v {
for inner_rule in v {
// Only check path if it was provided as part of the rule
if let Some(inner_path) = &inner_rule.path {
// If our paths match, check if our contexts match
if path == inner_path && rule.context != inner_rule.context {
// In this case we are safe in knowing args[0] is what we need.
let inner_range: Option<Range<usize>> =
inner_rule.func_call.args[0].0.get_range();
// error is not None so we have already found something, so we just
// need to add a new error message
if let Some(unwrapped_error) = error {
error = Some(unwrapped_error.add_additional_message(&inner_rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
inner_range.unwrap_or_else(||inner_rule.func_call.get_name_range().unwrap()),
inner_rule.context_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing contexts: {}", inner_rule.fs_name, inner_rule.context)));
} else {
let outer_range: Option<Range<usize>> =
rule.func_call.args[0].0.get_range();
// error is none so we need to make a new one
error = Some(CompileError::new(
let tmp_error = CompileError::new(
"Duplicate genfscon contexts",
&rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
outer_range.unwrap_or_else(||rule.func_call.get_name_range().unwrap()),
&format!("Found duplicate genfscon rules for filesystem {} with differing contexts: {}", rule.fs_name, rule.context)));
// We just made the error we are okay to unwrap it
error = Some(error.unwrap().add_additional_message(&inner_rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
inner_range.unwrap_or_else(||inner_rule.func_call.get_name_range().unwrap()),
rule.context_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing contexts: {}", rule.fs_name, rule.context));
error = Some(tmp_error.add_additional_message(&inner_rule.file,
inner_rule.context_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing contexts: {}", inner_rule.fs_name, inner_rule.context)));
}
// Our paths are the same but our file types differ, we must also have a file type.
// Our paths are the same but our file types differ. We must also have a file type.
} else if path == inner_path
&& rule.file_type != inner_rule.file_type
&& rule.file_type.is_some()
{
let mut inner_range: Option<Range<usize>> = None;
// We need to look through the function's args to get the range on the file type arg we are looking for
for arg in &inner_rule.func_call.args {
if let Argument::List(cas_args) = &arg.0 {
for cas_arg in cas_args {
// unwrap is safe here due to else if above
if *cas_arg
== inner_rule.file_type.unwrap().to_string()
{
inner_range = cas_arg.get_range();
}
}
}
}
// error is not None so we have already found something, so we just
// need to add a new error message
if let Some(unwrapped_error) = error {
error = Some(unwrapped_error.add_additional_message(&inner_rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
inner_range.unwrap_or_else(||inner_rule.func_call.get_name_range().unwrap()),
inner_rule.file_type_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing file types", inner_rule.fs_name)));
} else {
// Just like above we need to look through the outer function's args to get the correct range
let mut outer_range: Option<Range<usize>> = None;
for arg in &rule.func_call.args {
if let Argument::List(cas_args) = &arg.0 {
for cas_arg in cas_args {
// unwrap is safe here to else if above
if *cas_arg
== rule.file_type.unwrap().to_string()
{
outer_range = cas_arg.get_range();
}
}
}
}
// error is none so we need to make a new one.
error = Some(CompileError::new(
let tmp_error = CompileError::new(
"Duplicate genfscon file types",
&inner_rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
outer_range.unwrap_or_else(||rule.func_call.get_name_range().unwrap()),
&format!("Found duplicate genfscon rules for filesystem {} with differing file types", rule.fs_name)));
// We just made the error we are safe to unwrap
error = Some(error.unwrap().add_additional_message(&inner_rule.file,
// The unwrap in the unwrap_or is safe since we know we have a function call w/ range at this point
inner_range.unwrap_or_else(||inner_rule.func_call.get_name_range().unwrap()),
&rule.file,
rule.file_type_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing file types", rule.fs_name));
error = Some(tmp_error.add_additional_message(&inner_rule.file,
inner_rule.file_type_range.clone(),
&format!("Found duplicate genfscon rules for filesystem {} with differing file types", inner_rule.fs_name)));
}
}
Expand Down Expand Up @@ -491,11 +442,14 @@ pub fn validate_fs_context_duplicates(
pub fn validate_rules(statements: &BTreeSet<ValidatedStatement>) -> Result<(), CascadeErrors> {
let mut errors = CascadeErrors::new();

let mut fsc_rules: BTreeMap<&String, BTreeSet<&FileSystemContextRule>> = BTreeMap::new();
let mut fsc_rules: BTreeMap<String, BTreeSet<&FileSystemContextRule>> = BTreeMap::new();
for statement in statements {
// Add all file system context rules to a new map to check for semi duplicates later
if let ValidatedStatement::FscRule(fs) = statement {
fsc_rules.entry(&fs.fs_name).or_default().insert(fs);
fsc_rules
.entry(fs.fs_name.to_string())
.or_default()
.insert(fs);
}
}

Expand Down
Loading

0 comments on commit 72cd9b4

Please sign in to comment.