[Rt-commit] rt branch, 4.0/ipv6-unspecified-address-fix, updated. rt-4.0.0-181-g304fac9

[? sunnavy]

The branch, 4.0/ipv6-unspecified-address-fix has been updated
       via  304fac9762985dd548ee55b122f7ff09ee16325a (commit)
      from  17d801a77e2e7e493e27f99bfa08690f9b637fef (commit)

Summary of changes:
 lib/RT/ObjectCustomFieldValue.pm |    1 +
 t/customfields/iprangev6.t       |    7 ++++---
 t/customfields/ipv6.t            |    5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 304fac9762985dd548ee55b122f7ff09ee16325a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 5 09:48:02 2011 +0800

    "::" is valid ipv6, we should allow that

diff --git a/lib/RT/ObjectCustomFieldValue.pm b/lib/RT/ObjectCustomFieldValue.pm
index 4d6942c..893af32 100644
--- a/lib/RT/ObjectCustomFieldValue.pm
+++ b/lib/RT/ObjectCustomFieldValue.pm
@@ -57,6 +57,7 @@ use Regexp::IPv6 qw($IPv6_re);
 use Regexp::Common::net::CIDR;
 require Net::CIDR;
 
+my $IPv6_re = qr/(?:$IPv6_re|::)/;
 
 
 
diff --git a/t/customfields/iprangev6.t b/t/customfields/iprangev6.t
index 06b59e4..d823dd6 100644
--- a/t/customfields/iprangev6.t
+++ b/t/customfields/iprangev6.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 155;
+use RT::Test tests => 158;
 
 my ($baseurl, $agent) =RT::Test->started_ok;
 ok( $agent->login, 'log in' );
@@ -11,7 +11,7 @@ ok( $agent->login, 'log in' );
 my $q = RT::Queue->new($RT::SystemUser);
 $q->Load('General');
 my $ip_cf = RT::CustomField->new($RT::SystemUser);
-        
+
 my ($val,$msg) = $ip_cf->Create(Name => 'IP', Type =>'IPAddressRange', LookupType => 'RT::Queue-RT::Ticket');
 ok($val,$msg);
 my $cf_id = $val;
@@ -47,6 +47,7 @@ my %valid = (
     'abcd::034'          => 'abcd:' . '0000:' x 6 . '0034',
     'abcd::192.168.1.1'  => 'abcd:' . '0000:' x 5 . 'c0a8:0101',
     '::192.168.1.1'      => '0000:' x 6 . 'c0a8:0101',
+    '::'                 => '0000:' x 7 . '0000',
 );
 
 diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
@@ -182,7 +183,7 @@ diag "check that we parse correct IPs only" if $ENV{'TEST_VERBOSE'};
 
     my $cf_field = "Object-RT::Ticket--CustomField-$cf_id-Values";
     my @invalid =
-      ( '::', 'abcd:', 'efgh', 'abcd:' x 8 . 'abcd', 'abcd::abcd::abcd' );
+      ( 'abcd:', 'efgh', 'abcd:' x 8 . 'abcd', 'abcd::abcd::abcd' );
     for my $invalid (@invalid) {
         ok $agent->goto_create_ticket($q), "go to create ticket";
         $agent->submit_form(
diff --git a/t/customfields/ipv6.t b/t/customfields/ipv6.t
index 5054fb2..09c4d30 100644
--- a/t/customfields/ipv6.t
+++ b/t/customfields/ipv6.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 98;
+use RT::Test tests => 102;
 
 my ( $baseurl, $agent ) = RT::Test->started_ok;
 ok( $agent->login, 'log in' );
@@ -51,6 +51,7 @@ my %valid = (
     'abcd::034'          => 'abcd:' . '0000:' x 6 . '0034',
     'abcd::192.168.1.1'  => 'abcd:' . '0000:' x 5 . 'c0a8:0101',
     '::192.168.1.1'      => '0000:' x 6 . 'c0a8:0101',
+    '::'                 => '0000:' x 7 . '0000',
 );
 
 diag "create a ticket via web and set IP" if $ENV{'TEST_VERBOSE'};
@@ -138,7 +139,7 @@ diag "check that we parse correct IPs only" if $ENV{'TEST_VERBOSE'};
 
     my $cf_field = "Object-RT::Ticket--CustomField-$cf_id-Values";
     my @invalid =
-      ( '::', 'abcd:', 'efgh', 'abcd:' x 8 . 'abcd', 'abcd::abcd::abcd' );
+      ( 'abcd:', 'efgh', 'abcd:' x 8 . 'abcd', 'abcd::abcd::abcd' );
     for my $invalid (@invalid) {
         ok $agent->goto_create_ticket($q), "go to create ticket";
         $agent->submit_form(

-----------------------------------------------------------------------