Skip to content

Commit

Permalink
[change] Updated code to handle various algorithms openwisp#118
Browse files Browse the repository at this point in the history 
Fixes openwisp#118
  • Loading branch information
@praptisharma28
praptisharma28 committed May 21, 2024
1 parent b9699e8 commit 98c5193
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 1 deletion.
19 changes: 18 additions & 1 deletion django_x509/base/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
('sha256', 'SHA256'),
('sha384', 'SHA384'),
('sha512', 'SHA512'),
('ecdsa-with-sha1', 'ECDSA with SHA1'),
('ecdsa-with-sha256', 'ECDSA with SHA256'),
('ecdsa-with-sha384', 'ECDSA with SHA384'),
('ecdsa-with-sha512', 'ECDSA with SHA512'),
('dsaWithSHA1', 'DSA with SHA1'),
('dsaWithSHA256', 'DSA with SHA256'),
('ed25519', 'Ed25519'),
('ed448', 'Ed448'),
)

SIGNATURE_MAPPING = {
Expand All @@ -40,6 +48,15 @@
'sha256WithRSAEncryption': 'sha256',
'sha384WithRSAEncryption': 'sha384',
'sha512WithRSAEncryption': 'sha512',
'ecdsa-with-SHA384': 'sha384',
'ecdsa-with-SHA1': 'sha1',
'ecdsa-with-SHA256': 'sha256',
'ecdsa-with-SHA384': 'sha384',
'ecdsa-with-SHA512': 'sha512',
'dsaWithSHA1': 'sha1',
'dsaWithSHA256': 'sha256',
'ed25519': 'ed25519',
'ed448': 'ed448',
}


