durable_rules 2.0.22 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea83e9efc9d1e06b799a9408e24dc95126cadcdc
-  data.tar.gz: 9334d4fb5bbe5c97d8e46cf00a624adcd782af86
+  metadata.gz: 718b325b66f1671880337e82b9c0733e69d86710
+  data.tar.gz: 8b76eef7e27b274415db71c511ceab15b982b7ad
 SHA512:
-  metadata.gz: 9240234e76cf597c487320d53ec9ebe9ba9a7ba65a0f64a685de3eb2b037457a11eb89fd61eca7dc4135aa473ae86dc92aebea8eb941d504270c4de29416e974
-  data.tar.gz: 1056a380df74c2a30b266d33a09c6745bcd41b1b255e2f6a9628fb5c5d30db65c83606b45e7758d679f36a50026a9ea1ba98c94a308f51a323ace387ee3fd68e
+  metadata.gz: ee85bce7113af542f36608b2bec47e3f00397f8c5bff5b6ed123b55512d5504f40a151df58b04d7f2970ae9a814c0625c8831e41194fe1433a7b7e8292638b28
+  data.tar.gz: f4cee04af0c0b941831cdc9fbf0ef2df5403c39c05fc522bd440653ab322b96fad08b051aa4047972a9f3cd77ff3d9ea2f0a4dc8a0c69ba69f96389e46a0ccde

data/librb/durable.rb

@@ -9,9 +9,12 @@ module Durable
       @@main_host = Engine::Host.new
     end
 
-    @@main_host.register_rulesets @@rulesets
-
-    @@rulesets = {}
+    begin
+      @@main_host.register_rulesets @@rulesets
+    ensure
+      @@rulesets = {}
+    end
+    
     @@main_host 
   end
 

data/src/rules/events.c

@@ -486,13 +486,67 @@ static unsigned int reduceExpression(ruleset *tree,
 
     if (currentExpression->right.type == JSON_REGEX || currentExpression->right.type == JSON_IREGEX) {
         targetProperty->type = JSON_BOOL;
+        targetProperty->value.b = 0;
+
+        char *leftString = "";
+        unsigned short leftLength = 0;
+        switch(leftProperty->type) {
+            case JSON_INT:
+                {
+    #ifdef _WIN32
+                    leftString = (char *)_alloca(sizeof(char)*(MAX_INT_LENGTH + 1));
+                    sprintf_s(leftString, sizeof(char)*(MAX_INT_LENGTH + 1), "%lld", leftProperty->value.i);
+    #else
+                    char newString[MAX_INT_LENGTH + 1];
+                    leftString = newString;
+                    snprintf(leftString, sizeof(char)*(MAX_INT_LENGTH + 1), "%lld", leftProperty->value.i);
+    #endif         
+                    leftLength = strlen(leftString);
+                    break;
+                }
+            case JSON_DOUBLE:
+                {
+    #ifdef _WIN32
+                    leftString = (char *)_alloca(sizeof(char)*(MAX_DOUBLE_LENGTH + 1));
+                    sprintf_s(leftString, sizeof(char)*(MAX_DOUBLE_LENGTH + 1), "%f", leftProperty->value.d);
+    #else
+                    char newString[MAX_DOUBLE_LENGTH + 1];
+                    leftString = newString;
+                    snprintf(leftString, sizeof(char)*(MAX_DOUBLE_LENGTH + 1), "%f", leftProperty->value.d);
+    #endif         
+                    leftLength = strlen(leftString);
+                    break;
+                }
+            case JSON_BOOL:
+                if (leftProperty->value.b) {
+                    leftString = "true";
+                    leftLength = 4;
+                }
+                else {
+                    leftString = "false";
+                    leftLength = 5;
+                }
+
+                break;
+            case JSON_NIL:
+                leftString = "nil";
+                leftLength = 3;
+                break;
+            case JSON_STRING:
+                leftString = leftProperty->value.s;
+                leftLength = leftProperty->valueLength;
+                break;
+        }
+
         targetProperty->value.b = evaluateRegex(tree,
-                                                leftProperty->value.s, 
-                                                leftProperty->valueLength, 
+                                                leftString, 
+                                                leftLength, 
                                                 (currentExpression->right.type == JSON_REGEX) ? 0 : 1,
                                                 currentExpression->right.value.regex.vocabularyLength,
                                                 currentExpression->right.value.regex.statesLength,
                                                 currentExpression->right.value.regex.stateMachineOffset);
+        
+
         return RULES_OK;
     }
 
@@ -1533,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

@@ -23,6 +23,7 @@
 #define MAX_SET 8192
 #define MAX_LIST 1024
 #define MAX_INTERVAL 100
+#define MAX_REFCOUNT 1000
 
 
 #define CREATE_QUEUE(type) \
@@ -597,10 +598,6 @@ static unsigned int linkStates(state *previousState,
     previousState->transitions[previousState->transitionsLength].next = nextState;
     ++previousState->transitionsLength;
     ++nextState->refCount;
-    if (previousState->transitionsLength == MAX_TRANSITIONS) {
-        return ERR_REGEX_MAX_TRANSITIONS;
-    }
-
     return RULES_OK;
 }
 
@@ -852,10 +849,18 @@ static unsigned int validateGraph(char **first, char *last) {
         switch (currentToken.type) {
             case REGEX_SYMBOL:
             case REGEX_UNION:
-            case REGEX_STAR:
             case REGEX_PLUS:
-            case REGEX_QUESTION:
                 break;
+            case REGEX_STAR:
+            case REGEX_QUESTION:
+            {
+                char *nextFirst = *first; 
+                token nextToken;
+                unsigned int nextResult = readNextToken(&nextFirst, last, &nextToken); 
+                if (nextResult == REGEX_PARSE_OK && nextToken.type == REGEX_STAR) {
+                    return ERR_REGEX_INVALID;
+                }
+            }
             case REGEX_REGEX:
                 result = validateGraph(first, last);
                 if (result != REGEX_PARSE_OK) {
@@ -1141,7 +1146,7 @@ static unsigned int transformToDFA(state *nfa,
             }
         }
 
-        DEQUEUE(&currentState);    
+        DEQUEUE(&currentState);
     }
 
     return RULES_OK;
@@ -1255,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);
             }
 
@@ -1343,6 +1348,12 @@ unsigned int compileRegex(void *tree,
     if (result != RULES_OK) {
         return result;
     }
+
+    if (!*vocabularyLength || !*statesLength) {
+        return ERR_REGEX_INVALID;
+    }
+
+
     void *newStateMachine;    
     result = storeRegexStateMachine((ruleset *)tree, 
                                     *vocabularyLength, 

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/rete.h

@@ -1,6 +1,6 @@
 #include "state.h"
 
-// #define _PRINT 1
+//#define _PRINT 1
 
 #define OP_NOP 0
 #define OP_LT 0x01

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
@@ -40,6 +42,7 @@
 #define ERR_REGEX_LIST_FULL 505
 #define ERR_REGEX_SET_FULL 506
 #define ERR_REGEX_CONFLICT 507
+#define ERR_REGEX_INVALID 508
 
 #define NEXT_BUCKET_LENGTH 512
 #define NEXT_LIST_LENGTH 128
@@ -63,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.22
+  version: 2.0.27
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake