refactor: extract a separate module for cedar

6 files changed, 26 insertions, 7 deletions

diff --git a/src/authorization/authorizer.rs b/src/authorization/authorizer.rs
index 62733585..d5363c84 100644
--- a/src/authorization/authorizer.rs
+++ b/src/authorization/authorizer.rs
@@ -3,3 +3,18 @@ use envoy_types::ext_authz::v3::pb::CheckRequest;
 pub trait Authorizer: std::fmt::Debug + std::marker::Sync + std::marker::Send + 'static {
     fn authorize(&self, request: CheckRequest) -> bool;
 }
+
+#[derive(Debug)]
+pub struct DefaultAuthorizer {}
+
+impl Default for DefaultAuthorizer {
+    fn default() -> Self {
+        Self {}
+    }
+}
+
+impl Authorizer for DefaultAuthorizer {
+    fn authorize(&self, _request: CheckRequest) -> bool {
+        true
+    }
+}
diff --git a/src/authorization/cedar_authorizer.rs b/src/authorization/cedar/authorizer.rs
index 0d30ee77..c207467f 100644
--- a/src/authorization/cedar_authorizer.rs
+++ b/src/authorization/cedar/authorizer.rs
@@ -1,4 +1,4 @@
-use super::authorizer::Authorizer;
+use crate::authorization::authorizer::Authorizer;
 use std::fs;
 use std::str::FromStr;
 
diff --git a/src/authorization/entities.rs b/src/authorization/cedar/entities.rs
index 050f6f26..050f6f26 100644
--- a/src/authorization/entities.rs
+++ b/src/authorization/cedar/entities.rs
diff --git a/src/authorization/cedar/mod.rs b/src/authorization/cedar/mod.rs
new file mode 100644
index 00000000..cf59ee55
--- /dev/null
+++ b/src/authorization/cedar/mod.rs
@@ -0,0 +1,6 @@
+pub mod authorizer;
+pub mod entities;
+
+pub use authorizer::CedarAuthorizer;
+pub use entities::CedarEntity;
+pub use entities::EntitiesRepository;
diff --git a/src/authorization/mod.rs b/src/authorization/mod.rs
index d687d53f..69d59d29 100644
--- a/src/authorization/mod.rs
+++ b/src/authorization/mod.rs
@@ -1,11 +1,10 @@
 pub mod authorizer;
-pub mod cedar_authorizer;
+pub mod cedar;
 pub mod check_service;
-pub mod entities;
 pub mod server;
 
 pub use authorizer::Authorizer;
-pub use cedar_authorizer::CedarAuthorizer;
+pub use cedar::CedarAuthorizer;
+pub use cedar::{CedarEntity, EntitiesRepository};
 pub use check_service::CheckService;
-pub use entities::{CedarEntity, EntitiesRepository};
 pub use server::Server;
diff --git a/src/authorization/server.rs b/src/authorization/server.rs
index 31bf2af8..05e78c1a 100644
--- a/src/authorization/server.rs
+++ b/src/authorization/server.rs
@@ -1,4 +1,3 @@
-use super::cedar_authorizer::CedarAuthorizer;
 use super::check_service::CheckService;
 use envoy_types::ext_authz::v3::pb::AuthorizationServer;
 use std::sync::Arc;
@@ -37,6 +36,6 @@ impl Server {
 
 impl Default for Server {
     fn default() -> Self {
-        Self::new(CedarAuthorizer::default()).unwrap()
+        Self::new(super::authorizer::DefaultAuthorizer::default()).unwrap()
     }
 }