cookiejar 0.2.9 → 0.3.0

data/lib/cookiejar/cookie_validation.rb

@@ -39,7 +39,7 @@ module CookieJar
     end
     BASE_HOSTNAME = /#{PATTERN::BASE_HOSTNAME}/
     BASE_PATH = /\A((?:[^\/?#]*\/)*)/
-    IPADDR = /\A#{PATTERN::IPADDR}\Z/
+    IPADDR = /\A#{PATTERN::IPV4ADDR}\Z|\A#{PATTERN::IPV6ADDR}\Z/
     HDN = /\A#{PATTERN::HOSTNAME}\Z/
     TOKEN = /\A#{PATTERN::TOKEN}\Z/
     PARAM1 = /\A(#{PATTERN::TOKEN})(?:=#{PATTERN::VALUE1})?\Z/
@@ -355,11 +355,11 @@ module CookieJar
       first = true
       index = 0
       begin
-        md = PARAM2.match set_cookie_value, index
-        if md.nil? || md.offset(0).first != index
+        md = PARAM2.match set_cookie_value[index..-1]
+        if md.nil? || md.offset(0).first != 0
           raise InvalidCookieError.new "Invalid Set-Cookie2 header '#{set_cookie_value}'"
         end
-        index=md.offset(0)[1]
+        index+=md.offset(0)[1]
         
         key = md[1].downcase.to_sym
         keyvalue = md[2] || md[3]

data/lib/cookiejar/jar.rb

@@ -86,12 +86,20 @@ module CookieJar
     # @raise [InvalidCookieError] if one of the cookie headers contained
     #   invalid formatting or data
     def set_cookies_from_headers request_uri, http_headers
-      cookies = gather_header_values http_headers['Set-Cookie'] do |value|
-        Cookie.from_set_cookie request_uri, value
+      set_cookie_key = http_headers.keys.detect { |k| /\ASet-Cookie\Z/i.match k }
+      cookies = gather_header_values http_headers[set_cookie_key] do |value|
+        begin
+          Cookie.from_set_cookie request_uri, value
+        rescue InvalidCookieError
+        end
       end
       
-      cookies += gather_header_values(http_headers['Set-Cookie2']) do |value|
-        Cookie.from_set_cookie2 request_uri, value
+      set_cookie2_key = http_headers.keys.detect { |k| /\ASet-Cookie2\Z/i.match k }
+      cookies += gather_header_values(http_headers[set_cookie2_key]) do |value|
+        begin
+          Cookie.from_set_cookie2 request_uri, value
+        rescue InvalidCookieError
+        end
       end
       
       # build the list of cookies, using a Jar. Since Set-Cookie2 values
@@ -277,7 +285,7 @@ module CookieJar
       elsif http_header_value.is_a? String
         result << block.call(http_header_value)
       end
-      result
+      result.compact
     end
   
     def to_uri request_uri

data/test/cookie_validation_test.rb

@@ -125,6 +125,10 @@ describe CookieValidation do
       CookieValidation.compute_search_domains('http://foo.com/').should ==
       ['foo.com', '.foo.com']
     end
+    it "should handle hexadecimal TLDs" do
+      CookieValidation.compute_search_domains('http://tiny.cc/').should ==
+      ['tiny.cc', '.tiny.cc']
+    end
     it "should handle IP addresses" do
       CookieValidation.compute_search_domains('http://127.0.0.1/').should ==
       ['127.0.0.1']

data/test/jar_test.rb

@@ -121,6 +121,13 @@ describe Jar do
       cookies.should have(1).items
       jar.to_a.should have(1).items
     end
+    it "should handle a set-cookie header" do
+      jar = Jar.new
+      cookies = jar.set_cookies_from_headers 'http://localhost/', 
+      { 'set-cookie' => 'foo=bar' } 
+      cookies.should have(1).items
+      jar.to_a.should have(1).items
+    end
     it "should handle multiple Set-Cookie headers" do
       jar = Jar.new
       cookies = jar.set_cookies_from_headers 'http://localhost/', 
@@ -135,6 +142,13 @@ describe Jar do
       cookies.should have(1).items
       jar.to_a.should have(1).items
     end
+    it "should handle a set-cookie2 header" do
+      jar = Jar.new
+      cookies = jar.set_cookies_from_headers 'http://localhost/', 
+      { 'set-cookie2' => 'foo=bar;Version=1' } 
+      cookies.should have(1).items
+      jar.to_a.should have(1).items
+    end
     it "should handle multiple Set-Cookie2 headers" do
       jar = Jar.new
       cookies = jar.set_cookies_from_headers 'http://localhost/', 
@@ -162,6 +176,13 @@ describe Jar do
         cookie.name == 'foo'
       end.version.should == 1
     end
+    it "should silently drop invalid cookies" do
+      jar = Jar.new
+      cookies = jar.set_cookies_from_headers 'http://localhost/', 
+      { 'Set-Cookie' => ['foo=bar','bar=baz;domain=.foo.com'] } 
+      cookies.should have(1).items
+      jar.to_a.should have(1).items
+    end
   end
   begin
     require 'json'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cookiejar
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Waite
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -06:00
+date: 2010-06-14 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -40,21 +45,26 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1050474939376950864
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client-side HTTP Cookie library