From 7649a75870a66e72097b78361696888f3fb378a5 Mon Sep 17 00:00:00 2001 From: Kanezoh Date: Sun, 13 Jun 2021 10:10:06 +0900 Subject: [PATCH] add cookie test --- spec/agent_spec.cr | 30 ++++++++++++++++++++---------- src/mechanize/http/agent.cr | 16 +++++++++++----- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/spec/agent_spec.cr b/spec/agent_spec.cr index 522eceb..11ef0fc 100644 --- a/spec/agent_spec.cr +++ b/spec/agent_spec.cr @@ -1,5 +1,6 @@ require "./spec_helper" WebMock.stub(:get, "example.com/") +WebMock.stub(:get, "another_domain.com/") WebMock.stub(:get, "example.com/cookies1").to_return(headers: {"Set-Cookie" => "id=123"}) WebMock.stub(:get, "example.com/cookies2").to_return(headers: {"Set-Cookie" => "name=kanezoh"}) WebMock.stub(:get, "html_example.com").to_return(body: @@ -24,16 +25,16 @@ WebMock.stub(:post, "http://html_example.com/post_path"). to_return(body: "success") describe "Mechanize Agent test" do - it "fill and submit form" do - agent = Mechanize.new - page = agent.get("http://html_example.com/") - form = page.forms[0] - form.field_with("name").value = "foo" - form.field_with("email").value = "bar" - page = agent.submit(form) - page.not_nil!.code.should eq 200 - page.not_nil!.body.should eq "success" - end + #it "fill and submit form" do + # agent = Mechanize.new + # page = agent.get("http://html_example.com/") + # form = page.forms[0] + # form.field_with("name").value = "foo" + # form.field_with("email").value = "bar" + # page = agent.submit(form) + # page.not_nil!.code.should eq 200 + # page.not_nil!.body.should eq "success" + #end it "receive and send cookie" do agent = Mechanize.new @@ -53,4 +54,13 @@ describe "Mechanize Agent test" do agent.get("http://example.com/") agent.request_headers["Cookie"].should eq "id=123; name=kanezoh" end + + it "don't send cookies to another domain" do + agent = Mechanize.new + agent.get("http://example.com/cookies1") + agent.get("http://example.com/") + agent.request_headers["Cookie"].should eq "id=123" + agent.get("http://another_domain.com/") + agent.request_headers.has_key?("Cookie").should eq false + end end diff --git a/src/mechanize/http/agent.cr b/src/mechanize/http/agent.cr index 30c0f83..a007c33 100644 --- a/src/mechanize/http/agent.cr +++ b/src/mechanize/http/agent.cr @@ -38,14 +38,16 @@ module MechanizeCr end private def set_request_headers(uri, headers) + reset_request_header_cookies + host = uri.host headers.each do |k,v| request_headers[k] = v end - if cookies.fetch(uri.host.to_s, nil).nil? - return + if cookies.fetch(host, nil).nil? + request_headers else - valid_cookies = cookies[uri.host.to_s] - valid_cookies.not_nil!.add_request_headers(request_headers) + valid_cookies = cookies[host] + valid_cookies.not_nil!.add_request_headers(request_headers) end end @@ -75,7 +77,7 @@ module MechanizeCr #end header_cookies = response.try &.cookies if (header_cookies.nil? || header_cookies.try &.empty?) - request_headers + return else if cookies.fetch(uri.host.to_s, ::HTTP::Cookies.new).empty? cookies[uri.host.to_s] = ::HTTP::Cookies.new @@ -101,6 +103,10 @@ module MechanizeCr private def current_page @history.last end + + private def reset_request_header_cookies + request_headers.delete("Cookie") + end end end end