diff --git a/src/auth/authorization.rs b/src/auth/authorization.rs index cc8fa5b1..72e28db4 100644 --- a/src/auth/authorization.rs +++ b/src/auth/authorization.rs @@ -110,6 +110,12 @@ impl Authorization { } } +impl crate::headers::ToHeader for Authorization { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + #[cfg(test)] mod test { use super::*; diff --git a/src/auth/basic_auth.rs b/src/auth/basic_auth.rs index afcd6046..3140ae53 100644 --- a/src/auth/basic_auth.rs +++ b/src/auth/basic_auth.rs @@ -113,6 +113,12 @@ impl BasicAuth { } } +impl crate::headers::ToHeader for BasicAuth { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + #[cfg(test)] mod test { use super::*; diff --git a/src/auth/www_authenticate.rs b/src/auth/www_authenticate.rs index f7f43c8f..594eb2d0 100644 --- a/src/auth/www_authenticate.rs +++ b/src/auth/www_authenticate.rs @@ -132,6 +132,12 @@ impl WwwAuthenticate { } } +impl crate::headers::ToHeader for WwwAuthenticate { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + #[cfg(test)] mod test { use super::*; diff --git a/src/cache/age.rs b/src/cache/age.rs index 4d23c1a3..6dae0c72 100644 --- a/src/cache/age.rs +++ b/src/cache/age.rs @@ -87,6 +87,12 @@ impl Age { } } +impl crate::headers::ToHeader for Age { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for Age { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/cache/cache_control/cache_control.rs b/src/cache/cache_control/cache_control.rs index 47f99326..ce5140ad 100644 --- a/src/cache/cache_control/cache_control.rs +++ b/src/cache/cache_control/cache_control.rs @@ -104,6 +104,12 @@ impl CacheControl { } } +impl crate::headers::ToHeader for CacheControl { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for CacheControl { type Item = CacheDirective; type IntoIter = IntoIter; diff --git a/src/cache/clear_site_data/mod.rs b/src/cache/clear_site_data/mod.rs index c816062d..4d7cb17e 100644 --- a/src/cache/clear_site_data/mod.rs +++ b/src/cache/clear_site_data/mod.rs @@ -142,6 +142,12 @@ impl ClearSiteData { } } +impl crate::headers::ToHeader for ClearSiteData { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for ClearSiteData { type Item = ClearDirective; type IntoIter = IntoIter; diff --git a/src/cache/expires.rs b/src/cache/expires.rs index 73c3e66d..dcb0c4b6 100644 --- a/src/cache/expires.rs +++ b/src/cache/expires.rs @@ -90,6 +90,12 @@ impl Expires { } } +impl crate::headers::ToHeader for Expires { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for Expires { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/conditional/etag.rs b/src/conditional/etag.rs index 00d59194..2b8581e3 100644 --- a/src/conditional/etag.rs +++ b/src/conditional/etag.rs @@ -130,6 +130,12 @@ impl ETag { } } +impl crate::headers::ToHeader for ETag { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl Display for ETag { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { diff --git a/src/conditional/if_match.rs b/src/conditional/if_match.rs index 24f961c5..9bf503ba 100644 --- a/src/conditional/if_match.rs +++ b/src/conditional/if_match.rs @@ -134,6 +134,12 @@ impl IfMatch { } } +impl crate::headers::ToHeader for IfMatch { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for IfMatch { type Item = ETag; type IntoIter = IntoIter; diff --git a/src/conditional/if_modified_since.rs b/src/conditional/if_modified_since.rs index d964c427..a0cea105 100644 --- a/src/conditional/if_modified_since.rs +++ b/src/conditional/if_modified_since.rs @@ -85,6 +85,12 @@ impl IfModifiedSince { } } +impl crate::headers::ToHeader for IfModifiedSince { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for IfModifiedSince { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/conditional/if_none_match.rs b/src/conditional/if_none_match.rs index 608b45bd..61928131 100644 --- a/src/conditional/if_none_match.rs +++ b/src/conditional/if_none_match.rs @@ -140,6 +140,12 @@ impl IfNoneMatch { } } +impl crate::headers::ToHeader for IfNoneMatch { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for IfNoneMatch { type Item = ETag; type IntoIter = IntoIter; diff --git a/src/conditional/if_unmodified_since.rs b/src/conditional/if_unmodified_since.rs index 2696cb0b..3cde624e 100644 --- a/src/conditional/if_unmodified_since.rs +++ b/src/conditional/if_unmodified_since.rs @@ -85,6 +85,12 @@ impl IfUnmodifiedSince { } } +impl crate::headers::ToHeader for IfUnmodifiedSince { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for IfUnmodifiedSince { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/conditional/last_modified.rs b/src/conditional/last_modified.rs index a4fb3153..de196ddc 100644 --- a/src/conditional/last_modified.rs +++ b/src/conditional/last_modified.rs @@ -84,6 +84,12 @@ impl LastModified { } } +impl crate::headers::ToHeader for LastModified { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for LastModified { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/conditional/vary.rs b/src/conditional/vary.rs index 38d4b68b..5b0cbb8b 100644 --- a/src/conditional/vary.rs +++ b/src/conditional/vary.rs @@ -140,6 +140,12 @@ impl Vary { } } +impl crate::headers::ToHeader for Vary { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for Vary { type Item = HeaderName; type IntoIter = IntoIter; diff --git a/src/content/accept_encoding.rs b/src/content/accept_encoding.rs index 8a2814e6..8d07d021 100644 --- a/src/content/accept_encoding.rs +++ b/src/content/accept_encoding.rs @@ -182,6 +182,12 @@ impl AcceptEncoding { } } +impl crate::headers::ToHeader for AcceptEncoding { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for AcceptEncoding { type Item = EncodingProposal; type IntoIter = IntoIter; diff --git a/src/content/content_encoding.rs b/src/content/content_encoding.rs index 0e57c4bb..853a9dd5 100644 --- a/src/content/content_encoding.rs +++ b/src/content/content_encoding.rs @@ -80,6 +80,12 @@ impl ContentEncoding { } } +impl crate::headers::ToHeader for ContentEncoding { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl ToHeaderValues for ContentEncoding { type Iter = option::IntoIter; fn to_header_values(&self) -> crate::Result { diff --git a/src/content/content_length.rs b/src/content/content_length.rs index b4495c9f..70d15c9f 100644 --- a/src/content/content_length.rs +++ b/src/content/content_length.rs @@ -80,6 +80,12 @@ impl ContentLength { } } +impl crate::headers::ToHeader for ContentLength { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + #[cfg(test)] mod test { use super::*; diff --git a/src/content/content_location.rs b/src/content/content_location.rs index a381923e..a4147dcf 100644 --- a/src/content/content_location.rs +++ b/src/content/content_location.rs @@ -99,6 +99,12 @@ impl ContentLocation { } } +impl crate::headers::ToHeader for ContentLocation { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + #[cfg(test)] mod test { use super::*; diff --git a/src/headers/constants.rs b/src/headers/constants.rs index 43002458..752638bd 100644 --- a/src/headers/constants.rs +++ b/src/headers/constants.rs @@ -12,6 +12,12 @@ pub const CONTENT_LOCATION: HeaderName = HeaderName::from_lowercase_str("content pub const CONTENT_MD5: HeaderName = HeaderName::from_lowercase_str("content-md5"); /// The `Content-Range` Header pub const CONTENT_RANGE: HeaderName = HeaderName::from_lowercase_str("content-range"); +/// The `Content-Security-Policy` Header +pub const CONTENT_SECURITY_POLICY: HeaderName = + HeaderName::from_lowercase_str("content-security-policy"); +/// The `Content-Security-Policy-Report-Only` Header +pub const CONTENT_SECURITY_POLICY_REPORT_ONLY: HeaderName = + HeaderName::from_lowercase_str("content-security-policy-report-only"); /// The `Content-Type` Header pub const CONTENT_TYPE: HeaderName = HeaderName::from_lowercase_str("content-type"); diff --git a/src/headers/mod.rs b/src/headers/mod.rs index 10838d60..5ef3ee90 100644 --- a/src/headers/mod.rs +++ b/src/headers/mod.rs @@ -10,6 +10,7 @@ mod into_iter; mod iter; mod iter_mut; mod names; +mod to_header; mod to_header_values; mod values; @@ -22,5 +23,6 @@ pub use into_iter::IntoIter; pub use iter::Iter; pub use iter_mut::IterMut; pub use names::Names; +pub use to_header::ToHeader; pub use to_header_values::ToHeaderValues; pub use values::Values; diff --git a/src/headers/to_header.rs b/src/headers/to_header.rs new file mode 100644 index 00000000..94fda097 --- /dev/null +++ b/src/headers/to_header.rs @@ -0,0 +1,24 @@ +use std::convert::TryInto; + +use crate::headers::{HeaderName, HeaderValue}; + +/// A trait for objects which can be converted or resolved to a `HeaderName` and `HeaderValue` pair. +pub trait ToHeader { + /// Converts this object to a `HeaderName` and `HeaderValue` pair. + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)>; +} + +impl ToHeader for (N, V) +where + N: TryInto, + V: TryInto, + >::Error: Into, + >::Error: Into, +{ + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok(( + self.0.try_into().map_err(Into::into)?, + self.1.try_into().map_err(Into::into)?, + )) + } +} diff --git a/src/other/date.rs b/src/other/date.rs index 6889af95..02986704 100644 --- a/src/other/date.rs +++ b/src/other/date.rs @@ -92,6 +92,12 @@ impl Date { } } +impl crate::headers::ToHeader for Date { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl From for SystemTime { fn from(date: Date) -> Self { date.at diff --git a/src/proxies/forwarded.rs b/src/proxies/forwarded.rs index 79b95442..79d72cbf 100644 --- a/src/proxies/forwarded.rs +++ b/src/proxies/forwarded.rs @@ -318,6 +318,11 @@ impl<'a> Forwarded<'a> { headers.as_mut().insert(FORWARDED, self); } + /// Get the `HeaderName`. + pub fn name(&self) -> HeaderName { + FORWARDED + } + /// Builds a Forwarded header as a String. /// /// # Example @@ -408,6 +413,12 @@ impl<'a> Forwarded<'a> { } } +impl<'a> crate::headers::ToHeader for Forwarded<'a> { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value()?.parse()?)) + } +} + fn parse_value(input: &str) -> (Option>, &str) { match parse_token(input) { (Some(token), rest) => (Some(Cow::Borrowed(token)), rest), diff --git a/src/security/csp.rs b/src/security/csp.rs index ec2a45cf..209491a8 100644 --- a/src/security/csp.rs +++ b/src/security/csp.rs @@ -1,5 +1,10 @@ +use crate::headers::{ + HeaderName, HeaderValue, CONTENT_SECURITY_POLICY, CONTENT_SECURITY_POLICY_REPORT_ONLY, +}; use crate::Headers; + use serde::{Deserialize, Serialize}; + use std::collections::HashMap; use std::fmt; @@ -337,23 +342,44 @@ impl ContentSecurityPolicy { self } + /// Get the `HeaderName`. + pub fn name(&self) -> HeaderName { + if self.report_only_flag { + CONTENT_SECURITY_POLICY_REPORT_ONLY + } else { + CONTENT_SECURITY_POLICY + } + } + /// Create and retrieve the policy value fn value(&mut self) -> String { - for (directive, sources) in &self.directives { - let policy = format!("{} {}", directive, sources.join(" ")); - self.policy.push(policy); - self.policy.sort(); - } + self.policy.extend( + self.directives + .iter() + .map(|(directive, sources)| format!("{} {}", directive, sources.join(" "))), + ); + self.policy.sort(); self.policy.join("; ") } /// Sets the `Content-Security-Policy` (CSP) HTTP header to prevent cross-site injections pub fn apply(&mut self, mut headers: impl AsMut) { - let name = if self.report_only_flag { - "Content-Security-Policy-Report-Only" - } else { - "Content-Security-Policy" - }; - headers.as_mut().insert(name, self.value()); + headers.as_mut().insert(self.name(), self.value()); + } +} + +impl crate::headers::ToHeader for ContentSecurityPolicy { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + let mut policies = self.policy.clone(); + policies.extend( + self.directives + .iter() + .map(|(directive, sources)| format!("{} {}", directive, sources.join(" "))), + ); + policies.sort(); + + let value = policies.join("; "); + + Ok((self.name(), value.parse()?)) } } diff --git a/src/security/timing_allow_origin.rs b/src/security/timing_allow_origin.rs index 2c92d277..c16a4646 100644 --- a/src/security/timing_allow_origin.rs +++ b/src/security/timing_allow_origin.rs @@ -162,6 +162,12 @@ impl TimingAllowOrigin { } } +impl crate::headers::ToHeader for TimingAllowOrigin { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for TimingAllowOrigin { type Item = Url; type IntoIter = IntoIter; diff --git a/src/server/allow.rs b/src/server/allow.rs index bad9f729..324c83d6 100644 --- a/src/server/allow.rs +++ b/src/server/allow.rs @@ -108,6 +108,12 @@ impl Allow { } } +impl crate::headers::ToHeader for Allow { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for Allow { type Item = Method; type IntoIter = IntoIter; diff --git a/src/trace/server_timing/mod.rs b/src/trace/server_timing/mod.rs index f46490fe..7feaf24c 100644 --- a/src/trace/server_timing/mod.rs +++ b/src/trace/server_timing/mod.rs @@ -131,6 +131,12 @@ impl ServerTiming { } } +impl crate::headers::ToHeader for ServerTiming { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl IntoIterator for ServerTiming { type Item = Metric; type IntoIter = IntoIter; diff --git a/src/trace/trace_context.rs b/src/trace/trace_context.rs index 74a4ebd7..83b0e96b 100644 --- a/src/trace/trace_context.rs +++ b/src/trace/trace_context.rs @@ -246,6 +246,12 @@ impl TraceContext { } } +impl crate::headers::ToHeader for TraceContext { + fn to_header(self) -> crate::Result<(HeaderName, HeaderValue)> { + Ok((self.name(), self.value())) + } +} + impl fmt::Display for TraceContext { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(