cyberark-tpc-plugin-parser 0.4.2__tar.gz → 0.4.4__tar.gz

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyberark-tpc-plugin-parser
-Version: 0.4.2
+Version: 0.4.4
 Summary: A package to help parse CyberArk TPC plugin prompts and process files.
 Author-email: Peter McDonald <git@petermcdonald.co.uk>
 License: MIT License
@@ -29,6 +29,7 @@ Project-URL: homepage, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser
 Project-URL: repository, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser.git
 Project-URL: issues, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser/issues
 Keywords: cyberark,parser,tpc
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
@@ -36,6 +37,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: 3.16
+Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Testing
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
@@ -73,7 +75,9 @@ with open("/path/to/files/process.ini") as process_fh:
 with open("/path/to/files/prompts.ini") as prompts_fh:
     prompts_content: str = prompts_fh.read()
 
-parser: Parser = Parser(process_file=process_content, prompts_file=prompts_content)
-process_file_tokens = parser.process_file
-prompt_file_tokens = parser.prompts_file
+process_parser = Parser(file_contents=process_content)
+process_file_tokens = process_parser.parsed_file
+
+prompts_parser = Parser(file_contents=prompts_content)
+prompt_file_tokens = prompts_parser.parsed_file
 ```

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/README.md

@@ -28,7 +28,9 @@ with open("/path/to/files/process.ini") as process_fh:
 with open("/path/to/files/prompts.ini") as prompts_fh:
     prompts_content: str = prompts_fh.read()
 
-parser: Parser = Parser(process_file=process_content, prompts_file=prompts_content)
-process_file_tokens = parser.process_file
-prompt_file_tokens = parser.prompts_file
+process_parser = Parser(file_contents=process_content)
+process_file_tokens = process_parser.parsed_file
+
+prompts_parser = Parser(file_contents=prompts_content)
+prompt_file_tokens = prompts_parser.parsed_file
 ```

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/cyberark_tpc_plugin_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyberark-tpc-plugin-parser
-Version: 0.4.2
+Version: 0.4.4
 Summary: A package to help parse CyberArk TPC plugin prompts and process files.
 Author-email: Peter McDonald <git@petermcdonald.co.uk>
 License: MIT License
@@ -29,6 +29,7 @@ Project-URL: homepage, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser
 Project-URL: repository, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser.git
 Project-URL: issues, https://github.com/petermcd/CyberArk-TPC-Plugin-Parser/issues
 Keywords: cyberark,parser,tpc
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
@@ -36,6 +37,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: 3.16
+Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Testing
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
@@ -73,7 +75,9 @@ with open("/path/to/files/process.ini") as process_fh:
 with open("/path/to/files/prompts.ini") as prompts_fh:
     prompts_content: str = prompts_fh.read()
 
