durable_rules 2.0.23 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5220161e2cc19405339ce104109a5ab075b092d5
-  data.tar.gz: 5e377d29c7c5d3985ddd8649b5abbf264f7d6612
+  metadata.gz: fd4b836b5afc54646b8214078c55d46acb9086fa
+  data.tar.gz: f1f76182fd9edad82893c4aeca5bc197cde019d7
 SHA512:
-  metadata.gz: 0f86aca1a3edb8a690940bbbccd9802399174bc23c15bae438b95bde71bb9322374ee58caca508f1dc47dbfc25d5ea128d4479541b34645d16c4b20d577f9119
-  data.tar.gz: 9304dd821caa413367edffa5e410bbf19f7a504ab06182796d7cdd2d8e1ad27454382968b64483a32757e968b50f20dbd616dd5028a6e7b4c2cd54f6e3f5d13c
+  metadata.gz: 6db4753a711a5f409fcab98c1b8f28be7e38e457814c70c6328d7797aa27ddf7f8a4b8386adfb54a764b5cda17b35189f18d5363bb430bec6062903b9ccc2669
+  data.tar.gz: 43ca66890ebe866a3a7e3071191633951f22b83cfe9912e22aac6373e56538af22f30c0daeecc4340c5f8668d08e36b2e2fafdd9bfabad8e5efc07fdf8dc4148

data/librb/engine.rb

@@ -1083,7 +1083,7 @@ module Engine
 
       timer = Timers::Group.new
 
-      thread_lambda = -> c {
+      thread_lambda = -> c, _t {
         if @ruleset_list.empty?
           timer.after 0.5, &thread_lambda
         else
@@ -1116,7 +1116,7 @@ module Engine
 
       timer = Timers::Group.new
 
-      thread_lambda = -> c {
+      thread_lambda = -> c, _t {
         if @ruleset_list.empty?
           timer.after 0.5, &thread_lambda
         else

data/src/rules/events.c

@@ -1587,7 +1587,7 @@ static unsigned int isArrayMatch(ruleset *tree,
                                  jsonProperty *currentProperty,
                                  alpha *arrayAlpha,
                                  unsigned char *propertyMatch) {
-    
+    *propertyMatch = 0;
     unsigned int result = RULES_OK;
     if (currentProperty->type != JSON_ARRAY) {
         return RULES_OK;

data/src/rules/json.c

@@ -132,6 +132,12 @@ unsigned int readNextArrayValue(char *start, char **first, char **last, unsigned
                 }
                 break;
             case ST_OBJECT_PROP_VAL:
+                if (start[0] == ']') {
+                    *first = start;
+                    *last = start;
+                    return PARSE_END;    
+                }
+                
                 return getValue(start, first, last, type);
                 break;
         }

data/src/rules/regex.c

@@ -1260,7 +1260,7 @@ static unsigned int packGraph(state *start,
         for (int i = 0; i < currentState->transitionsLength; ++ i) {
             transition *currentTransition = &currentState->transitions[i];
             unsigned int currentTransitionSymbol = currentTransition->symbol;
-            if (caseInsensitive) {
+            if (caseInsensitive && currentTransitionSymbol != REGEX_DOT) {
                 currentTransitionSymbol = tolower(currentTransitionSymbol);
             }
 

data/src/rules/rete.c

@@ -59,6 +59,7 @@
 } while(0)
 
 
+handleEntry handleEntries[MAX_HANDLES];
 unsigned int firstEmptyEntry = 1;
 unsigned int lastEmptyEntry = MAX_HANDLES -1;
 char entriesInitialized = 0;

data/src/rules/rules.h

@@ -33,6 +33,8 @@
 #define ERR_NO_ACTION_AVAILABLE 310
 #define ERR_PROPERTY_NOT_FOUND 311
 #define ERR_OPERATION_NOT_SUPPORTED 312
+#define ERR_EVENT_MAX_OBJECT_SIZE 313
+#define ERR_EVENT_MAX_OBJECT_PROPERTY_SIZE 314
 #define ERR_PARSE_REGEX 501
 #define ERR_REGEX_MAX_TRANSITIONS 502
 #define ERR_REGEX_MAX_STATES 503
@@ -64,7 +66,7 @@ typedef struct handleEntry {
     unsigned int nextEmptyEntry;
 } handleEntry;
 
-handleEntry handleEntries[MAX_HANDLES];
+extern handleEntry handleEntries[MAX_HANDLES];
 extern unsigned int firstEmptyEntry;
 extern unsigned int lastEmptyEntry;
 extern char entriesInitialized;

data/src/rules/state.c

@@ -1378,8 +1378,17 @@ unsigned int getObjectProperty(jsonObject *jo,
 unsigned int setObjectProperty(jsonObject *jo, 
                                unsigned int hash, 
                                unsigned char type, 
-                               unsigned short valueOffset, 
-                               unsigned short valueLength) {
+                               unsigned int valueOffset, 
+                               unsigned int valueLength) {
+
+    if (valueLength >= MAX_OBJECT_PROPERTY_SIZE) {
+        return ERR_EVENT_MAX_OBJECT_PROPERTY_SIZE;
+    }
+
+    if (valueOffset >= (MAX_OBJECT_SIZE - MAX_OBJECT_PROPERTY_SIZE)) {
+        return ERR_EVENT_MAX_OBJECT_SIZE;
+    }
+
     jsonProperty *property = &jo->properties[jo->propertiesLength]; 
     ++jo->propertiesLength;
     if (jo->propertiesLength == MAX_OBJECT_PROPERTIES) {

data/src/rules/state.h

@@ -1,5 +1,5 @@
 
-#include <time.h> 
+#include <time.h>
 
 #define HASH_ID 926444256
 #define HASH_SID 3593476751
@@ -18,6 +18,8 @@
 
 #define UNDEFINED_HASH_OFFSET 0
 #define MAX_OBJECT_PROPERTIES 255
+#define MAX_OBJECT_SIZE 4294967296
+#define MAX_OBJECT_PROPERTY_SIZE 16777216
 #define MAX_MESSAGE_FRAMES 16
 #define MAX_MESSAGE_INDEX_LENGTH 512
 #define MAX_LEFT_FRAME_INDEX_LENGTH 512
@@ -64,8 +66,8 @@ typedef struct pool {
 typedef struct jsonProperty {
     unsigned int hash;
     unsigned char type;
-    unsigned short valueOffset;
-    unsigned short valueLength;
+    unsigned int valueOffset;
+    unsigned int valueLength;
     union {
         long long i; 
         double d; 
@@ -193,8 +195,8 @@ unsigned int getObjectProperty(jsonObject *jo,
 unsigned int setObjectProperty(jsonObject *jo, 
                                unsigned int hash, 
                                unsigned char type, 
-                               unsigned short valueOffset, 
-                               unsigned short valueLength);
+                               unsigned int valueOffset, 
+                               unsigned int valueLength);
 
 unsigned int constructObject(char *root,
                              char *parentName, 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.28
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake