From 24ae459cd20d7ed1213a9c7a561299a4b8291c67 Mon Sep 17 00:00:00 2001 From: Yishi Wang Date: Mon, 17 Mar 2025 16:46:58 +0800 Subject: [PATCH] fix azdev scan tests (#510) --- azdev/operations/tests/test_scan_and_mask.py | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azdev/operations/tests/test_scan_and_mask.py b/azdev/operations/tests/test_scan_and_mask.py index 4424d7591..2dc68dadc 100644 --- a/azdev/operations/tests/test_scan_and_mask.py +++ b/azdev/operations/tests/test_scan_and_mask.py @@ -34,8 +34,8 @@ def test_scan_raw_string(self): self.assertEqual(len(result['scan_results']['raw_data']), 1) self.assertEqual(result['scan_results']['raw_data'][0]['secret_name'], 'AdditionalPattern') - regex_pattern1 = RegexPattern(r'(?[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})', '000', 'EmailAddress') - regex_pattern2 = RegexPattern('(?i)(?:^|[?;&])(?:dsas_secret|sig)=(?[0-9a-z\\/+%]{43,129}(?:=|%3d))', '001', 'LooseSasSecret') + regex_pattern1 = RegexPattern(r'(?P[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})', '000', 'EmailAddress') + regex_pattern2 = RegexPattern('(?i)(?:^|[?;&])(?:dsas_secret|sig)=(?P[0-9a-z\\/+%]{43,129}(?:=|%3d))', '001', 'LooseSasSecret') with mock.patch("azdev.operations.secret._load_built_in_regex_patterns", return_value=(regex_pattern1, regex_pattern2)): test_data2 = "This is a test string with email fooabc@gmail.com and sas sv=2022-11-02&sr=c&sig=a9Y5mpQgKUiiPzHFNdDm53Na6UndTrNMCsRZd6b2oV4%3D" result = scan_secrets(data=test_data2) @@ -86,8 +86,8 @@ def test_scan_file(self): self.assertEqual(len(result['scan_results'][simple_string_file]), 1) self.assertEqual(result['scan_results'][simple_string_file][0]['secret_name'], 'AdditionalPattern') - regex_pattern1 = RegexPattern(r'(?[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})', '000', 'EmailAddress') - regex_pattern2 = RegexPattern('(?i)(?:^|[?;&])(?:dsas_secret|sig)=(?[0-9a-z\\/+%]{43,129}(?:=|%3d))', '001', 'LooseSasSecret') + regex_pattern1 = RegexPattern(r'(?P[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})', '000', 'EmailAddress') + regex_pattern2 = RegexPattern('(?i)(?:^|[?;&])(?:dsas_secret|sig)=(?P[0-9a-z\\/+%]{43,129}(?:=|%3d))', '001', 'LooseSasSecret') with mock.patch("azdev.operations.secret._load_built_in_regex_patterns", return_value=(regex_pattern1, regex_pattern2)): result = scan_secrets(file_path=info_json_file) self.assertTrue(result['secrets_detected']) @@ -118,7 +118,7 @@ def test_scan_directory(self): custom_pattern = { "Include": [ { - "Pattern": r"(?[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})", + "Pattern": r"(?P[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})", "Name": "EmailAddress" } ] @@ -153,7 +153,7 @@ def test_mask(self): custom_pattern = { "Include": [ { - "Pattern": r"(?[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})", + "Pattern": r"(?P[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})", "Name": "EmailAddress" } ] diff --git a/setup.py b/setup.py index 7ca255823..57778686c 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ 'packaging', 'tqdm', 'wheel==0.30.0', - 'microsoft-security-utilities-secret-masker~=1.0.0b2' + 'microsoft-security-utilities-secret-masker~=1.0.0b4' ], package_data={ 'azdev.config': ['*.*', 'cli_pylintrc', 'ext_pylintrc'],