Allow mirror rsync IPs to be IPv4/IPv6 addresses or networks

This gives us a bunch more flexibility on this field, and now supports
all the options that the rsync config file supports.

Signed-off-by: Dan McGee <dan@archlinux.org>

6 files changed, 138 insertions, 15 deletions

diff --git a/mirrors/admin.py b/mirrors/admin.py
index d6ea395..9c88207 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -1,4 +1,3 @@
-import re
 from urlparse import urlparse, urlunsplit
 
 from django import forms
@@ -36,22 +35,9 @@ class MirrorUrlInlineAdmin(admin.TabularInline):
     extra = 3
 
 
-# ripped off from django.forms.fields, adding netmask ability
-IPV4NM_RE = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}(/(\d|[1-2]\d|3[0-2])){0,1}$')
-
-class IPAddressNetmaskField(forms.fields.RegexField):
-    default_error_messages = {
-        'invalid': u'Enter a valid IPv4 address, possibly including netmask.',
-    }
-
-    def __init__(self, *args, **kwargs):
-        super(IPAddressNetmaskField, self).__init__(IPV4NM_RE, *args, **kwargs)
-
-
 class MirrorRsyncForm(forms.ModelForm):
     class Meta:
         model = MirrorRsync
-    ip = IPAddressNetmaskField(label='IP')
 
 
 class MirrorRsyncInlineAdmin(admin.TabularInline):
diff --git a/mirrors/fields.py b/mirrors/fields.py
new file mode 100644
index 0000000..206c9d7
--- /dev/null
+++ b/mirrors/fields.py
@@ -0,0 +1,49 @@
+from IPy import IP
+
+from django import forms
+from django.core import validators
+from django.core.exceptions import ValidationError
+from django.db import models
+from south.modelsinspector import add_introspection_rules
+
+
+class IPNetworkFormField(forms.Field):
+    def to_python(self, value):
+        if value in validators.EMPTY_VALUES:
+            return None
+        try:
+            value = IP(value)
+        except ValueError as e:
+            raise ValidationError(str(e))
+        return value
+
+
+class IPNetworkField(models.Field):
+    __metaclass__ = models.SubfieldBase
+    description = "IPv4 or IPv6 address or subnet"
+
+    def __init__(self, *args, **kwargs):
+        kwargs['max_length'] = 44
+        super(IPNetworkField, self).__init__(*args, **kwargs)
+
+    def get_internal_type(self):
+        return "IPAddressField"
+
+    def to_python(self, value):
+        if not value:
+            return None
+        return IP(value)
+
+    def get_prep_value(self, value):
+        value = self.to_python(value)
+        if not value:
+            return None
+        return str(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': IPNetworkFormField}
+        defaults.update(kwargs)
+        return super(IPNetworkField, self).formfield(**defaults)
+
+
+add_introspection_rules([], ["^mirrors\.fields\.IPNetworkField"])
diff --git a/mirrors/migrations/0025_auto__chg_field_mirrorrsync_ip.py b/mirrors/migrations/0025_auto__chg_field_mirrorrsync_ip.py
new file mode 100644
index 0000000..b359b63
--- /dev/null
+++ b/mirrors/migrations/0025_auto__chg_field_mirrorrsync_ip.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        if db.backend_name == 'postgres':
+            # For PostgreSQL, because it uses the 'inet' type and not a varchar
+            # column, we need to add an explict 'USING' cast to the SQL
+            # statement. We then execute the alter_column as well to ensure any
+            # of the other side-effects happen.
+            db.execute('ALTER TABLE "mirrors_mirrorrsync" ALTER COLUMN "ip" TYPE inet USING "ip"::inet')
+        db.alter_column(u'mirrors_mirrorrsync', 'ip', self.gf('mirrors.fields.IPNetworkField')(max_length=44))
+
+    def backwards(self, orm):
+        db.alter_column(u'mirrors_mirrorrsync', 'ip', self.gf('django.db.models.fields.CharField')(max_length=44))
+
+    models = {
+        u'mirrors.checklocation': {
+            'Meta': {'ordering': "('hostname', 'source_ip')", 'object_name': 'CheckLocation'},
+            'country': ('django_countries.fields.CountryField', [], {'max_length': '2'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'source_ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'})
+        },
+        u'mirrors.mirror': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Mirror'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
+            'alternate_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'isos': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'rsync_user': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'tier': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
+            'upstream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['mirrors.Mirror']", 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        u'mirrors.mirrorlog': {
+            'Meta': {'object_name': 'MirrorLog'},
+            'check_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'duration': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'error': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_success': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'last_sync': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'location': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'logs'", 'null': 'True', 'to': u"orm['mirrors.CheckLocation']"}),
+            'url': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'logs'", 'to': u"orm['mirrors.MirrorUrl']"})
+        },
+        u'mirrors.mirrorprotocol': {
+            'Meta': {'ordering': "('protocol',)", 'object_name': 'MirrorProtocol'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_download': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'protocol': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '10'})
+        },
+        u'mirrors.mirrorrsync': {
+            'Meta': {'object_name': 'MirrorRsync'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('mirrors.fields.IPNetworkField', [], {'max_length': '44'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rsync_ips'", 'to': u"orm['mirrors.Mirror']"})
+        },
+        u'mirrors.mirrorurl': {
+            'Meta': {'object_name': 'MirrorUrl'},
+            'country': ('django_countries.fields.CountryField', [], {'db_index': 'True', 'max_length': '2', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'has_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'has_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': u"orm['mirrors.Mirror']"}),
+            'protocol': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'on_delete': 'models.PROTECT', 'to': u"orm['mirrors.MirrorProtocol']"}),
+            'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['mirrors']
diff --git a/mirrors/models.py b/mirrors/models.py
index b0da561..791b007 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -6,6 +6,7 @@ from django.db import models
 from django.db.models.signals import pre_save
 from django_countries import CountryField
 
+from .fields import IPNetworkField
 from main.utils import set_created_field
 
 
@@ -105,7 +106,7 @@ class MirrorUrl(models.Model):
 
 class MirrorRsync(models.Model):
     # max length is 40 chars for full-form IPv6 addr + subnet
-    ip = models.CharField("IP", max_length=44)
+    ip = IPNetworkField("IP")
     mirror = models.ForeignKey(Mirror, related_name="rsync_ips")
     created = models.DateTimeField(editable=False)
 
diff --git a/requirements.txt b/requirements.txt
index ab81387..84450c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
 Django==1.5.1
+IPy==0.81
 Markdown==2.3.1
 South==0.7.6
 bencode==1.0
diff --git a/requirements_prod.txt b/requirements_prod.txt
index 08bfc27..cde5f51 100644
--- a/requirements_prod.txt
+++ b/requirements_prod.txt
@@ -1,5 +1,6 @@
 -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
 Django==1.5.1
+IPy==0.81
 Markdown==2.3.1
 South==0.7.6
 bencode==1.0