GenericIPAddressField does not pass protocol to formfield()

[Jeffrey Knockel]

If we have a model containing a GenericIPAddressField specifying a protocol...

class MyModel(models.Model):
    host = models.GenericIPAddressField(protocol='IPv4')
    . . .

And a ModelForm wrapping it...

class MyForm(forms.ModelForm):
    class Meta:
        model = models.MyModel
    . . .

Then that form can give a misleading error message after validation. For instance, with the example above, if you input, e.g., "bletch", you get the error message "Enter a valid IPv4 or IPv6 address", even though IPv6 addresses are not allowed. (However, if you input, e.g., "::1", you get the accurate message "Enter a valid IPv4 address".)

It seems like GenericIPAddressField doesn't pass its protocol in its formfield() method, so the GenericIPAddressField form field first uses a more general validation rule than the GenericIPAddressField model field. I'm attaching a patch which fixes this issue in my application.

[Tim Graham]

Could you add a test for this?

[Jeffrey Knockel]

Pass protocol in formfield() method plus tests

[Jeffrey Knockel]

Sure, I've just attached a patch including tests.

[Tim Graham <timograham@…>]

In f2cb94f1c0dc98663e7d493411bf9b82d1894559:

Fixed #20740 -- GenericIPAddressField should pass protocol to formfield()

Thanks Jeff250.

[Tim Graham <timograham@…>]

In 45fab74561a2b339cde922c196ab3ccf998bad10:

[1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield()

Thanks Jeff250.

Backport of f2cb94f1c0 from master

[Jeffrey Knockel]

Additional patch required for 1.6.x backport

[Jeffrey Knockel]

Tim, the 1.6.x backport isn't quite right, since the 1.6.x constructor doesn't already set self.protocol. I've attached a trivial patch against 1.6.x that should fix it.

[Tim Graham]

Thanks Jeff.