Skip to content

Commit

Permalink
added PartialEq to Cors
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Dec 15, 2024
1 parent 18f94fa commit 203353c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
20 changes: 20 additions & 0 deletions actix-cors/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,19 @@ where
.unwrap()
}

impl PartialEq for Cors {
fn eq(&self, other: &Self) -> bool {
self.inner == other.inner
// Because of the cors-function, checking if the content is equal implies that the errors are equal
//
// Proof by contradiction:
// Lets assume that the inner values are equal, but the error values are not.
// This means there had been an error, which has been fixed.
// This cannot happen as the first call to set the invalid value means that further usages of the cors-function will reject other input.
// => inner has to be in a different state
}
}

#[cfg(test)]
mod test {
use std::convert::Infallible;
Expand Down Expand Up @@ -679,4 +692,11 @@ mod test {

Check warning on line 692 in actix-cors/src/builder.rs

View workflow job for this annotation

GitHub Actions / fmt

Diff in /home/runner/work/actix-extras/actix-extras/actix-cors/src/builder.rs
Cors::default().new_transform(srv).await.unwrap();
}

#[test]
fn impl_eq() {
assert_eq!(Cors::default().send_wildcard(), Cors::default());
assert_ne!(Cors::default().send_wildcard(), Cors::default());
assert_ne!(Cors::default(), Cors::permissive());
}
}
8 changes: 7 additions & 1 deletion actix-cors/src/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ impl Default for OriginFn {
}
}

impl PartialEq for OriginFn {
fn eq(&self, other: &Self) -> bool {
Rc::ptr_eq(&self.boxed_fn, &other.boxed_fn)
}
}

impl fmt::Debug for OriginFn {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str("origin_fn")
Expand All @@ -40,7 +46,7 @@ pub(crate) fn header_value_try_into_method(hdr: &HeaderValue) -> Option<Method>
.and_then(|meth| Method::try_from(meth).ok())
}

#[derive(Debug, Clone)]
#[derive(Debug, Clone, PartialEq)]
pub(crate) struct Inner {
pub(crate) allowed_origins: AllOrSome<HashSet<HeaderValue>>,
pub(crate) allowed_origins_fns: SmallVec<[OriginFn; 4]>,
Expand Down

0 comments on commit 203353c

Please sign in to comment.