Don’t change the simple key encoding so that redis keys don’t change.

Kuadrant · Jun 5, 2024 · c063001 · c063001
1 parent 5007c15
commit c063001
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/limitador/src/limit.rs b/limitador/src/limit.rs
@@ -6,7 +6,7 @@ use std::fmt::{Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};
 
 use cel_interpreter::{Context, Expression, Value};
-use cel_parser::{Atom, parse};
+use cel_parser::{Atom, parse, RelationOp};
 use cel_parser::RelationOp::{Equals, NotEquals};
 use serde::{Deserialize, Serialize, Serializer};
 #[cfg(feature = "lenient_conditions")]
@@ -120,7 +120,7 @@ impl TryFrom<&str> for Condition {
 impl Condition {
 
     fn try_from_cel(source: String) -> Result<Self, ConditionParsingError> {
-        match parse(&source) {
+        match parse(&source.strip_prefix("cel:").unwrap().to_string()) {
             Ok(expression) => Ok(Condition { source, expression }),
             Err(_err) => Err(ConditionParsingError {
                 error: SyntaxError {
@@ -133,6 +133,23 @@ impl Condition {
         }
     }
 
+    fn simple_source(var_name: String, op: RelationOp, lit: String) -> String {
+        let predicate = match op {
+            Equals => "==",
+            NotEquals => "!=",
+            _ => unreachable!(),
+        };
+        let quotes = if lit.contains('"') {
+            '\''
+        } else {
+            '"'
+        };
+        format!(
+            "{} {} {}{}{}",
+            var_name, predicate, quotes, lit, quotes
+        )
+    }
+
     fn try_from_simple(source: String) -> Result<Self, ConditionParsingError> {
         match conditions::Scanner::scan(source.clone()) {
             Ok(tokens) => match tokens.len().cmp(&(3_usize)) {
@@ -158,7 +175,7 @@ impl Condition {
                                     _ => unreachable!(),
                                 };
                                 Ok(Condition {
-                                    source,
+                                    source: Condition::simple_source(var_name.clone(), predicate.clone(), operand.clone()),
                                     expression: Expression::Relation(
                                         Box::new(Expression::Ident(var_name.clone().into())),
                                         predicate,
@@ -187,7 +204,7 @@ impl Condition {
                                     _ => unreachable!(),
                                 };
                                 Ok(Condition {
-                                    source,
+                                    source: Condition::simple_source(var_name.clone(), predicate.clone(), operand.clone()),
                                     expression: Expression::Relation(
                                         Box::new(Expression::Atom(Atom::String(operand.clone().into()))),
                                         predicate,
@@ -209,7 +226,7 @@ impl Condition {
                             {
                                 deprecated::deprecated_syntax_used();
                                 Ok(Condition {
-                                    source,
+                                    source: Condition::simple_source(var_name.clone(), Equals, operand.clone()),
                                     expression: Expression::Relation(
                                         Box::new(Expression::Ident(var_name.clone().into())),
                                         Equals,
@@ -231,11 +248,11 @@ impl Condition {
                             {
                                 deprecated::deprecated_syntax_used();
                                 Ok(Condition {
-                                    source,
+                                    source: Condition::simple_source(var_name.clone(), Equals, operand.to_string()),
                                     expression: Expression::Relation(
                                         Box::new(Expression::Ident(var_name.clone().into())),
                                         Equals,
-                                        Box::new(Expression::Atom(Atom::String(operand.clone().into()))),
+                                        Box::new(Expression::Atom(Atom::String(operand.to_string().into()))),
                                     ),
                                 })
                             } else {
@@ -295,7 +312,7 @@ impl TryFrom<String> for Condition {
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
         if value.clone().starts_with("cel:") {
-            return Condition::try_from_cel(value.strip_prefix("cel:").unwrap().to_string());
+            return Condition::try_from_cel(value);
         }
         return Condition::try_from_simple(value);
     }

diff --git a/limitador/src/storage/keys.rs b/limitador/src/storage/keys.rs
@@ -99,7 +99,7 @@ mod tests {
             vec!["app_id"],
         );
         assert_eq!(
-            "namespace:{example.com},counters_of_limit:{\"namespace\":\"example.com\",\"seconds\":60,\"conditions\":[\"req.method == 'GET'\"],\"variables\":[\"app_id\"]}",
+            "namespace:{example.com},counters_of_limit:{\"namespace\":\"example.com\",\"seconds\":60,\"conditions\":[\"req.method == \\\"GET\\\"\"],\"variables\":[\"app_id\"]}",
             key_for_counters_of_limit(&limit))
     }