fixed small domain detection bug in Mojo::UserAgent::CookieJar (closes …

…#458)
mojolicious · Feb 26, 2013 · b9901be · b9901be
1 parent 9a70130
commit b9901be
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,7 +1,8 @@
 
-3.88  2013-02-24
+3.88  2013-02-26
   - Improved documentation.
   - Improved tests.
+  - Fixed small domain detection bug in Mojo::UserAgent::CookieJar.
 
 3.87  2013-02-23
   - Added deprecated function to Mojo::Util. (marcus)

diff --git a/lib/Mojo/UserAgent/CookieJar.pm b/lib/Mojo/UserAgent/CookieJar.pm
@@ -45,10 +45,9 @@ sub extract {
     # Validate domain
     my $host = lc $url->ihost;
     my $domain = lc($cookie->domain // $host);
-    unless ($host eq $domain) {
-      $domain =~ s/^\.//;
-      next if $host !~ /\Q.$domain\E$/ || $host =~ /\.\d+$/;
-    }
+    $domain =~ s/^\.//;
+    next
+      if $host ne $domain && ($host !~ /\Q.$domain\E$/ || $host =~ /\.\d+$/);
     $cookie->domain($domain);
 
     # Validate path

diff --git a/t/mojo/cookiejar.t b/t/mojo/cookiejar.t
@@ -376,6 +376,14 @@ is $tx->req->cookie('bar')->value, 'with', 'right value';
 is $tx->req->cookie('baz')->name,  'baz',  'right name';
 is $tx->req->cookie('baz')->value, 'with', 'right value';
 $tx = Mojo::Transaction::HTTP->new;
+$tx->req->url->parse('http://bücher.COM/perldoc/Mojolicious/Lite');
+$jar->inject($tx);
+is $tx->req->cookie('foo'), undef, 'no cookie';
+is $tx->req->cookie('bar')->name,  'bar',  'right name';
+is $tx->req->cookie('bar')->value, 'with', 'right value';
+is $tx->req->cookie('baz')->name,  'baz',  'right name';
+is $tx->req->cookie('baz')->value, 'with', 'right value';
+$tx = Mojo::Transaction::HTTP->new;
 $tx->req->url->parse('http://labs.bücher.COM/Perldoc');
 $jar->inject($tx);
 is $tx->req->cookie('foo'), undef, 'no cookie';
@@ -430,7 +438,12 @@ $tx->res->cookies(
   Mojo::Cookie::Response->new(
     name   => 'foo',
     value  => 'valid',
-    domain => '.213.133.102.53'
+    domain => '213.133.102.53.'
+  ),
+  Mojo::Cookie::Response->new(
+    name   => 'foo',
+    value  => 'valid',
+    domain => '.133.102.53'
   ),
   Mojo::Cookie::Response->new(
     name   => 'foo',