cel 0.3.0 → 0.4.0

data/lib/cel/parser.rb

@@ -89,7 +89,14 @@ var void while
 
 IDENTIFIER_REGEX = /[_a-zA-Z][_a-zA-Z0-9]*/
 
-def initialize(package = nil)
+def initialize(
+  package = nil,
+  max_recursion_depth: 32,
+  max_nesting_depth: 12,
+  expression_size_limit: 2048
+)
+  @max_recursion_depth = max_recursion_depth
+  @max_nesting_depth = max_nesting_depth
   @package = package
 end
 
@@ -243,12 +250,49 @@ def literal_null
   Cel::Null::INSTANCE
 end
 
-def new_map(val)
-  Cel::Map.new(val)
+def new_map(elements)
+  depth = 1
+
+  if elements.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of map elements exceeded"
+  end
+
+  depth = elements.filter_map do |_, elem|
+    next unless elem.is_a?(Cel::Map)
+
+    d = depth + elem.depth
+
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of map literals exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Map.new(elements, depth: depth)
 end
 
 def new_list(val)
-  Cel::List.new(Array(val))
+  elements = Array(val)
+  depth = 1
+
+  if elements.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of elements for list literals exceeded"
+  end
+
+  depth = elements.filter_map do |elem|
+    next unless elem.is_a?(Cel::List)
+
+    d = depth + elem.depth
+
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of list literals exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::List.new(elements, depth: depth)
 end
 
 def new_identifier(id)
@@ -256,19 +300,159 @@ def new_identifier(id)
 end
 
 def new_message(type, struct)
-  Cel::Message.new(type, struct, package: @package)
+  depth = 1
+  if struct
+    if struct.size > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of message elements exceeded"
+    end
+
+    depth = struct.filter_map do |_, elem|
+      next unless elem.is_a?(Cel::Message)
+
+      d = depth + elem.depth
+
+      if d > @max_nesting_depth
+        raise MaxNestingDepthExceededError, "max nesting of map literals exceeded"
+      end
+
+      d
+    end.max || depth
+  end
+
+  Cel::Message.new(type, struct, package: @package, depth: depth)
 end
 
 def global_call(function, args = nil)
-  Cel::Invoke.new(func: function, var: nil, args: args, package: @package)
+  depth = 1
+
+  if args && args.size > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of function call arguments exceeded"
+  end
+
+  depth = args.filter_map do |arg|
+    next unless arg.is_a?(Cel::Invoke)
+
+    d = depth + arg.depth
+
+    if d > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of function calls exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Invoke.new(func: function, var: nil, args: args, package: @package, depth: depth)
 end
 
-def receiver_call(function, target, args = nil)
-  Cel::Invoke.new(func: function, var: target, args: args, package: @package)
+def indexing_call(target, args)
+  depth = 1
+
+  if target.is_a?(Cel::Invoke)
+    depth += target.depth if target.indexing?
+
+    if depth > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of indexing operators exceeded"
+    end
+  end
+
+  receiver_call(:[], target, args, package: @package, depth: depth)
 end
 
-def operation(op, operands)
-  Cel::Operation.new(op, operands)
+def selector_call(function, target)
+  depth = 1
+
+  # if selector operator
+  if target.is_a?(Cel::Invoke) && !target.var.nil?
+    depth += target.depth
+
+    if depth > @max_nesting_depth
+      raise MaxNestingDepthExceededError, "max nesting of selection operators exceeded"
+    end
+  end
+
+  receiver_call(function, target, package: @package, depth: depth)
+end
+
+def receiver_call(function, target, args = nil, **kwargs)
+  Cel::Invoke.new(func: function, var: target, args: args, package: @package, **kwargs)
+end
+
+def logical_operation(op, operands)
+  lhs, rhs = operands
+
+  if lhs.is_a?(Cel::Operation) && lhs.op == op
+    # concat them
+    operands = [*lhs.operands, rhs]
+  end
+
+  if operands.size - 1 > @max_recursion_depth
+    raise Cel::MaxRecursionDepthExceededError, "max recursion depth exceeded for #{op} operation"
+  end
+
+  operation(op, operands)
+end
+
+def math_operation(op, operands)
+  # 32 binary arithmetic operators of the same precedence in a row
+  lhs, _ = operands
+  depth = 1
+
+  if lhs.is_a?(Cel::Operation)
+    case op
+    when "*", "/", "%"
+      case lhs.op
+      when  "*", "/", "%"
+        depth = lhs.depth + 1
+      end
+    when "+"
+      case lhs.op
+      when  "+"
+        depth = lhs.depth + 1
+      end
+    end
+  end
+
+  if depth > @max_recursion_depth
+    raise MaxRecursionDepthExceededError, "max number of arithmetic operators with the same precedence exceeded"
+  end
+
+  operation(op, operands, depth: depth)
+end
+
+def unary_operation(op, operand)
+  depth = 1
+
+  if operand.is_a?(Cel::Operation) && operand.op == op && operand.unary?
+    depth = depth + operand.depth
+
+    if depth > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of an unary operator exceeded"
+    end
+  end
+
+  operation(op, [operand], depth: depth)
+end
+
+def operation(op, operands, **kwargs)
+  Cel::Operation.new(op, operands, **kwargs)
+end
+
+def ternary_condition(if_op, *ops)
+  depth = 1
+
+  depth = ops.filter_map do |op|
+    next unless op.is_a?(Cel::Condition)
+
+    d = depth + op.depth
+
+    if d > @max_recursion_depth
+      raise MaxRecursionDepthExceededError, "max number of consecutive ternary operators exceeded"
+    end
+
+    d
+  end.max || depth
+
+  Cel::Condition.new(if_op, *ops, depth: depth)
 end
 
 # Checks whether the given identifier token is a reserved word or not. Throws
