Allow empty IP endpoints for VPN

coin/vpn/migrations/0003_auto__add_testsubscription__chg_field_vpnsubscription_ipv6_endpoint__c.py

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'TestSubscription'
+        db.create_table(u'vpn_testsubscription', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('administrative_subscription', self.gf('django.db.models.fields.related.OneToOneField')(related_name='dsl', unique=True, to=orm['offers.OfferSubscription'])),
+        ))
+        db.send_create_signal(u'vpn', ['TestSubscription'])
+
+
+        # Changing field 'VPNSubscription.ipv6_endpoint'
+        db.alter_column(u'vpn_vpnsubscription', 'ipv6_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True))
+
+        # Changing field 'VPNSubscription.ipv4_endpoint'
+        db.alter_column(u'vpn_vpnsubscription', 'ipv4_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True))
+
+    def backwards(self, orm):
+        # Deleting model 'TestSubscription'
+        db.delete_table(u'vpn_testsubscription')
+
+
+        # User chose to not deal with backwards NULL issues for 'VPNSubscription.ipv6_endpoint'
+        raise RuntimeError("Cannot reverse this migration. 'VPNSubscription.ipv6_endpoint' and its values cannot be restored.")
+        
+        # The following code is provided here to aid in writing a correct migration
+        # Changing field 'VPNSubscription.ipv6_endpoint'
+        db.alter_column(u'vpn_vpnsubscription', 'ipv6_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39))
+
+        # User chose to not deal with backwards NULL issues for 'VPNSubscription.ipv4_endpoint'
+        raise RuntimeError("Cannot reverse this migration. 'VPNSubscription.ipv4_endpoint' and its values cannot be restored.")
+        
+        # The following code is provided here to aid in writing a correct migration
+        # Changing field 'VPNSubscription.ipv4_endpoint'
+        db.alter_column(u'vpn_vpnsubscription', 'ipv4_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39))
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'backend': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'offers.offersubscription': {
+            'Meta': {'object_name': 'OfferSubscription'},
+            'commitment': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'subscription_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
+        },
+        u'vpn.ldapvpnconfig': {
+            'Meta': {'object_name': 'LdapVPNConfig', 'managed': 'False'},
+            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'vpn.testsubscription': {
+            'Meta': {'object_name': 'TestSubscription'},
+            'administrative_subscription': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'dsl'", 'unique': 'True', 'to': u"orm['offers.OfferSubscription']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'vpn.vpnsubscription': {
+            'Meta': {'object_name': 'VPNSubscription'},
+            'activated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'administrative_subscription': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'vpn'", 'unique': 'True', 'to': u"orm['offers.OfferSubscription']"}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipv4_endpoint': ('netfields.fields.InetAddressField', [], {'max_length': '39', 'null': 'True'}),
+            'ipv6_endpoint': ('netfields.fields.InetAddressField', [], {'max_length': '39', 'null': 'True'}),
+            'login': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['vpn']

coin/vpn/models.py

@@ -19,14 +19,20 @@ def validate_v6(address):
         raise ValidationError('{} is not an IPv6 address'.format(address))
 
 
+def str_or_none(obj):
+    return str(obj) if obj else None
+
+
 class VPNSubscription(CoinLdapSyncModel):
     administrative_subscription = models.OneToOneField('offers.OfferSubscription')
     # TODO: do some access control to prevent the user from changing this field
     activated = models.BooleanField(default=False)
     login = models.CharField(max_length=50)
     password = models.CharField(max_length=256)
-    ipv4_endpoint = InetAddressField(validators=[validate_v4], blank=True)
-    ipv6_endpoint = InetAddressField(validators=[validate_v6], blank=True)
+    ipv4_endpoint = InetAddressField(validators=[validate_v4], blank=True,
+                                     null=True)
+    ipv6_endpoint = InetAddressField(validators=[validate_v6], blank=True,
+                                     null=True)
     comment = models.CharField(blank=True, max_length=512)
 
     objects = NetManager()
@@ -43,8 +49,8 @@ class VPNSubscription(CoinLdapSyncModel):
         config.login = config.sn = self.login
         config.password = self.password
         config.active = 'yes' if self.activated else 'no'
-        config.ipv4_endpoint = str(self.ipv4_endpoint)
-        config.ipv6_endpoint = str(self.ipv6_endpoint)
+        config.ipv4_endpoint = str_or_none(self.ipv4_endpoint)
+        config.ipv6_endpoint = str_or_none(self.ipv6_endpoint)
         config.ranges_v4 = [str(s) for s in self.get_subnets(4)]
         config.ranges_v6 = [str(s) for s in self.get_subnets(6)]
         config.save()
@@ -62,15 +68,9 @@ class VPNSubscription(CoinLdapSyncModel):
         if self.pk is None:
             subnets_v4 = [s for s in subnets if s.inet.version == 4]
             subnets_v6 = [s for s in subnets if s.inet.version == 6]
-            if self.ipv4_endpoint is None:
-                if len(subnets_v4) == 0:
-                    # TODO: should we fail silently instead?
-                    raise ValidationError('No IPv4 subnet defined, needed to choose an endpoint from')
+            if self.ipv4_endpoint is None and len(subnets_v4) > 0:
                 self.ipv4_endpoint = subnets_v4[0].inet.ip
-            if self.ipv6_endpoint is None:
-                if len(subnets_v6) == 0:
-                    # TODO: should we fail silently instead?
-                    raise ValidationError('No IPv6 subnet defined, needed to choose an endpoint from')
+            if self.ipv6_endpoint is None and len(subnets_v6) > 0:
                 # With v6, we choose the second host of the subnet (cafe::1)
                 gen = subnets_v6[0].inet.iter_hosts()
                 gen.next()