-parser: Parser = Parser(process_file=process_content, prompts_file=prompts_content)
-process_file_tokens = parser.process_file
-prompt_file_tokens = parser.prompts_file
+process_parser = Parser(file_contents=process_content)
+process_file_tokens = process_parser.parsed_file
+
+prompts_parser = Parser(file_contents=prompts_content)
+prompt_file_tokens = prompts_parser.parsed_file
 ```

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/cyberark_tpc_plugin_parser.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ tests/test_lexer.py
 tests/test_parser.py
 tpc_plugin_parser/__init__.py
 tpc_plugin_parser/parser.py
+tpc_plugin_parser/py.typed
 tpc_plugin_parser/lexer/__init__.py
 tpc_plugin_parser/lexer/lexer.py
 tpc_plugin_parser/lexer/tokens/__init__.py

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cyberark-tpc-plugin-parser"
-version = "0.4.2"
+version = "0.4.4"
 description = "A package to help parse CyberArk TPC plugin prompts and process files."
 keywords = ["cyberark", "parser", "tpc"]
 authors = [{ name = "Peter McDonald", email = "git@petermcdonald.co.uk"}]
@@ -9,6 +9,7 @@ license = { file = "LICENSE" }
 requires-python = ">=3.12"
 
 classifiers = [
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.12",
@@ -16,12 +17,17 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: 3.16",
+    "Topic :: Security",
     "Topic :: Software Development :: Testing",
     "Typing :: Typed",
 ]
 
 dependencies = []
 
+[build-system]
+requires = ["setuptools>=84", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [project.urls]
 homepage = "https://github.com/petermcd/CyberArk-TPC-Plugin-Parser"
 repository = "https://github.com/petermcd/CyberArk-TPC-Plugin-Parser.git"
@@ -33,6 +39,11 @@ dev = [
     "pytest>=9.1.1",
     "pytest-cov>=7.1.0",
 ]
+lint = [
+    "ruff>=0.16.8",
+    "troml>=0.4.1",
+    "ty>=0.0.82",
+]
 
 [tool.pytest.ini_options]
 addopts = "--cov=tpc_plugin_parser --cov-report term-missing --cov-report xml:coverage.xml"

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tests/test_lexer.py

@@ -36,6 +36,21 @@ class TestLexer:
                     ),
                 ],
             ),
+            (
+                "password, source=FILE",
+                [
+                    (
+                        TokenName.CPM_PARAMETER_VALIDATION,
+                        CPMParameterValidation(
+                            line_number=1,
+                            name="password",
+                            source="FILE",
+                            mandatory="no",
+                            allow_characters=None,
+                        ),
+                    ),
+                ],
+            ),
             (
                 "TestVar",
                 [
@@ -116,6 +131,20 @@ class TestLexer:
                     ),
                 ],
             ),
+            (
+                "standard=FAIL(' This is a standard fail state', 1234 )",
+                [
+                    (
+                        TokenName.FAIL_STATE,
+                        FailState(
+                            name="standard",
+                            line_number=1,
+                            message="' This is a standard fail state'",
+                            code=1234,
+                        ),
+                    ),
+                ],
+            ),
             (
                 "standard   =  FAIL  ('This is a standard fail state, isn't it?',     2468)",
                 [
@@ -270,8 +299,3 @@ class TestLexer:
         oversized = "x" * (_MAX_SOURCE_BYTES + 1)
         with pytest.raises(ValueError, match="maximum allowed size"):
             Lexer(source=oversized)
-
-    def test_fail_state_code_out_of_range_raises(self) -> None:
-        """Test that a fail-state error code outside 0–65535 raises ValueError."""
-        with pytest.raises(ValueError, match="valid range"):
-            _ = Lexer(source="state=fail(message, 65536)").tokens

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tests/test_parser.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from tpc_plugin_parser.lexer.tokens.assignment import Assignment
 from tpc_plugin_parser.parser import Parser
 
 
@@ -16,7 +17,7 @@ class TestParser:
     )
     def test_process(self, target_file: str) -> None:
         """
-        Test to ensure that process file tokens parses ok.
+        Test to ensure that process file tokens parses OK.
 
         :param target_file: Path to the file.
         """
@@ -27,7 +28,7 @@ class TestParser:
 
         assert len(parser.parsed_file) == 6
         assert len(parser.parsed_file["default"]) == 6
-        assert len(parser.parsed_file["states"]) == 8
+        assert len(parser.parsed_file["states"]) == 9
         assert len(parser.parsed_file["transitions"]) == 7
         assert len(parser.parsed_file["CPM Parameters Validation"]) == 5
         assert len(parser.parsed_file["parameters"]) == 5
@@ -41,7 +42,7 @@ class TestParser:
     )
     def test_prompts(self, target_file: str) -> None:
         """
-        Test to ensure that prompts file tokens parses ok.
+        Test to ensure that prompts file tokens parses OK.
 
         :param target_file: Path to the file.
         """
@@ -53,3 +54,24 @@ class TestParser:
         assert len(parser.parsed_file) == 2
         assert len(parser.parsed_file["default"]) == 6
         assert len(parser.parsed_file["conditions"]) == 8
+
+    def test_duplicate_sections_are_merged(self) -> None:
+        """Test that a repeated section header adds to the earlier section rather than replacing it."""
+        parser = Parser(file_contents="[s]\na=1\n[t]\nb=2\n[s]\nc=3")
+
+        assert parser.parsed_file["s"] == [
+            Assignment(line_number=2, name="a", equals="=", assigned="1"),
+            Assignment(line_number=6, name="c", equals="=", assigned="3"),
+        ]
+        assert parser.parsed_file["t"] == [
+            Assignment(line_number=4, name="b", equals="=", assigned="2"),
+        ]
+
+    def test_explicit_default_section_does_not_overwrite_preamble(self) -> None:
+        """Test that an explicit [default] section is merged with lines preceding the first header."""
+        parser = Parser(file_contents="x=1\n[default]\ny=2")
+
+        assert parser.parsed_file["default"] == [
+            Assignment(line_number=1, name="x", equals="=", assigned="1"),
+            Assignment(line_number=3, name="y", equals="=", assigned="2"),
+        ]

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tpc_plugin_parser/lexer/lexer.py

@@ -160,7 +160,7 @@ class Lexer:
                 CPMParameterValidation(
                     name=str(match["name"]),
                     source=str(match["source"]),
-                    mandatory=str(match["mandatory"]),
+                    mandatory=str(match["mandatory"] or "no").strip(),
                     allow_characters=allow_characters,
                     line_number=line_number,
                 ),
@@ -173,17 +173,13 @@ class Lexer:
 
         :param match: Regex match of the fail state.
         """
-        code = int(match["code"])
-        if not (0 <= code <= 65535):
-            _log.warning("Fail-state error code %d at line %d", code, line_number)
-            raise ValueError(f"Fail-state error code {code} is outside the valid range 0–65535")
         self._tokens.append(
             (
                 TokenName.FAIL_STATE,
                 FailState(
                     name=str(match["name"]).strip(),
                     message=str(match["message"]).strip(),
-                    code=code,
+                    code=int(match["code"]),
                     line_number=line_number,
                 ),
             )

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tpc_plugin_parser/lexer/tokens/cpm_parameter_validation.py

@@ -12,7 +12,7 @@ class CPMParameterValidation:
     line_number: int
     name: str
     source: str
-    mandatory: str
+    mandatory: str = "no"
     allow_characters: str | None = None
     token_name: str = TokenName.CPM_PARAMETER_VALIDATION.value
 

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tpc_plugin_parser/lexer/utilities/regex.py

@@ -7,6 +7,6 @@ CPM_PARAMETER_VALIDATION: str = (
     r"(?:\s*,\s*mandatory\s*=\s*(?P<mandatory>[^,]*))?"
     r"(?:\s*,\s*allowcharacters\s*=\s*(?P<allowcharacters>.*))?$"
 )
-FAIL_STATE: str = r"^\s*(?P<name>\w+)\s*=\s*fail\s*\(\s*(?P<message>.*),\s*(?P<code>[0-9]+)\)\s*$"
+FAIL_STATE: str = r"^\s*(?P<name>\w+)\s*=\s*fail\s*\(\s*(?P<message>.*),\s*(?P<code>[0-9]+)\s*\)\s*$"
 SECTION_HEADER: str = r"^\s*\[(?P<name>\w+(?:\s+\w+)*)]\s*$"
 TRANSITION: str = r"^\s*(?P<current>\w+)\s*,\s*(?P<condition>\w+)\s*,\s*(?P<next>\w+)\s*$"

{cyberark_tpc_plugin_parser-0.4.2 → cyberark_tpc_plugin_parser-0.4.4}/tpc_plugin_parser/parser.py

@@ -38,21 +38,13 @@ class Parser:
 
         :return: Result of processing the lexed file.
         """
-        current_section_name: str = "default"
-        section_entries: list[ALL_TOKEN_TYPES,] = []
-        sorted_lex = {}
-        for lexed_line in lexed_file.tokens:
-            if lexed_line[0] == TokenName.SECTION_HEADER:
-                sorted_lex[current_section_name] = section_entries
-                if isinstance(lexed_line[1], SectionHeader):
-                    current_section_name = lexed_line[1].name
-                else:
-                    # This should never be reached, this is here to satisfy typing.
-                    current_section_name = "UNKNOWN"
-                section_entries = []
+        current: list[ALL_TOKEN_TYPES] = []
+        sorted_lex: dict[str, list[ALL_TOKEN_TYPES]] = {"default": current}
+        for token_name, token in lexed_file.tokens:
+            if token_name == TokenName.SECTION_HEADER and isinstance(token, SectionHeader):
+                current = sorted_lex.setdefault(token.name, [])
                 continue
-            section_entries.append(lexed_line[1])
-        sorted_lex[current_section_name] = section_entries
+            current.append(token)
         return sorted_lex
 
     @property