Add factory to tests module

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }})
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
@@ -42,7 +42,7 @@ jobs:
           DJANGO: ${{ matrix.django }}
 
       - name: Publish coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
 
   publish:
     name: Publish package to PyPI
@@ -52,10 +52,10 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Build sdist and wheel
         run: |

.github/workflows/code_quality.yml

@@ -22,10 +22,10 @@ jobs:
       matrix:
         toxenv: [isort, black, flake8, docs]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install tox
       - run: tox

setup.cfg

@@ -34,6 +34,7 @@ classifiers =
 zip_safe = False
 include_package_data = True
 packages = find:
+python_requires = >=3.7
 install_requires =
     django >= 3.2
     django-privates >= 1.5
@@ -56,6 +57,8 @@ include =
     simple_certmanager.*
 
 [options.extras_require]
+testsutils =
+    factory-boy
 tests =
     pytest
     pytest-django

simple_certmanager/tests/data/README.md

@@ -0,0 +1,16 @@
+# Test files for mTLS via simple_certmanager.Certificate models
+
+## Certificate and key
+
+The test.certificate and the test.key were generated using the following command:
+
+```bash
+openssl req -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out test.certificate -keyout test.key
+```
+
+The tests making use of these certificates are:
+
+- `src/zgw_consumers_ext/tests/test_client_factory.py`
+- `src/openforms/appointments/contrib/qmatic/tests/test_client.py`
+
+These tests will potentially start failing once the test certificate expires.

simple_certmanager/tests/data/test.certificate

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIUMzTMR5GJmyJOvSl6rXId64MDha4wDQYJKoZIhvcNAQEL
+BQAwbjELMAkGA1UEBhMCTkwxFjAUBgNVBAgMDU5vb3JkLUhvbGxhbmQxEjAQBgNV
+BAcMCUFtc3RlcmRhbTEZMBcGA1UECgwQT3BlbiBGb3JtdWxpZXJlbjEYMBYGA1UE
+AwwPb3BlbmZvcm11bGllcmVuMB4XDTIzMDkxODE2MzYzOVoXDTI0MDkxNzE2MzYz
+OVowbjELMAkGA1UEBhMCTkwxFjAUBgNVBAgMDU5vb3JkLUhvbGxhbmQxEjAQBgNV
+BAcMCUFtc3RlcmRhbTEZMBcGA1UECgwQT3BlbiBGb3JtdWxpZXJlbjEYMBYGA1UE
+AwwPb3BlbmZvcm11bGllcmVuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAw2ZCq8faQO81SdqjmcnMLK1of978Sz+F8ywFGsrV/1kEL4IZpucn7TTkJ4Aa
+x0YFh3EYf4kRdB9OoL9ZfCLC4ccA9gcSV6FjL8l5SxSUlderMgtqSEqQuYsb2Yoa
+GkNZ2I0XZg1iiFZDDX/TpHNhUy/rD9ZPZQ0jK1SKvyPhJy24Q5PqECuhkqBHuQnP
+AxcVaHUf2LMU5v6ZPkQfBjrsD9XNPia/v/Lp5IaPLGqMLDtryU609XxB4I0Wncri
+aGV5NGRB9ajzB4TpVIFjpeG9nqt5EYqRKuV9MHus4fY4gP/JmxuyWLyPEYS5VWJM
+JOCpyb2t/8d7ZEn/Sy/ZB3JrQmaH6VpCvvsMX3ajGA62ExBy2+nggN4DF2Xp39mM
+i7/26tj3JY4SKD0oe8SQVnwmH4n89xIVVD5tLOqQVkSo+Pvm6j3WyCWHdMRp3Rpw
+NzsOScUzp3Vs74U0tpg9pyexL9dvjrsZqekTg5Z6k2igJsCmvcihaaTr9/lGZlwX
+OGk+8N411AnDWrv3VfZjlfK89KTSu6VFFyc/NArVFiu+nDHvBm6ca0mFAuQ6UOis
+qayM3XgM2f9DNnoIwZ80bSdmoFbTk747E1IWIX9bfxKYZOcUwfwQpubfJPAqbkwi
+Zu9yPbEWPlQ9maBRaOByv1KRpZdz86uiy9hCX8P5nc++nCMCAwEAAaNTMFEwHQYD
+VR0OBBYEFFYWr5bJnQa7zm1eFqP0eY0U13y5MB8GA1UdIwQYMBaAFFYWr5bJnQa7
+zm1eFqP0eY0U13y5MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+ABjTI0q7UZBWt3CeDep79krHg/cRlS28PxL0Of8SNRc0y2XA1aMwXMba1AB2TwpE
+EYVC1lJ6lLKRVNop+YJbb1D6ErOu5BQMQnawzJDfgSK+teVUV6bDyGa3641FSRTT
+S9CPwAhzI8DgfrqtJGwpL4O84wNy076dyN//u3dXhhwao6eKSoHCXHE2gToAzFpT
+Pe/zK+IGfBXG+fBdY1v//EYSTOHioleivsB1dXN0J+9XEXI1v1rJoKDz3tN1rJi1
+B6c/Eio8jXSeXnUyY2A0JND+8dl5U0bW6oMD3Yjk22z9b+RZ0B5bkMM0hxqZbYrW
+CKHw0PEGU2K272grMR18HT5A5/nFK7ukWi61xEnL3RxXGif7dYnUNcNsDQLCGnvK
+/QO3ySNj5gAjxPKNkBTWGZ/2GSXR8OOTSfTQnz7YA8yh9tN7BffFkZ7yoc1PlEjR
+UWdDd88FafNxdEIugvqaoW4zcCGVrUjG9i27P5Y7JcrmskLnG+opm4Kow9Hm9N91
+dTwOs2U9ecWzLCGhh9jc4VUj1BX5rxGOZHLxreZ5HhO4Bec3FO/DnCih15LPeX3+
+1knK3WO0iDF4IvGNcdLAGOvxo4IJs1BvGWrGCDdaxdk+z7a3UhiM+kwdrMA3Jv3s
+7CAM8RLViegSaC+onpQkctn+JVBMq2NUVM1ZiyHIJtD5
+-----END CERTIFICATE-----

simple_certmanager/tests/data/test.key

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+LFg4KO/pXNCP8nnieqfzHufJYz0wzA==
+-----END PRIVATE KEY-----

simple_certmanager/tests/factories.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+
+import factory
+
+from ..constants import CertificateTypes
+from ..models import Certificate
+
+DATA_DIR = Path(__file__).parent.resolve() / "data"
+
+
+class CertificateFactory(factory.django.DjangoModelFactory):
+    label = factory.Sequence(lambda n: f"certificate-{n}")
+    type = CertificateTypes.cert_only
+    public_certificate = factory.django.FileField(
+        from_path=str(DATA_DIR / "test.certificate"),
+        filename="cert.pem",
+    )
+
+    class Meta:
+        model = Certificate
+
+    class Params:
+        with_private_key = factory.Trait(
+            type=CertificateTypes.key_pair,
+            private_key=factory.django.FileField(
+                from_path=str(DATA_DIR / "test.key"),
+                filename="key.pem",
+            ),
+        )