fix PredicateEvaluator Sync + Send

Author: GyulyVGC

Cargo.lock

@@ -170,7 +170,7 @@ impl AppGuardImpl {
     }
 
     async fn firewall_match_item<
-        I: PredicateEvaluator<Predicate = FirewallRule, Reason = String, Context = AppContext>,
+        I: PredicateEvaluator<Predicate = FirewallRule, Reason = String, Context = AppContext> + Sync,
     >(
         &self,
         token: &str,

src/app_guard_impl.rs

@@ -44,7 +44,7 @@ impl Firewall {
     }
 
     pub async fn match_item<
-        I: PredicateEvaluator<Predicate = FirewallRule, Reason = String, Context = AppContext>,
+        I: PredicateEvaluator<Predicate = FirewallRule, Reason = String, Context = AppContext> + Sync,
     >(
         &self,
         item: &I,

src/firewall/firewall.rs

@@ -8,7 +8,6 @@ use crate::helpers::get_header;
 use crate::proto::appguard::{AppGuardHttpRequest, AppGuardTcpInfo};
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[allow(clippy::enum_variant_names)]
@@ -71,7 +70,7 @@ impl HttpRequestField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl PredicateEvaluator for AppGuardHttpRequest {
     type Predicate = FirewallRule;
     type Reason = String;

src/firewall/items/http_request.rs

@@ -8,7 +8,6 @@ use crate::helpers::get_header;
 use crate::proto::appguard::{AppGuardHttpResponse, AppGuardTcpInfo};
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[allow(clippy::enum_variant_names)]
@@ -53,7 +52,7 @@ impl HttpResponseField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl PredicateEvaluator for AppGuardHttpResponse {
     type Predicate = FirewallRule;
     type Reason = String;

src/firewall/items/http_response.rs

@@ -3,7 +3,6 @@ use crate::firewall::rules::{FirewallCompareType, FirewallRuleField, FirewallRul
 use crate::proto::appguard::AppGuardIpInfo;
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(rename_all = "snake_case")]
@@ -73,7 +72,7 @@ impl IpInfoField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl<'a> PredicateEvaluator for &'a AppGuardIpInfo {
     type Predicate = FirewallRuleWithDirection<'a>;
     type Reason = String;

src/firewall/items/ip_info.rs

@@ -8,7 +8,6 @@ use crate::helpers::get_header;
 use crate::proto::appguard::{AppGuardSmtpRequest, AppGuardTcpInfo};
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[allow(clippy::enum_variant_names)]
@@ -52,7 +51,7 @@ impl SmtpRequestField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl PredicateEvaluator for AppGuardSmtpRequest {
     type Predicate = FirewallRule;
     type Reason = String;

src/firewall/items/smtp_request.rs

@@ -6,7 +6,6 @@ use crate::firewall::rules::{
 use crate::proto::appguard::{AppGuardSmtpResponse, AppGuardTcpInfo};
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(rename_all = "snake_case")]
@@ -34,7 +33,7 @@ impl SmtpResponseField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl PredicateEvaluator for AppGuardSmtpResponse {
     type Predicate = FirewallRule;
     type Reason = String;

src/firewall/items/smtp_response.rs

@@ -5,7 +5,6 @@ use crate::firewall::rules::{
 use crate::proto::appguard::AppGuardTcpConnection;
 use rpn_predicate_interpreter::PredicateEvaluator;
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
 #[serde(rename_all = "snake_case")]
@@ -74,7 +73,7 @@ impl TcpConnectionField {
     }
 }
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl<'a> PredicateEvaluator for &'a AppGuardTcpConnection {
     type Predicate = FirewallRuleWithDirection<'a>;
     type Reason = String;
@@ -112,7 +111,7 @@ impl IpAlias {
         match self {
             IpAlias::Name(name) => {
                 let token = context.root_token_provider.get().await.ok()?.jwt.clone();
-                context.datastore.clone().get_ip_alias(token, name).await.ok().as_ref()
+                context.datastore.clone().get_ip_alias(token, name).await.ok()
             }
             IpAlias::Addresses(addresses) => Some(addresses),
         }

src/firewall/items/tcp_connection.rs

@@ -2,9 +2,8 @@ use crate::app_context::AppContext;
 use crate::firewall::rules::{FirewallRuleField, FirewallRuleWithDirection};
 use crate::proto::appguard::{AppGuardIpInfo, AppGuardTcpConnection, AppGuardTcpInfo};
 use rpn_predicate_interpreter::PredicateEvaluator;
-use async_trait::async_trait;
 
-#[async_trait(?Send)]
+#[tonic::async_trait]
 impl<'a> PredicateEvaluator for &'a AppGuardTcpInfo {
     type Predicate = FirewallRuleWithDirection<'a>;
     type Reason = String;