fix none value

Author: gabrielweiz

src/scrapy_settings_log/__init__.py

@@ -53,12 +53,13 @@ def spider_closed(self, spider):
             settings = {k: v for k, v in settings.items() if re.search(regex, k)}
         if settings.get("MASKED_SENSITIVE_SETTINGS_ENABLED", True):
             default_regexes = [
-                "(?i)(api[\W_]*key)",  # apikey and possible variations
-                "(?i)(AWS[\W_]*SECRET[\W_]*ACCESS[\W_]*KEY)"  # AWS_SECRET_ACCESS_KEY and possible variations
+                ".*(?i)(api[\W_]*key).*",  # apikey and possible variations e.g: shub_apikey or SC_APIKEY
+                ".*(?i)(AWS[\W_]*SECRET[\W_]*ACCESS[\W_]*KEY).*",  # AWS_SECRET_ACCESS_KEY and possible variations
+                ".*(?i)([\W_]*password[\W_]*).*"  # password word
             ]
             regex_list = settings.get("MASKED_SENSITIVE_SETTINGS_REGEX_LIST", default_regexes)
             for reg in regex_list:
-                updated_settings = {k: '*'*len(v) for k, v in settings.items() if re.search(reg, k)}
+                updated_settings = {k: '*'*len(v) if v else v for k, v in settings.items() if re.match(reg, k)}
                 settings = {**settings, **updated_settings}
 
         self.output_settings(settings, spider)

tests/test_code.py

@@ -156,6 +156,23 @@ def test_log_all_should_not_return_aws_secret_key_value_by_default(caplog):
     assert 'secret_value' not in caplog.text
 
 
+def test_log_all_should_not_return_password_value_by_default(caplog):
+    settings = {
+        "SETTINGS_LOGGING_ENABLED": True,
+        "test_password": 'secret_value1',
+        "PASSWORD_TEST": 'secret_value2',
+    }
+
+    spider = MockSpider(settings)
+    logger = SpiderSettingsLogging()
+    with caplog.at_level(logging.INFO):
+        logger.spider_closed(spider)
+
+    assert '"test_password": "*************"' in caplog.text
+    assert '"PASSWORD_TEST": "*************"' in caplog.text
+    assert 'secret_value' not in caplog.text
+
+
 def test_log_all_should_return_only_the_custom_regex_data_masked_if_MASKED_SENSITIVE_SETTINGS_REGEX_LIST_configured(caplog):
     settings = {
         "SETTINGS_LOGGING_ENABLED": True,