Expand Down Expand Up @@ -121,7 +138,7 @@ class BaseX509(models.Model):
help_text=_('bits'),
choices=DIGEST_CHOICES,
default=default_digest_algorithm,
max_length=8,
max_length=20,
)
validity_start = models.DateTimeField(
blank=True, null=True, default=default_validity_start
Expand Down
64 changes: 64 additions & 0 deletions django_x509/migrations/0010_alter_ca_digest_alter_cert_digest.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Generated by Django 4.2.13 on 2024-05-21 18:07

from django.db import migrations, models
import django_x509.base.models


class Migration(migrations.Migration):

dependencies = [
("django_x509", "0009_alter_ca_digest_alter_ca_key_length_and_more"),
]

operations = [
migrations.AlterField(
model_name="ca",
name="digest",
field=models.CharField(
choices=[
("sha1", "SHA1"),
("sha224", "SHA224"),
("sha256", "SHA256"),
("sha384", "SHA384"),
("sha512", "SHA512"),
("ecdsa-with-sha1", "ECDSA with SHA1"),
("ecdsa-with-sha256", "ECDSA with SHA256"),
("ecdsa-with-sha384", "ECDSA with SHA384"),
("ecdsa-with-sha512", "ECDSA with SHA512"),
("dsaWithSHA1", "DSA with SHA1"),
("dsaWithSHA256", "DSA with SHA256"),
("ed25519", "Ed25519"),
("ed448", "Ed448"),
],
default=django_x509.base.models.default_digest_algorithm,
help_text="bits",
max_length=20,
verbose_name="digest algorithm",
),
),
migrations.AlterField(
model_name="cert",
name="digest",
field=models.CharField(
choices=[
("sha1", "SHA1"),
("sha224", "SHA224"),
("sha256", "SHA256"),
("sha384", "SHA384"),
("sha512", "SHA512"),
("ecdsa-with-sha1", "ECDSA with SHA1"),
("ecdsa-with-sha256", "ECDSA with SHA256"),
("ecdsa-with-sha384", "ECDSA with SHA384"),
("ecdsa-with-sha512", "ECDSA with SHA512"),
("dsaWithSHA1", "DSA with SHA1"),
("dsaWithSHA256", "DSA with SHA256"),
("ed25519", "Ed25519"),
("ed448", "Ed448"),
],
default=django_x509.base.models.default_digest_algorithm,
help_text="bits",
max_length=20,
verbose_name="digest algorithm",
),
),
]
30 changes: 30 additions & 0 deletions django_x509/tests/test_ca.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from datetime import datetime, timedelta
from unittest.mock import MagicMock, patch

from django.core.exceptions import ValidationError
from django.test import TestCase
Expand Down Expand Up @@ -680,3 +681,32 @@ def test_ca_without_key_length_and_digest_algo(self):
self.fail(f'Got exception: {e}')
else:
self.fail('ValidationError not raised as expected')

def test_import_with_various_signature_algorithms(self):
algorithms = [
'ecdsa-with-SHA1',
'ecdsa-with-SHA256',
'ecdsa-with-SHA384',
'ecdsa-with-SHA512',
'dsaWithSHA1',
'dsaWithSHA256',
'ed25519',
'ed448',
]

for algo in algorithms:
cert_mock = MagicMock()
cert_mock.get_signature_algorithm.return_value = algo.encode()
cert_mock.get_pubkey.return_value.bits.return_value = '384'
cert_mock.get_notBefore.return_value.decode.return_value = '20240101000000Z'

with patch(
'django_x509.base.models.crypto.load_certificate',
return_value=cert_mock,
):
ca = self._create_ca()

try:
ca.full_clean()
except ValidationError as e:
self.fail(f"Unexpected ValidationError for {algo}: {e}")
89 changes: 89 additions & 0 deletions tests/openwisp2/sample_x509/migrations/0003_alter_ca_digest_alter_cert_digest_and_more.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Generated by Django 4.2.13 on 2024-05-21 18:24

from django.db import migrations, models
import django_x509.base.models


class Migration(migrations.Migration):

dependencies = [
("sample_x509", "0002_common_name_max_length"),
]

operations = [
migrations.AlterField(
model_name="ca",
name="digest",
field=models.CharField(
choices=[
("sha1", "SHA1"),
("sha224", "SHA224"),
("sha256", "SHA256"),
("sha384", "SHA384"),
("sha512", "SHA512"),
("ecdsa-with-sha1", "ECDSA with SHA1"),
("ecdsa-with-sha256", "ECDSA with SHA256"),
("ecdsa-with-sha384", "ECDSA with SHA384"),
("ecdsa-with-sha512", "ECDSA with SHA512"),
("dsaWithSHA1", "DSA with SHA1"),
("dsaWithSHA256", "DSA with SHA256"),
("ed25519", "Ed25519"),
("ed448", "Ed448"),
],
default=django_x509.base.models.default_digest_algorithm,
help_text="bits",
max_length=20,
verbose_name="digest algorithm",
),
),
migrations.AlterField(
model_name="cert",
name="digest",
field=models.CharField(
choices=[
("sha1", "SHA1"),
("sha224", "SHA224"),
("sha256", "SHA256"),
("sha384", "SHA384"),
("sha512", "SHA512"),
("ecdsa-with-sha1", "ECDSA with SHA1"),
("ecdsa-with-sha256", "ECDSA with SHA256"),
("ecdsa-with-sha384", "ECDSA with SHA384"),
("ecdsa-with-sha512", "ECDSA with SHA512"),
("dsaWithSHA1", "DSA with SHA1"),
("dsaWithSHA256", "DSA with SHA256"),
("ed25519", "Ed25519"),
("ed448", "Ed448"),
],
default=django_x509.base.models.default_digest_algorithm,
help_text="bits",
max_length=20,
verbose_name="digest algorithm",
),
),
migrations.AlterField(
model_name="customcert",
name="digest",
field=models.CharField(
choices=[
("sha1", "SHA1"),
("sha224", "SHA224"),
("sha256", "SHA256"),
("sha384", "SHA384"),
("sha512", "SHA512"),
("ecdsa-with-sha1", "ECDSA with SHA1"),
("ecdsa-with-sha256", "ECDSA with SHA256"),
("ecdsa-with-sha384", "ECDSA with SHA384"),
("ecdsa-with-sha512", "ECDSA with SHA512"),
("dsaWithSHA1", "DSA with SHA1"),
("dsaWithSHA256", "DSA with SHA256"),
("ed25519", "Ed25519"),
("ed448", "Ed448"),
],
default=django_x509.base.models.default_digest_algorithm,
help_text="bits",
max_length=20,
verbose_name="digest algorithm",
),
),
]

0 comments on commit 98c5193

Please sign in to comment.