diff options
19 files changed, 93 insertions, 751 deletions
diff --git a/rpki/gui/app/migrations/0001_initial.py b/rpki/gui/app/migrations/0001_initial.py index 73884581..79d21324 100644 --- a/rpki/gui/app/migrations/0001_initial.py +++ b/rpki/gui/app/migrations/0001_initial.py @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('irdb', '0005_auto_20151023_2151'), + ('irdb', '0001_initial'), ('routeview', '__first__'), ] @@ -98,8 +98,8 @@ class Migration(migrations.Migration): name='ResourceRangeAS', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('min', models.PositiveIntegerField()), - ('max', models.PositiveIntegerField()), + ('min', models.BigIntegerField(validators=[rpki.gui.models.validate_asn])), + ('max', models.BigIntegerField(validators=[rpki.gui.models.validate_asn])), ('cert', models.ForeignKey(related_name='asn_ranges', to='app.ResourceCert')), ], options={ diff --git a/rpki/gui/models.py b/rpki/gui/models.py index b327333c..4d56c18e 100644 --- a/rpki/gui/models.py +++ b/rpki/gui/models.py @@ -19,6 +19,7 @@ Common classes for reuse in apps. __version__ = '$Id$' from django.db import models +from django.core.exceptions import ValidationError import rpki.resource_set import rpki.POW @@ -145,13 +146,18 @@ class PrefixV6(Prefix): abstract = True +def validate_asn(value): + if value < 0 or value > 0xFFFFFFFFL: + raise ValidationError('%s is not valid autonomous sequence number' % value) + + class ASN(models.Model): """Represents a range of ASNs. This model is abstract, and is intended to be reused by applications.""" - min = models.PositiveIntegerField(null=False) - max = models.PositiveIntegerField(null=False) + min = models.BigIntegerField(null=False, validators=[validate_asn]) + max = models.BigIntegerField(null=False, validators=[validate_asn]) class Meta: abstract = True diff --git a/rpki/irdb/migrations/0001_initial.py b/rpki/irdb/migrations/0001_initial.py index d10b62d3..019328b3 100644 --- a/rpki/irdb/migrations/0001_initial.py +++ b/rpki/irdb/migrations/0001_initial.py @@ -16,9 +16,9 @@ class Migration(migrations.Migration): name='BSC', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ('handle', rpki.irdb.models.HandleField(max_length=120)), - ('pkcs10', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)), + ('pkcs10', rpki.fields.PKCS10Field()), ], options={ 'abstract': False, @@ -28,9 +28,9 @@ class Migration(migrations.Migration): name='Child', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ('handle', rpki.irdb.models.HandleField(max_length=120)), - ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('ta', rpki.fields.CertificateField()), ('valid_until', rpki.fields.SundialField()), ('name', models.TextField(null=True, blank=True)), ], @@ -58,11 +58,10 @@ class Migration(migrations.Migration): name='Client', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ('handle', rpki.irdb.models.HandleField(max_length=120)), - ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('ta', rpki.fields.CertificateField()), ('sia_base', models.TextField()), - ('parent_handle', rpki.irdb.models.HandleField(max_length=120)), ], ), migrations.CreateModel( @@ -70,7 +69,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('valid_until', rpki.fields.SundialField()), - ('pkcs10', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)), + ('pkcs10', rpki.fields.PKCS10Field()), ('gski', models.CharField(max_length=27)), ('cn', models.CharField(max_length=64)), ('sn', models.CharField(max_length=64)), @@ -107,15 +106,15 @@ class Migration(migrations.Migration): name='HostedCA', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ], ), migrations.CreateModel( name='Referral', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), + ('private_key', rpki.fields.RSAPrivateKeyField()), ], options={ 'abstract': False, @@ -125,21 +124,22 @@ class Migration(migrations.Migration): name='Repository', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ('handle', rpki.irdb.models.HandleField(max_length=120)), - ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('ta', rpki.fields.CertificateField()), ('client_handle', rpki.irdb.models.HandleField(max_length=120)), ('service_uri', models.CharField(max_length=255)), ('sia_base', models.TextField()), + ('rrdp_notification_uri', models.TextField(null=True)), ], ), migrations.CreateModel( name='ResourceHolderCA', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)), - ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), + ('private_key', rpki.fields.RSAPrivateKeyField()), + ('latest_crl', rpki.fields.CRLField()), ('next_serial', models.BigIntegerField(default=1)), ('next_crl_number', models.BigIntegerField(default=1)), ('last_crl_update', rpki.fields.SundialField()), @@ -186,9 +186,9 @@ class Migration(migrations.Migration): name='ServerCA', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)), - ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), + ('private_key', rpki.fields.RSAPrivateKeyField()), + ('latest_crl', rpki.fields.CRLField()), ('next_serial', models.BigIntegerField(default=1)), ('next_crl_number', models.BigIntegerField(default=1)), ('last_crl_update', rpki.fields.SundialField()), @@ -202,8 +202,8 @@ class Migration(migrations.Migration): name='ServerEE', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), + ('private_key', rpki.fields.RSAPrivateKeyField()), ('purpose', rpki.fields.EnumField(choices=[(1, b'rpkid'), (2, b'pubd'), (3, b'irdbd'), (4, b'irbe')])), ('issuer', models.ForeignKey(related_name='ee_certificates', to='irdb.ServerCA')), ], @@ -232,14 +232,14 @@ class Migration(migrations.Migration): name='Parent', fields=[ ('turtle_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='irdb.Turtle')), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), ('handle', rpki.irdb.models.HandleField(max_length=120)), - ('ta', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('ta', rpki.fields.CertificateField()), ('parent_handle', rpki.irdb.models.HandleField(max_length=120)), ('child_handle', rpki.irdb.models.HandleField(max_length=120)), ('repository_type', rpki.fields.EnumField(choices=[(1, b'none'), (2, b'offer'), (3, b'referral')])), ('referrer', rpki.irdb.models.HandleField(max_length=120, null=True, blank=True)), - ('referral_authorization', rpki.irdb.models.SignedReferralField(default=None, serialize=False, null=True, blank=True)), + ('referral_authorization', rpki.irdb.models.SignedReferralField(null=True)), ('issuer', models.ForeignKey(related_name='parents', to='irdb.ResourceHolderCA')), ], bases=('irdb.turtle', models.Model), @@ -248,8 +248,8 @@ class Migration(migrations.Migration): name='Rootd', fields=[ ('turtle_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='irdb.Turtle')), - ('certificate', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('private_key', rpki.fields.KeyField(default=None, serialize=False, blank=True)), + ('certificate', rpki.fields.CertificateField()), + ('private_key', rpki.fields.RSAPrivateKeyField()), ('issuer', models.OneToOneField(related_name='rootd', to='irdb.ResourceHolderCA')), ], options={ diff --git a/rpki/irdb/migrations/0002_remove_client_parent_handle.py b/rpki/irdb/migrations/0002_remove_client_parent_handle.py deleted file mode 100644 index f86d165d..00000000 --- a/rpki/irdb/migrations/0002_remove_client_parent_handle.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('irdb', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='client', - name='parent_handle', - ), - ] diff --git a/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py b/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py deleted file mode 100644 index 1e0e43c2..00000000 --- a/rpki/irdb/migrations/0003_repository_rrdp_notification_uri.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('irdb', '0002_remove_client_parent_handle'), - ] - - operations = [ - migrations.AddField( - model_name='repository', - name='rrdp_notification_uri', - field=models.TextField(null=True), - ), - ] diff --git a/rpki/irdb/migrations/0004_auto_20151018_1603.py b/rpki/irdb/migrations/0004_auto_20151018_1603.py deleted file mode 100644 index 645d1eaa..00000000 --- a/rpki/irdb/migrations/0004_auto_20151018_1603.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('irdb', '0003_repository_rrdp_notification_uri'), - ] - - operations = [ - migrations.AlterField( - model_name='referral', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - migrations.AlterField( - model_name='resourceholderca', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - migrations.AlterField( - model_name='rootd', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - migrations.AlterField( - model_name='serverca', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - migrations.AlterField( - model_name='serveree', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - ] diff --git a/rpki/irdb/migrations/0005_auto_20151023_2151.py b/rpki/irdb/migrations/0005_auto_20151023_2151.py deleted file mode 100644 index 7d16e7a0..00000000 --- a/rpki/irdb/migrations/0005_auto_20151023_2151.py +++ /dev/null @@ -1,141 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.irdb.models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('irdb', '0004_auto_20151018_1603'), - ] - - operations = [ - migrations.AlterField( - model_name='bsc', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='bsc', - name='pkcs10', - field=rpki.fields.PKCS10Field(), - ), - migrations.AlterField( - model_name='child', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='child', - name='ta', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='client', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='client', - name='ta', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='eecertificaterequest', - name='pkcs10', - field=rpki.fields.PKCS10Field(), - ), - migrations.AlterField( - model_name='hostedca', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='parent', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='parent', - name='referral_authorization', - field=rpki.irdb.models.SignedReferralField(null=True, blank=True), - ), - migrations.AlterField( - model_name='parent', - name='ta', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='referral', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='referral', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(), - ), - migrations.AlterField( - model_name='repository', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='repository', - name='ta', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='resourceholderca', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='resourceholderca', - name='latest_crl', - field=rpki.fields.CRLField(), - ), - migrations.AlterField( - model_name='resourceholderca', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(), - ), - migrations.AlterField( - model_name='rootd', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='rootd', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(), - ), - migrations.AlterField( - model_name='serverca', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='serverca', - name='latest_crl', - field=rpki.fields.CRLField(), - ), - migrations.AlterField( - model_name='serverca', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(), - ), - migrations.AlterField( - model_name='serveree', - name='certificate', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='serveree', - name='private_key', - field=rpki.fields.RSAPrivateKeyField(), - ), - ] diff --git a/rpki/pubdb/migrations/0001_initial.py b/rpki/pubdb/migrations/0001_initial.py index 4f312844..e278d7dd 100644 --- a/rpki/pubdb/migrations/0001_initial.py +++ b/rpki/pubdb/migrations/0001_initial.py @@ -17,8 +17,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('client_handle', models.CharField(unique=True, max_length=255)), ('base_uri', models.TextField()), - ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), + ('bpki_cert', rpki.fields.CertificateField()), + ('bpki_glue', rpki.fields.CertificateField(null=True)), ('last_cms_timestamp', rpki.fields.SundialField(null=True, blank=True)), ], ), @@ -37,7 +37,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('uri', models.CharField(max_length=255)), - ('der', rpki.fields.BlobField(default=None, serialize=False, blank=True)), + ('der', models.BinaryField()), ('hash', models.CharField(max_length=64)), ('client', models.ForeignKey(to='pubdb.Client')), ], diff --git a/rpki/pubdb/migrations/0002_auto_20151023_2151.py b/rpki/pubdb/migrations/0002_auto_20151023_2151.py deleted file mode 100644 index ae354a9b..00000000 --- a/rpki/pubdb/migrations/0002_auto_20151023_2151.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('pubdb', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='client', - name='bpki_cert', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='client', - name='bpki_glue', - field=rpki.fields.CertificateField(null=True), - ), - ] diff --git a/rpki/pubdb/migrations/0003_auto_20151025_1757.py b/rpki/pubdb/migrations/0003_auto_20151025_1757.py deleted file mode 100644 index f92cc419..00000000 --- a/rpki/pubdb/migrations/0003_auto_20151025_1757.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('pubdb', '0002_auto_20151023_2151'), - ] - - operations = [ - migrations.AlterField( - model_name='publishedobject', - name='der', - field=models.BinaryField(), - ), - ] diff --git a/rpki/rpkidb/migrations/0001_initial.py b/rpki/rpkidb/migrations/0001_initial.py index f88f0cdd..a313ba63 100644 --- a/rpki/rpkidb/migrations/0001_initial.py +++ b/rpki/rpkidb/migrations/0001_initial.py @@ -16,11 +16,11 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('bsc_handle', models.SlugField(max_length=255)), - ('private_key_id', rpki.fields.KeyField(default=None, serialize=False, blank=True)), - ('pkcs10_request', rpki.fields.PKCS10Field(default=None, serialize=False, blank=True)), - ('hash_alg', rpki.fields.EnumField(choices=[(1, 'sha256')])), - ('signing_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('signing_cert_crl', rpki.fields.CRLField(default=None, serialize=False, null=True, blank=True)), + ('private_key_id', rpki.fields.RSAPrivateKeyField()), + ('pkcs10_request', rpki.fields.PKCS10Field()), + ('hash_alg', rpki.fields.EnumField(default='sha256', choices=[(1, 'sha256')])), + ('signing_cert', rpki.fields.CertificateField(null=True)), + ('signing_cert_crl', rpki.fields.CRLField(null=True)), ], ), migrations.CreateModel( @@ -40,15 +40,15 @@ class Migration(migrations.Migration): name='CADetail', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('public_key', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)), - ('private_key_id', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)), - ('latest_crl', rpki.fields.CRLField(default=None, serialize=False, null=True, blank=True)), + ('public_key', rpki.fields.PublicKeyField(null=True)), + ('private_key_id', rpki.fields.RSAPrivateKeyField(null=True)), + ('latest_crl', rpki.fields.CRLField(null=True)), ('crl_published', rpki.fields.SundialField(null=True)), - ('latest_ca_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('manifest_private_key_id', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)), - ('manifest_public_key', rpki.fields.KeyField(default=None, serialize=False, null=True, blank=True)), - ('latest_manifest_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('latest_manifest', rpki.fields.ManifestField(default=None, serialize=False, null=True, blank=True)), + ('latest_ca_cert', rpki.fields.CertificateField(null=True)), + ('manifest_private_key_id', rpki.fields.RSAPrivateKeyField(null=True)), + ('manifest_public_key', rpki.fields.PublicKeyField(null=True)), + ('latest_manifest_cert', rpki.fields.CertificateField(null=True)), + ('latest_manifest', rpki.fields.ManifestField(null=True)), ('manifest_published', rpki.fields.SundialField(null=True)), ('state', rpki.fields.EnumField(choices=[(1, 'pending'), (2, 'active'), (3, 'deprecated'), (4, 'revoked')])), ('ca_cert_uri', models.TextField(null=True)), @@ -60,8 +60,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('child_handle', models.SlugField(max_length=255)), - ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), + ('bpki_cert', rpki.fields.CertificateField(null=True)), + ('bpki_glue', rpki.fields.CertificateField(null=True)), ('last_cms_timestamp', rpki.fields.SundialField(null=True)), ('bsc', models.ForeignKey(related_name='children', to='rpkidb.BSC')), ], @@ -70,21 +70,21 @@ class Migration(migrations.Migration): name='ChildCert', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('cert', rpki.fields.CertificateField()), ('published', rpki.fields.SundialField(null=True)), - ('ski', rpki.fields.BlobField(default=None, serialize=False, blank=True)), + ('gski', models.CharField(max_length=27)), ('ca_detail', models.ForeignKey(related_name='child_certs', to='rpkidb.CADetail')), ('child', models.ForeignKey(related_name='child_certs', to='rpkidb.Child')), ], ), migrations.CreateModel( - name='EECert', + name='EECertificate', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('ski', rpki.fields.BlobField(default=None, serialize=False, blank=True)), - ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), + ('gski', models.CharField(max_length=27)), + ('cert', rpki.fields.CertificateField()), ('published', rpki.fields.SundialField(null=True)), - ('ca_detail', models.ForeignKey(related_name='ee_certs', to='rpkidb.CADetail')), + ('ca_detail', models.ForeignKey(related_name='ee_certificates', to='rpkidb.CADetail')), ], ), migrations.CreateModel( @@ -92,8 +92,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('vcard', models.TextField()), - ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('ghostbuster', rpki.fields.GhostbusterField(default=None, serialize=False, blank=True)), + ('cert', rpki.fields.CertificateField()), + ('ghostbuster', rpki.fields.GhostbusterField()), ('published', rpki.fields.SundialField(null=True)), ('ca_detail', models.ForeignKey(related_name='ghostbusters', to='rpkidb.CADetail')), ], @@ -103,8 +103,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('parent_handle', models.SlugField(max_length=255)), - ('bpki_cms_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('bpki_cms_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), + ('bpki_cert', rpki.fields.CertificateField(null=True)), + ('bpki_glue', rpki.fields.CertificateField(null=True)), ('peer_contact_uri', models.TextField(null=True)), ('sia_base', models.TextField(null=True)), ('sender_name', models.TextField(null=True)), @@ -119,8 +119,9 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('repository_handle', models.SlugField(max_length=255)), ('peer_contact_uri', models.TextField(null=True)), - ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), + ('rrdp_notification_uri', models.TextField(null=True)), + ('bpki_cert', rpki.fields.CertificateField(null=True)), + ('bpki_glue', rpki.fields.CertificateField(null=True)), ('last_cms_timestamp', rpki.fields.SundialField(null=True)), ('bsc', models.ForeignKey(related_name='repositories', to='rpkidb.BSC')), ], @@ -142,33 +143,33 @@ class Migration(migrations.Migration): ('asn', models.BigIntegerField()), ('ipv4', models.TextField(null=True)), ('ipv6', models.TextField(null=True)), - ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('roa', rpki.fields.ROAField(default=None, serialize=False, blank=True)), + ('cert', rpki.fields.CertificateField()), + ('roa', rpki.fields.ROAField()), ('published', rpki.fields.SundialField(null=True)), ('ca_detail', models.ForeignKey(related_name='roas', to='rpkidb.CADetail')), ], ), migrations.CreateModel( - name='Self', + name='Tenant', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('self_handle', models.SlugField(max_length=255)), + ('tenant_handle', models.SlugField(max_length=255)), ('use_hsm', models.BooleanField(default=False)), ('crl_interval', models.BigIntegerField(null=True)), ('regen_margin', models.BigIntegerField(null=True)), - ('bpki_cert', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), - ('bpki_glue', rpki.fields.CertificateField(default=None, serialize=False, null=True, blank=True)), + ('bpki_cert', rpki.fields.CertificateField(null=True)), + ('bpki_glue', rpki.fields.CertificateField(null=True)), ], ), migrations.AddField( model_name='roa', - name='self', - field=models.ForeignKey(related_name='roas', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='roas', to='rpkidb.Tenant'), ), migrations.AddField( model_name='repository', - name='self', - field=models.ForeignKey(related_name='repositories', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='repositories', to='rpkidb.Tenant'), ), migrations.AddField( model_name='parent', @@ -177,23 +178,23 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='parent', - name='self', - field=models.ForeignKey(related_name='parents', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='parents', to='rpkidb.Tenant'), ), migrations.AddField( model_name='ghostbuster', - name='self', - field=models.ForeignKey(related_name='ghostbusters', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='ghostbusters', to='rpkidb.Tenant'), ), migrations.AddField( - model_name='eecert', - name='self', - field=models.ForeignKey(related_name='ee_certs', to='rpkidb.Self'), + model_name='eecertificate', + name='tenant', + field=models.ForeignKey(related_name='ee_certificates', to='rpkidb.Tenant'), ), migrations.AddField( model_name='child', - name='self', - field=models.ForeignKey(related_name='children', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='children', to='rpkidb.Tenant'), ), migrations.AddField( model_name='ca', @@ -202,23 +203,23 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='bsc', - name='self', - field=models.ForeignKey(related_name='bscs', to='rpkidb.Self'), + name='tenant', + field=models.ForeignKey(related_name='bscs', to='rpkidb.Tenant'), ), migrations.AlterUniqueTogether( name='repository', - unique_together=set([('self', 'repository_handle')]), + unique_together=set([('tenant', 'repository_handle')]), ), migrations.AlterUniqueTogether( name='parent', - unique_together=set([('self', 'parent_handle')]), + unique_together=set([('tenant', 'parent_handle')]), ), migrations.AlterUniqueTogether( name='child', - unique_together=set([('self', 'child_handle')]), + unique_together=set([('tenant', 'child_handle')]), ), migrations.AlterUniqueTogether( name='bsc', - unique_together=set([('self', 'bsc_handle')]), + unique_together=set([('tenant', 'bsc_handle')]), ), ] diff --git a/rpki/rpkidb/migrations/0002_auto_20151015_2213.py b/rpki/rpkidb/migrations/0002_auto_20151015_2213.py deleted file mode 100644 index f602b42b..00000000 --- a/rpki/rpkidb/migrations/0002_auto_20151015_2213.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='parent', - old_name='bpki_cms_cert', - new_name='bpki_cert', - ), - migrations.RenameField( - model_name='parent', - old_name='bpki_cms_glue', - new_name='bpki_glue', - ), - migrations.AddField( - model_name='repository', - name='rrdp_notification_uri', - field=models.TextField(null=True), - ), - ] diff --git a/rpki/rpkidb/migrations/0003_auto_20151018_1600.py b/rpki/rpkidb/migrations/0003_auto_20151018_1600.py deleted file mode 100644 index c730ab1a..00000000 --- a/rpki/rpkidb/migrations/0003_auto_20151018_1600.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0002_auto_20151015_2213'), - ] - - operations = [ - migrations.AlterField( - model_name='bsc', - name='hash_alg', - field=rpki.fields.EnumField(default='sha256', choices=[(1, 'sha256')]), - ), - migrations.AlterField( - model_name='cadetail', - name='manifest_public_key', - field=rpki.fields.PublicKeyField(default=None, serialize=False, null=True, blank=True), - ), - migrations.AlterField( - model_name='cadetail', - name='public_key', - field=rpki.fields.PublicKeyField(default=None, serialize=False, null=True, blank=True), - ), - ] diff --git a/rpki/rpkidb/migrations/0004_auto_20151018_1602.py b/rpki/rpkidb/migrations/0004_auto_20151018_1602.py deleted file mode 100644 index 15942ae7..00000000 --- a/rpki/rpkidb/migrations/0004_auto_20151018_1602.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0003_auto_20151018_1600'), - ] - - operations = [ - migrations.AlterField( - model_name='bsc', - name='private_key_id', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, blank=True), - ), - migrations.AlterField( - model_name='cadetail', - name='manifest_private_key_id', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, null=True, blank=True), - ), - migrations.AlterField( - model_name='cadetail', - name='private_key_id', - field=rpki.fields.RSAPrivateKeyField(default=None, serialize=False, null=True, blank=True), - ), - ] diff --git a/rpki/rpkidb/migrations/0005_auto_20151018_1613.py b/rpki/rpkidb/migrations/0005_auto_20151018_1613.py deleted file mode 100644 index 04d86ebb..00000000 --- a/rpki/rpkidb/migrations/0005_auto_20151018_1613.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0004_auto_20151018_1602'), - ] - - operations = [ - migrations.CreateModel( - name='EECertificate', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('ski', rpki.fields.BlobField(default=None, serialize=False, blank=True)), - ('cert', rpki.fields.CertificateField(default=None, serialize=False, blank=True)), - ('published', rpki.fields.SundialField(null=True)), - ('ca_detail', models.ForeignKey(related_name='ee_certificatess', to='rpkidb.CADetail')), - ('self', models.ForeignKey(related_name='ee_certificatess', to='rpkidb.Self')), - ], - ), - migrations.RemoveField( - model_name='eecert', - name='ca_detail', - ), - migrations.RemoveField( - model_name='eecert', - name='self', - ), - migrations.DeleteModel( - name='EECert', - ), - ] diff --git a/rpki/rpkidb/migrations/0006_auto_20151019_0032.py b/rpki/rpkidb/migrations/0006_auto_20151019_0032.py deleted file mode 100644 index b07d64cc..00000000 --- a/rpki/rpkidb/migrations/0006_auto_20151019_0032.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0005_auto_20151018_1613'), - ] - - operations = [ - migrations.AlterField( - model_name='eecertificate', - name='ca_detail', - field=models.ForeignKey(related_name='ee_certificates', to='rpkidb.CADetail'), - ), - migrations.AlterField( - model_name='eecertificate', - name='self', - field=models.ForeignKey(related_name='ee_certificates', to='rpkidb.Self'), - ), - ] diff --git a/rpki/rpkidb/migrations/0007_auto_20151020_1345.py b/rpki/rpkidb/migrations/0007_auto_20151020_1345.py deleted file mode 100644 index b4682b14..00000000 --- a/rpki/rpkidb/migrations/0007_auto_20151020_1345.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0006_auto_20151019_0032'), - ] - - operations = [ - migrations.RenameModel( - old_name='Self', - new_name='Tenant', - ), - migrations.RenameField( - model_name='bsc', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='child', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='eecertificate', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='ghostbuster', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='parent', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='repository', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='roa', - old_name='self', - new_name='tenant', - ), - migrations.RenameField( - model_name='tenant', - old_name='self_handle', - new_name='tenant_handle', - ), - migrations.AlterUniqueTogether( - name='bsc', - unique_together=set([('tenant', 'bsc_handle')]), - ), - migrations.AlterUniqueTogether( - name='child', - unique_together=set([('tenant', 'child_handle')]), - ), - migrations.AlterUniqueTogether( - name='parent', - unique_together=set([('tenant', 'parent_handle')]), - ), - migrations.AlterUniqueTogether( - name='repository', - unique_together=set([('tenant', 'repository_handle')]), - ), - ] diff --git a/rpki/rpkidb/migrations/0008_auto_20151023_2151.py b/rpki/rpkidb/migrations/0008_auto_20151023_2151.py deleted file mode 100644 index 415cda5f..00000000 --- a/rpki/rpkidb/migrations/0008_auto_20151023_2151.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import rpki.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0007_auto_20151020_1345'), - ] - - operations = [ - migrations.AlterField( - model_name='bsc', - name='pkcs10_request', - field=rpki.fields.PKCS10Field(), - ), - migrations.AlterField( - model_name='bsc', - name='private_key_id', - field=rpki.fields.RSAPrivateKeyField(), - ), - migrations.AlterField( - model_name='bsc', - name='signing_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='bsc', - name='signing_cert_crl', - field=rpki.fields.CRLField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='latest_ca_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='latest_crl', - field=rpki.fields.CRLField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='latest_manifest', - field=rpki.fields.ManifestField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='latest_manifest_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='manifest_private_key_id', - field=rpki.fields.RSAPrivateKeyField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='manifest_public_key', - field=rpki.fields.PublicKeyField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='private_key_id', - field=rpki.fields.RSAPrivateKeyField(null=True), - ), - migrations.AlterField( - model_name='cadetail', - name='public_key', - field=rpki.fields.PublicKeyField(null=True), - ), - migrations.AlterField( - model_name='child', - name='bpki_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='child', - name='bpki_glue', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='childcert', - name='cert', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='eecertificate', - name='cert', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='ghostbuster', - name='cert', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='ghostbuster', - name='ghostbuster', - field=rpki.fields.GhostbusterField(), - ), - migrations.AlterField( - model_name='parent', - name='bpki_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='parent', - name='bpki_glue', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='repository', - name='bpki_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='repository', - name='bpki_glue', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='roa', - name='cert', - field=rpki.fields.CertificateField(), - ), - migrations.AlterField( - model_name='roa', - name='roa', - field=rpki.fields.ROAField(), - ), - migrations.AlterField( - model_name='tenant', - name='bpki_cert', - field=rpki.fields.CertificateField(null=True), - ), - migrations.AlterField( - model_name='tenant', - name='bpki_glue', - field=rpki.fields.CertificateField(null=True), - ), - ] diff --git a/rpki/rpkidb/migrations/0009_auto_20151025_1804.py b/rpki/rpkidb/migrations/0009_auto_20151025_1804.py deleted file mode 100644 index 9ffc0650..00000000 --- a/rpki/rpkidb/migrations/0009_auto_20151025_1804.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('rpkidb', '0008_auto_20151023_2151'), - ] - - operations = [ - migrations.RemoveField( - model_name='childcert', - name='ski', - ), - migrations.RemoveField( - model_name='eecertificate', - name='ski', - ), - migrations.AddField( - model_name='childcert', - name='gski', - field=models.CharField(default='fred', max_length=27), - preserve_default=False, - ), - migrations.AddField( - model_name='eecertificate', - name='gski', - field=models.CharField(default='wilma', max_length=27), - preserve_default=False, - ), - ] |