Fix pylint warnings: logging, globals, exceptions, imports, duplicates
Agent-Logs-Url: https://github.com/christianlouis/dmarq/sessions/576427d4-4f6a-46d2-b75f-6862ecbcf526 Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
# Import all models so Base.metadata knows every table
|
||||
import app.models.domain # noqa: F401
|
||||
import app.models.report # noqa: F401
|
||||
import app.models.user # noqa: F401
|
||||
import app.models.domain # noqa: F401 # pylint: disable=unused-import
|
||||
import app.models.report # noqa: F401 # pylint: disable=unused-import
|
||||
import app.models.user # noqa: F401 # pylint: disable=unused-import
|
||||
import pytest
|
||||
from app.core.database import Base, get_db
|
||||
from app.main import create_app
|
||||
from app.services.report_store import ReportStore
|
||||
from fastapi import FastAPI
|
||||
from fastapi.testclient import TestClient
|
||||
@@ -14,8 +15,6 @@ from sqlalchemy.orm import sessionmaker
|
||||
@pytest.fixture()
|
||||
def test_app() -> FastAPI:
|
||||
"""Create a fresh FastAPI application instance for testing."""
|
||||
from app.main import create_app
|
||||
|
||||
application = create_app()
|
||||
return application
|
||||
|
||||
@@ -36,7 +35,7 @@ def db_session():
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def client(test_app: FastAPI, db_session):
|
||||
def client(test_app: FastAPI, db_session): # pylint: disable=redefined-outer-name
|
||||
"""Create a TestClient with a DB override for the test app."""
|
||||
|
||||
def override_get_db():
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
"""Shared test data for DMARC report tests."""
|
||||
|
||||
SAMPLE_XML = """\
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<feedback>
|
||||
<report_metadata>
|
||||
<org_name>google.com</org_name>
|
||||
<email>noreply-dmarc-support@google.com</email>
|
||||
<report_id>123456789</report_id>
|
||||
<date_range>
|
||||
<begin>1597449600</begin>
|
||||
<end>1597535999</end>
|
||||
</date_range>
|
||||
</report_metadata>
|
||||
<policy_published>
|
||||
<domain>example.com</domain>
|
||||
<adkim>r</adkim>
|
||||
<aspf>r</aspf>
|
||||
<p>none</p>
|
||||
<sp>none</sp>
|
||||
<pct>100</pct>
|
||||
</policy_published>
|
||||
<record>
|
||||
<row>
|
||||
<source_ip>203.0.113.1</source_ip>
|
||||
<count>2</count>
|
||||
<policy_evaluated>
|
||||
<disposition>none</disposition>
|
||||
<dkim>pass</dkim>
|
||||
<spf>fail</spf>
|
||||
</policy_evaluated>
|
||||
</row>
|
||||
<identifiers>
|
||||
<header_from>example.com</header_from>
|
||||
</identifiers>
|
||||
<auth_results>
|
||||
<dkim>
|
||||
<domain>example.com</domain>
|
||||
<result>pass</result>
|
||||
<selector>default</selector>
|
||||
</dkim>
|
||||
<spf>
|
||||
<domain>example.com</domain>
|
||||
<result>fail</result>
|
||||
</spf>
|
||||
</auth_results>
|
||||
</record>
|
||||
</feedback>
|
||||
"""
|
||||
@@ -3,54 +3,7 @@ import zipfile
|
||||
|
||||
import pytest
|
||||
from app.services.dmarc_parser import DMARCParser
|
||||
|
||||
SAMPLE_XML = """\
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<feedback>
|
||||
<report_metadata>
|
||||
<org_name>google.com</org_name>
|
||||
<email>noreply-dmarc-support@google.com</email>
|
||||
<report_id>123456789</report_id>
|
||||
<date_range>
|
||||
<begin>1597449600</begin>
|
||||
<end>1597535999</end>
|
||||
</date_range>
|
||||
</report_metadata>
|
||||
<policy_published>
|
||||
<domain>example.com</domain>
|
||||
<adkim>r</adkim>
|
||||
<aspf>r</aspf>
|
||||
<p>none</p>
|
||||
<sp>none</sp>
|
||||
<pct>100</pct>
|
||||
</policy_published>
|
||||
<record>
|
||||
<row>
|
||||
<source_ip>203.0.113.1</source_ip>
|
||||
<count>2</count>
|
||||
<policy_evaluated>
|
||||
<disposition>none</disposition>
|
||||
<dkim>pass</dkim>
|
||||
<spf>fail</spf>
|
||||
</policy_evaluated>
|
||||
</row>
|
||||
<identifiers>
|
||||
<header_from>example.com</header_from>
|
||||
</identifiers>
|
||||
<auth_results>
|
||||
<dkim>
|
||||
<domain>example.com</domain>
|
||||
<result>pass</result>
|
||||
<selector>default</selector>
|
||||
</dkim>
|
||||
<spf>
|
||||
<domain>example.com</domain>
|
||||
<result>fail</result>
|
||||
</spf>
|
||||
</auth_results>
|
||||
</record>
|
||||
</feedback>
|
||||
"""
|
||||
from app.tests.test_data import SAMPLE_XML
|
||||
|
||||
|
||||
class TestDMARCParser:
|
||||
|
||||
@@ -1,56 +1,9 @@
|
||||
import io
|
||||
import zipfile
|
||||
|
||||
from app.tests.test_data import SAMPLE_XML
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
SAMPLE_XML = """\
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<feedback>
|
||||
<report_metadata>
|
||||
<org_name>google.com</org_name>
|
||||
<email>noreply-dmarc-support@google.com</email>
|
||||
<report_id>123456789</report_id>
|
||||
<date_range>
|
||||
<begin>1597449600</begin>
|
||||
<end>1597535999</end>
|
||||
</date_range>
|
||||
</report_metadata>
|
||||
<policy_published>
|
||||
<domain>example.com</domain>
|
||||
<adkim>r</adkim>
|
||||
<aspf>r</aspf>
|
||||
<p>none</p>
|
||||
<sp>none</sp>
|
||||
<pct>100</pct>
|
||||
</policy_published>
|
||||
<record>
|
||||
<row>
|
||||
<source_ip>203.0.113.1</source_ip>
|
||||
<count>2</count>
|
||||
<policy_evaluated>
|
||||
<disposition>none</disposition>
|
||||
<dkim>pass</dkim>
|
||||
<spf>fail</spf>
|
||||
</policy_evaluated>
|
||||
</row>
|
||||
<identifiers>
|
||||
<header_from>example.com</header_from>
|
||||
</identifiers>
|
||||
<auth_results>
|
||||
<dkim>
|
||||
<domain>example.com</domain>
|
||||
<result>pass</result>
|
||||
<selector>default</selector>
|
||||
</dkim>
|
||||
<spf>
|
||||
<domain>example.com</domain>
|
||||
<result>fail</result>
|
||||
</spf>
|
||||
</auth_results>
|
||||
</record>
|
||||
</feedback>
|
||||
"""
|
||||
|
||||
|
||||
def _make_zip(xml_content: str) -> bytes:
|
||||
"""Create a ZIP file containing the given XML content."""
|
||||
|
||||
@@ -4,6 +4,7 @@ Security-focused tests for DMARQ application.
|
||||
Covers API key management, domain validation, file upload limits, and XML parsing security.
|
||||
"""
|
||||
|
||||
import app.services.dmarc_parser as parser_module
|
||||
import pytest
|
||||
from app.core.security import add_api_key, generate_api_key, verify_api_key
|
||||
from app.services.dmarc_parser import DMARCParser
|
||||
@@ -123,8 +124,6 @@ class TestXMLParsingSecurity:
|
||||
"""Test XML parsing security (defusedxml, XXE protection)."""
|
||||
|
||||
def test_defusedxml_is_used(self):
|
||||
import app.services.dmarc_parser as parser_module
|
||||
|
||||
assert hasattr(parser_module, "ET")
|
||||
module_info = str(getattr(parser_module.ET, "__name__", "")) + str(
|
||||
getattr(parser_module.ET, "__module__", "")
|
||||
@@ -149,5 +148,5 @@ class TestXMLParsingSecurity:
|
||||
result = DMARCParser.parse_file(xxe_payload, "test.xml")
|
||||
org_name = result.get("org_name", "")
|
||||
assert "root:" not in org_name and "/bin" not in org_name
|
||||
except Exception:
|
||||
except Exception: # pylint: disable=broad-exception-caught
|
||||
pass # Expected – defusedxml blocks DTD processing
|
||||
|
||||
Reference in New Issue
Block a user