@@ -276,7 +460,7 @@ end
 def validated_id!(identifier)
   return identifier unless RESERVED.include?(identifier)
 
-  raise Cel::ParseError.new("invalid usage of the reserved word \"#{identifier}\"")
+  raise Cel::ParseError, "invalid usage of the reserved word \"#{identifier}\""
 end
 
 ...end parser.ry/module_eval...
@@ -646,7 +830,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.ry', 17)
   def _reduce_4(val, _values, result)
-     result = Cel::Condition.new(val[0], val[2], val[4])
+     result = ternary_condition(val[0], val[2], val[4])
     result
   end
 .,.,
@@ -655,7 +839,7 @@ module_eval(<<'.,.,', 'parser.ry', 17)
 
 module_eval(<<'.,.,', 'parser.ry', 20)
   def _reduce_6(val, _values, result)
-     result = operation(val[1], [val[0], val[2]])
+     result = logical_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -664,7 +848,7 @@ module_eval(<<'.,.,', 'parser.ry', 20)
 
 module_eval(<<'.,.,', 'parser.ry', 23)
   def _reduce_8(val, _values, result)
-     result = operation(val[1], [val[0], val[2]])
+     result = logical_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -682,14 +866,14 @@ module_eval(<<'.,.,', 'parser.ry', 26)
 
 module_eval(<<'.,.,', 'parser.ry', 29)
   def _reduce_12(val, _values, result)
-     result = operation(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 30)
   def _reduce_13(val, _values, result)
