[http server]: export acl types + remove cors_max_age

http-server/src/access_control/cors.rs

@@ -161,7 +161,7 @@ impl<T: Into<String>> From<T> for AccessControlAllowOrigin {
 
 /// Headers allowed to access
 #[derive(Debug, Clone, PartialEq)]
-pub(crate) enum AccessControlAllowHeaders {
+pub enum AccessControlAllowHeaders {
 	/// Specific headers
 	Only(Vec<String>),
 	/// Any header

http-server/src/access_control/hosts.rs

@@ -141,7 +141,7 @@ impl std::ops::Deref for Host {
 
 /// Specifies if domains should be validated.
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum DomainsValidation<T> {
+pub enum DomainsValidation<T> {
 	/// Allow only domains on the list.
 	AllowOnly(Vec<T>),
 	/// Disable domains validation completely.

http-server/src/access_control/mod.rs

@@ -26,13 +26,13 @@
 
 //! Access control based on HTTP headers
 
-mod cors;
+pub(crate) mod cors;
 pub(crate) mod hosts;
 mod matcher;
 
-pub(crate) use cors::{AccessControlAllowHeaders, AccessControlAllowOrigin};
 use hosts::{AllowHosts, Host};
 
+use cors::{AccessControlAllowHeaders, AccessControlAllowOrigin};
 use hyper::header;
 use jsonrpsee_utils::http_helpers;
 
@@ -41,7 +41,6 @@ use jsonrpsee_utils::http_helpers;
 pub struct AccessControl {
 	allow_hosts: AllowHosts,
 	cors_allow_origin: Option<Vec<AccessControlAllowOrigin>>,
-	cors_max_age: Option<u32>,
 	cors_allow_headers: AccessControlAllowHeaders,
 	continue_on_invalid_cors: bool,
 }
@@ -92,7 +91,6 @@ impl Default for AccessControl {
 		Self {
 			allow_hosts: AllowHosts::Any,
 			cors_allow_origin: None,
-			cors_max_age: None,
 			cors_allow_headers: AccessControlAllowHeaders::Any,
 			continue_on_invalid_cors: false,
 		}
@@ -104,7 +102,6 @@ impl Default for AccessControl {
 pub struct AccessControlBuilder {
 	allow_hosts: AllowHosts,
 	cors_allow_origin: Option<Vec<AccessControlAllowOrigin>>,
-	cors_max_age: Option<u32>,
 	cors_allow_headers: AccessControlAllowHeaders,
 	continue_on_invalid_cors: bool,
 }
@@ -114,7 +111,6 @@ impl Default for AccessControlBuilder {
 		Self {
 			allow_hosts: AllowHosts::Any,
 			cors_allow_origin: None,
-			cors_max_age: None,
 			cors_allow_headers: AccessControlAllowHeaders::Any,
 			continue_on_invalid_cors: false,
 		}
@@ -153,12 +149,6 @@ impl AccessControlBuilder {
 		self
 	}
 
-	/// Configure CORS max age.
-	pub fn cors_max_age(mut self, max_age: u32) -> Self {
-		self.cors_max_age = Some(max_age);
-		self
-	}
-
 	/// Configure which CORS header that is allowed.
 	pub fn cors_allow_header(mut self, header: String) -> Self {
 		let allow_headers = match self.cors_allow_headers {
@@ -183,7 +173,6 @@ impl AccessControlBuilder {
 		AccessControl {
 			allow_hosts: self.allow_hosts,
 			cors_allow_origin: self.cors_allow_origin,
-			cors_max_age: self.cors_max_age,
 			cors_allow_headers: self.cors_allow_headers,
 			continue_on_invalid_cors: self.continue_on_invalid_cors,
 		}

http-server/src/lib.rs

@@ -37,7 +37,8 @@ mod server;
 pub mod response;
 
 pub use access_control::{
-	hosts::{AllowHosts, Host},
+	cors::{AccessControlAllowHeaders, AccessControlAllowOrigin},
+	hosts::{AllowHosts, DomainsValidation, Host},
 	AccessControl, AccessControlBuilder,
 };
 pub use jsonrpsee_types as types;