Add extensive coverage

Author: rkoopmans

.coveragerc

@@ -5,4 +5,7 @@ source = cert_chain_resolver
 [paths]
 source =
     cert_chain_resolver
-    */cert_chain_resolver
+    */cert_chain_resolver
+
+[report]
+include = cert_chain_resolver/*

.github/workflows/ci-cd.yml

@@ -21,7 +21,7 @@ jobs:
         python -m pip install -r requirements_dev.txt
     - name: Test with pytest and coverage
       run: |
-        pytest --cov=./cert_chain_resolver --cov-report term-missing -n auto
+        pytest --rootdir=. --cov=./cert_chain_resolver --cov-report term-missing -n auto tests/
     - name: Upload coverage artifact
       if: success()
       uses: actions/upload-artifact@v4
@@ -46,7 +46,7 @@ jobs:
         python -m pip install -r requirements_dev.txt
     - name: Test with pytest and coverage
       run: |
-        pytest --cov=./cert_chain_resolver --cov-report term-missing -n auto
+        pytest --rootdir=. --cov=./cert_chain_resolver --cov-report term-missing -n auto tests/
     - name: Upload coverage artifact
       if: success()
       uses: actions/upload-artifact@v4
@@ -74,17 +74,16 @@ jobs:
         pattern: coverage-*
     - name: Combine coverage reports
       run: |
-        ls -lashR .
         set -x
         coverage combine coverage-*/.coverage
         coverage report
-        coverage xml -o combined_coverage.xml
+        coverage xml -o ./coverage.xml
 
         coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:
-        file: ./combined_coverage.xml
+        file: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
   mypy:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog 
 
+## 1.3.1
+
+* is_issued_by now raises MissingCertProperty if no hash algorithm found. Before it would silently return False
+
 ## 1.3.0
 
 New feature and sane defaults. for the CLI the root is now by default excluded, at first it would include it if it found one, but not all certificate authorities provide a link to their root in their certs. This resulted in sometimes a root to be included and othertimes not.

cert_chain_resolver/castore/base_store.py

@@ -5,9 +5,10 @@
 try:
     from typing import TYPE_CHECKING
 
-    if TYPE_CHECKING:
+    if TYPE_CHECKING:  # pragma: no cover
         from cert_chain_resolver.models import Cert
-except ImportError:
+except ImportError:  # pragma: no cover
+
     pass
 
 

cert_chain_resolver/castore/file_system.py

@@ -13,9 +13,9 @@
 try:
     from typing import TYPE_CHECKING
 
-    if TYPE_CHECKING:
+    if TYPE_CHECKING:  # pragma: no cover
         from cert_chain_resolver.models import Cert
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 

cert_chain_resolver/cli.py

@@ -9,7 +9,7 @@
 try:
     from typing import Optional
     from cert_chain_resolver.castore.base_store import CAStore
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 
@@ -133,5 +133,5 @@ def main():
     cli(**cli_args)
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main()

cert_chain_resolver/models.py

@@ -7,6 +7,7 @@
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
 from cryptography.hazmat.primitives.asymmetric.ec import ECDSA, EllipticCurvePublicKey
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
+from cryptography.exceptions import InvalidSignature
 
 
 import binascii
@@ -15,9 +16,9 @@
 try:
     from typing import List, Union, Optional, Type, Iterator, TYPE_CHECKING
 
-    if TYPE_CHECKING:
+    if TYPE_CHECKING:  # pragma: no cover
         import datetime
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 try:
@@ -44,13 +45,8 @@ def __init__(self, x509_obj):
 
     def __repr__(self):
         # type: () -> str
-        try:
-            common_name = self.common_name
-        except MissingCertProperty:
-            common_name = None
-
         return '<Cert common_name="{0}" subject="{1}" issuer="{2}">'.format(
-            common_name, self.subject, self.issuer
+            self.common_name, self.subject, self.issuer
         )
 
     def __eq__(self, other):
@@ -209,7 +205,7 @@ def is_issued_by(self, other):
                     ECDSA(hash_algorithm),
                 )
                 return True
-        except Exception:
+        except InvalidSignature as e:
             pass
 
         return False

cert_chain_resolver/resolver.py

@@ -15,7 +15,7 @@
 try:
     from typing import Any, Optional
     from cert_chain_resolver.castore.base_store import CAStore
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 

cert_chain_resolver/utils.py

@@ -5,10 +5,10 @@
 try:
     from typing import TYPE_CHECKING
 
-    if TYPE_CHECKING:
+    if TYPE_CHECKING:  # pragma: no cover
         from cert_chain_resolver.models import Cert
 
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 

tests/test_api.py

@@ -0,0 +1,18 @@
+from cert_chain_resolver import api
+import pytest
+from cert_chain_resolver.resolver import resolve
+from cert_chain_resolver.models import CertificateChain, Cert
+from cert_chain_resolver.castore.file_system import FileSystemStore
+
+
+@pytest.mark.parametrize(
+    "exported,obj",
+    [
+        ("resolve", resolve),
+        ("CertificateChain", CertificateChain),
+        ("Cert", Cert),
+        ("FileSystemStore", FileSystemStore),
+    ],
+)
+def test_api_exports_right_objects(exported, obj):
+    assert getattr(api, exported) == obj