From 4f736c78e9c0d28a9e525bf79c2941131029b884 Mon Sep 17 00:00:00 2001 From: ominbruce Date: Sun, 24 Jul 2022 17:54:13 +0800 Subject: [PATCH 1/2] changed deploy step --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 48c8261..01c2508 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,7 +25,7 @@ jobs: - name: Installing Python Poetry run: pip install poetry - - name: Install and Build pwncat-cs Package + - name: Install and Build pyredactkit Package run: | poetry install poetry build From cb6a6c37e54918bdaa2b7a81588015fbe03f066f Mon Sep 17 00:00:00 2001 From: ominbruce Date: Sun, 24 Jul 2022 18:20:53 +0800 Subject: [PATCH 2/2] made fixes to the api, refactored pyredactkit to runner --- pyproject.toml | 2 +- pyredactkit/__init__.py | 4 ++-- pyredactkit/__main__.py | 4 ++-- pyredactkit/core_redactor.py | 10 ++++------ pyredactkit/{pyredactkit.py => runner.py} | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) rename pyredactkit/{pyredactkit.py => runner.py} (98%) diff --git a/pyproject.toml b/pyproject.toml index 72428fd..1781c08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pyredactkit" -version = "0.3.4" +version = "0.3.5" description = "Python cli tool to redact sensitive data" authors = ["brootware "] license = "GPL-3.0-or-later" diff --git a/pyredactkit/__init__.py b/pyredactkit/__init__.py index 5ffa6dc..8475331 100644 --- a/pyredactkit/__init__.py +++ b/pyredactkit/__init__.py @@ -1,6 +1,6 @@ __version__ = "0.1.0" -from pyredactkit import pyredactkit +from pyredactkit import runner if __name__ == "__main__": - pyredactkit.main() \ No newline at end of file + runner.main() diff --git a/pyredactkit/__main__.py b/pyredactkit/__main__.py index 899d75b..6f7b27a 100644 --- a/pyredactkit/__main__.py +++ b/pyredactkit/__main__.py @@ -24,6 +24,6 @@ ) sys.exit(1) - from pyredactkit import pyredactkit + from pyredactkit import runner - pyredactkit.main() + runner.main() diff --git a/pyredactkit/core_redactor.py b/pyredactkit/core_redactor.py index bff1567..59c4b48 100644 --- a/pyredactkit/core_redactor.py +++ b/pyredactkit/core_redactor.py @@ -35,20 +35,18 @@ def __init__(self) -> None: """ return None - def identify_data(self, line: str) -> list: + def identify_data(self, textchunk: str) -> list: """Function to identify specific option Args: - line (str) : line to be supplied to identify pattern + textchunk (str) : textchunk to be supplied to identify pattern Returns: list (list): list of sensitive data found in lines """ sensitive_data = [] for id in id_object.regexes: redact_pattern = id['pattern'] - if re.search(redact_pattern, line): - pattern_string = re.search(redact_pattern, line) - pattern_string = pattern_string.group(0) - sensitive_data.append(pattern_string) + sensitive_data.append(re.findall(redact_pattern, textchunk)) + sensitive_data = sum(sensitive_data, []) return sensitive_data def redact_all(self, line: str) -> tuple: diff --git a/pyredactkit/pyredactkit.py b/pyredactkit/runner.py similarity index 98% rename from pyredactkit/pyredactkit.py rename to pyredactkit/runner.py index 4cd6e44..1af573c 100644 --- a/pyredactkit/pyredactkit.py +++ b/pyredactkit/runner.py @@ -143,7 +143,7 @@ def main(): redact_obj.process_text(args.text) -def api_return_core_identifier(text: str) -> list: +def api_identify_sensitive_data(text: str) -> list: return redact_obj.identify_data(text)