-     result = operation(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -698,7 +882,7 @@ module_eval(<<'.,.,', 'parser.ry', 30)
 
 module_eval(<<'.,.,', 'parser.ry', 33)
   def _reduce_15(val, _values, result)
-     result = operation(val[1], [val[0], val[2]])
+     result = math_operation(val[1], [val[0], val[2]])
     result
   end
 .,.,
@@ -709,21 +893,21 @@ module_eval(<<'.,.,', 'parser.ry', 33)
 
 module_eval(<<'.,.,', 'parser.ry', 38)
   def _reduce_18(val, _values, result)
-     result = operation("!", [val[1]])
+     result = unary_operation("!", val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 39)
   def _reduce_19(val, _values, result)
-     result = operation("-", [val[1]])
+     result = unary_operation("-", val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.ry', 41)
   def _reduce_20(val, _values, result)
-     result = operation("!", [val[1]])
+     result = unary_operation("!", val[1])
     result
   end
 .,.,
@@ -732,7 +916,7 @@ module_eval(<<'.,.,', 'parser.ry', 41)
 
 module_eval(<<'.,.,', 'parser.ry', 44)
   def _reduce_22(val, _values, result)
-     result = operation("-", [val[1]])
+     result = unary_operation("-", val[1])
     result
   end
 .,.,
@@ -743,7 +927,7 @@ module_eval(<<'.,.,', 'parser.ry', 44)
 
 module_eval(<<'.,.,', 'parser.ry', 48)
   def _reduce_25(val, _values, result)
-     result = receiver_call("[]", val[0], val[2])
+     result = indexing_call(val[0], val[2])
     result
   end
 .,.,
@@ -757,7 +941,7 @@ module_eval(<<'.,.,', 'parser.ry', 49)
 
 module_eval(<<'.,.,', 'parser.ry', 50)
   def _reduce_27(val, _values, result)
-     result = receiver_call(val[2], val[0])
+     result = selector_call(val[2], val[0])
     result
   end
 .,.,

data/lib/cel/program.rb

@@ -2,7 +2,7 @@
 
 module Cel
   class Program
-    attr_reader :context
+    attr_reader :environment, :context
 
     def initialize(context, environment)
       @context = context
@@ -35,6 +35,16 @@ module Cel
 
     alias_method :call, :evaluate
 
+    def disable_cel_conversion
+      convert_to_cel = @convert_to_cel
+      begin
+        @convert_to_cel = false
+        yield(convert_to_cel)
+      ensure
+        @convert_to_cel = convert_to_cel
+      end
+    end
+
     private
 
     def try_evaluate_lookup(key)
@@ -45,7 +55,11 @@ module Cel
     end
 
     def evaluate_identifier(identifier)
-      if Cel::PRIMITIVE_TYPES.include?(identifier.to_sym)
+      id_sym = identifier.to_sym
+
+      if Cel::EXTENSIONS.key?(id_sym)
+        Cel::EXTENSIONS[id_sym]
+      elsif Cel::PRIMITIVE_TYPES.include?(id_sym)
         TYPES[identifier.to_sym]
       else
         val, func = @context.lookup(identifier)
@@ -68,21 +82,18 @@ module Cel
     end
 
     def evaluate_message(val)
-      convert_to_cel = @convert_to_cel
-
-      @convert_to_cel = false
-      values = val.struct.transform_values do |value|
-        v = call(value)
-        v = v.to_ruby_type if v.respond_to?(:to_ruby_type)
-        v
-      end
-      value = Protobuf.convert_to_proto(val.message_type, values)
+      disable_cel_conversion do |should_have_converted|
+        values = val.struct.transform_values do |value|
+          v = call(value)
+          v = v.to_ruby_type if v.respond_to?(:to_ruby_type)
+          v
+        end
+        value = Protobuf.convert_to_proto(val.message_type, values)
 
-      return value unless convert_to_cel
+        return value unless should_have_converted
 
-      Literal.to_cel_type(value)
-    ensure
-      @convert_to_cel = convert_to_cel
+        Literal.to_cel_type(value)
+      end
     end
 
     def evaluate_operation(operation)
@@ -276,8 +287,10 @@ module Cel
         value = Protobuf.lookup(var, func)
 
         Literal.to_cel_type(value)
-      else
-        if var.is_a?(Module) && var.const_defined?(func)
+      when Module
+        if var.respond_to?(func) && !Module.respond_to?(func)
+          return var.__send__(func, *args, program: self)
+        elsif var.const_defined?(func) && !Module.const_defined?(func)
           # this block assumes a message based call on a protobuf message, either to a
           # subclass/namespace (Foo.Bar), or an enum (Foo.BAR)
           # protobuf accessing enum module
@@ -306,6 +319,8 @@ module Cel
           return Literal.to_cel_type(value)
         end
 
+        raise EvaluateError, "#{invoke} is not supported"
+      else
         raise EvaluateError, "#{invoke} is not supported"
       end
     end

data/lib/cel/version.rb

@@ -2,6 +2,6 @@
 
 module Cel
   module Ruby
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/cel.rb

@@ -5,6 +5,7 @@ require "cel/version"
 require "cel/errors"
 require "cel/ast/types"
 require "cel/ast/elements"
+require "cel/extensions"
 require "cel/parser"
 require "cel/macro"
 require "cel/context"
@@ -115,7 +116,7 @@ rescue LoadError => e
       BASE_CLASS = Class.new(Object)
 
       def base_class
-        BASE_CLASS
+        Struct
       end
 
       def enum_class

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tiago Cardoso
 bindir: bin
 cert_chain: []
-date: 2025-06-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -51,14 +51,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.
 email:
 - cardoso_tiago@hotmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - CHANGELOG.md
+- LICENSE.txt
 - README.md
 files:
 - CHANGELOG.md
@@ -73,6 +87,11 @@ files:
 - lib/cel/encoder.rb
 - lib/cel/environment.rb
 - lib/cel/errors.rb
+- lib/cel/extensions.rb
+- lib/cel/extensions/bind.rb
+- lib/cel/extensions/encoders.rb
+- lib/cel/extensions/math.rb
+- lib/cel/extensions/string.rb
 - lib/cel/macro.rb
 - lib/cel/parser.rb
 - lib/cel/program.rb
@@ -99,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.
 test_files: []