okta-expression-parser 0.3.0__tar.gz → 0.4.1__tar.gz

{okta_expression_parser-0.3.0 → okta_expression_parser-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okta-expression-parser
-Version: 0.3.0
+Version: 0.4.1
 Summary: Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language
 Author: Mathew Moon
 Author-email: me@mathewmoon.net

{okta_expression_parser-0.3.0 → okta_expression_parser-0.4.1}/okta_expression_parser/lexer.py

@@ -10,9 +10,9 @@ class ExpressionLexer(Lexer):
     # reflags = re.IGNORECASE
     # Set of token names.
     tokens = {
+        NAME,
         STRING,
         INT,
-        NAME,
         NE,
         GTE,
         LTE,
@@ -28,6 +28,10 @@ class ExpressionLexer(Lexer):
         QUESTION_MARK,
         MEMBEROF,
         MEMBEROFANY,
+        MEMBEROFNAME,
+        MEMBEROFGROUPSTARTSWITH,
+        MEMBEROFGROUPCONTAINS,
+        MEMBEROFGROUPNAMEREGEX,
         USER,
         CLASS,
     }
@@ -48,7 +52,11 @@ class ExpressionLexer(Lexer):
     OR = r"or|OR|Or"
     EQ = r"(==|eq|EQ|Eq)"
     BOOL = r"(true|false|True|False|TRUE|FALSE)"
+    MEMBEROFGROUPCONTAINS = "isMemberOfGroupNameContains"
+    MEMBEROFGROUPNAMEREGEX = "isMemberOfGroupNameRegex"
+    MEMBEROFGROUPSTARTSWITH = "isMemberOfGroupNameStartsWith"
     MEMBEROFANY = "isMemberOfAnyGroup"
+    MEMBEROFNAME = "isMemberOfGroupName"
     MEMBEROF = "isMemberOfGroup"
     USER = r"user\b"
     COLON = r"\:"
@@ -57,7 +65,8 @@ class ExpressionLexer(Lexer):
     NULL = r"null|NULL|Null"
     CLASS = r"String|Arrays|Convert|Iso3166Convert|Groups"
     INT = r"\d+"
-    STRING = r""""([^"\\]*(\\.[^"\\]*)*)"|\'([^\'\\]*(\\.[^\'\\]*)*)\'|''|\"\""""
+    #    STRING = r""""([^"\\]*(\\.[^"\\]*)*)"|\'([^\'\\]*(\\.[^\'\\]*)*)\'|''|\"\""""
+    STRING = r'''"(?:\\.|[^"\\])*"'''
     NAME = r"[a-zA-Z_][a-zA-Z0-9\-_]*"
 
     # Line number tracking

{okta_expression_parser-0.3.0 → okta_expression_parser-0.4.1}/okta_expression_parser/parser.py

@@ -1,6 +1,7 @@
 # pyright: reportUndefinedVariable=false
 import logging
 from os import environ
+from re import match
 from sys import stdout
 from typing import Any, Dict, List, Sequence
 from types import ModuleType
@@ -13,6 +14,19 @@ from .expression_classes.arrays import _ArrayType
 from .lexer import ExpressionLexer
 
 
+# Sly doesn't really facilitate configuring logging from the caller, so we're going to
+# suppress all logging below the level specified in the LOG_LEVEL environment variable.
+log_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "EXCEPTION"]
+
+log_level = environ.get("LOG_LEVEL", "ERROR")
+
+log_rank = log_levels.index(log_level)
+
+for level_name in list(reversed(log_levels))[:log_rank +1]:
+    log_attr = level_name.lower()
+    setattr(sly.yacc.SlyLogger, log_attr, lambda self, msg, *args, **kwargs: None)
+
+
 class ExpressionParser(sly.Parser):
     #: Writes grammar rules to a file for debugging
     debugfile = environ.get("OKTA_EXPRESSION_PARSER_LOG_FILE")
@@ -33,7 +47,7 @@ class ExpressionParser(sly.Parser):
         group_ids: List[str] = [],
         user_profile: Dict[str, Any] = {},
         log_to_stdout: bool = False,
-        log_level: str = "INFO",
+        log_level: str = environ.get("LOG_LEVEL", "ERROR"),
         expression_classes: ModuleType = _default_expression_classes,
         group_data: dict = {},
     ) -> None:
@@ -49,6 +63,7 @@ class ExpressionParser(sly.Parser):
         ):
             self._expression_classes.Groups.group_data = group_data
 
+        #: A dict, with Group ID's as the keys and group data as the values. Used for operations that require more context than just the group ID.
         self.group_data = group_data
 
         self.__group_ids: str = group_ids
@@ -325,15 +340,47 @@ class ExpressionParser(sly.Parser):
 
         return p.operand in self.__group_ids
 
-    #@_("turnary")  # noqa: 821
-    #def operand(self, p: YaccProduction) -> Any:
-    #    condition = p.turnary[0]
-    #    if_true = p.turnary[1]
-    #    if_false = p.turnary[2]
-    #    if condition:
-    #        return if_true
-    #    else:
-    #        return if_false
+    @_('MEMBEROFNAME "(" operand ")"')
+    def condition(self, p: YaccProduction):
+        """Tests if a user is a member of a group with a specific name"""
+
+        matches = [
+            v for k, v in self.group_data.items() if v["profile"]["name"] == p.operand
+        ]
+
+        return bool(matches)
+
+    @_('MEMBEROFGROUPSTARTSWITH "(" operand ")"')
+    def condition(self, p: YaccProduction):
+        """Tests if a user is a member of a group with a specific name"""
+
+        matches = [
+            v
+            for k, v in self.group_data.items()
+            if v["profile"]["name"].startswith(p.operand)
+        ]
+
+        return bool(matches)
+
+    @_('MEMBEROFGROUPCONTAINS "(" operand ")"')
+    def condition(self, p: YaccProduction):
+        """Tests if a user is a member of a group with a specific name"""
+
+        matches = [
+            v for k, v in self.group_data.items() if p.operand in v["profile"]["name"]
+        ]
+
+        return bool(matches)
+
+    @_('MEMBEROFGROUPNAMEREGEX "(" operand ")"')
+    def condition(self, p: YaccProduction):
+        """Tests if a user is a member of a group with a specific name"""
+
+        for _, group in self.group_data.items():
+            if match(p.operand, group["profile"]["name"]):
+                return True
+
+        return False
 
     @_("operand QUESTION_MARK operand COLON operand")  # noqa: 821
     @_("condition QUESTION_MARK operand COLON operand")  # noqa: 821
@@ -343,7 +390,6 @@ class ExpressionParser(sly.Parser):
         if_false = p.operand1 if hasattr(p, "condition") else p.operand2
 
         return if_true if condition else if_false
-        #return (condition, p.operand0, p.operand1)
 
     @_("condition error")  # noqa: 821
     def operand(self, x):  # noqa: 811

{okta_expression_parser-0.3.0 → okta_expression_parser-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "okta-expression-parser"
-version = "0.3.0"
+version = "0.4.1"
 description = "Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language"
 authors = ["Mathew Moon <me@mathewmoon.net>"]
 readme = "README.md"