@@ -380,6 +380,17 @@ VALUE session_handle_request(VALUE self, VALUE request) { return rb_ensure(&perform_request, self, &cleanup, self); } +VALUE enable_cookie_session(VALUE self, VALUE file) { + struct curl_state *state; + Data_Get_Struct(self, struct curl_state, state); + CURL* curl = state->handle; + char *file_path = RSTRING_PTR(file); + if (file_path != "") + curl_easy_setopt(curl, CURLOPT_COOKIEJAR, file_path); + curl_easy_setopt(curl, CURLOPT_COOKIEFILE, file_path); + return Qnil; +} + //------------------------------------------------------------------------------ // Extension initialization // @@ -411,6 +422,7 @@ void Init_session_ext() { rb_define_method(cSession, "escape", session_escape, 1); rb_define_method(cSession, "unescape", session_unescape, 1); rb_define_method(cSession, "handle_request", session_handle_request, 1); + rb_define_method(cSession, "enable_cookie_session", enable_cookie_session, 1); rb_define_const(cRequest, "AuthBasic", CURLAUTH_BASIC); rb_define_const(cRequest, "AuthDigest", CURLAUTH_DIGEST); ext/patron/session_ext.c @@ -60,7 +60,7 @@ module Patron # @see Patron::Request#auth_type attr_accessor :auth_type - private :ext_initialize, :handle_request + private :ext_initialize, :handle_request, :enable_cookie_session # Create a new Session object. def initialize @@ -72,6 +72,23 @@ module Patron @auth_type = :basic end + # Makes this session handle cookies and store them in in +file+. + # If file is nil they will be stored in memory. Otherwise the +file+ + # must be readable and writable. Calling multiple times will add more files. + def handle_cookies(file = nil) + if file + path = Pathname(file).expand_path + unless File.exists?(file) and File.writable?(path.dirname) + raise ArgumentError, "Can't create file #{path} (permission error)" + end + unless File.readable?(file) or File.writable?(path) + raise ArgumentError, "Cant read or write file #{path} (permission error)" + end + end + enable_cookie_session(path.to_s) + self + end + ################################################################### ### Standard HTTP methods ### lib/patron/session.rb @@ -67,10 +67,19 @@ class RedirectServlet < HTTPServlet::AbstractServlet end end +class SetCookieServlet < HTTPServlet::AbstractServlet + def do_GET(req, res) + res['Set-Cookie'] = "session_id=foo123" + res['Location'] = "http://localhost:9001/test" + res.status = 301 + end +end + server = WEBrick::HTTPServer.new :Port => 9001 server.mount("/test", TestServlet) server.mount("/timeout", TimeoutServlet) server.mount("/redirect", RedirectServlet) +server.mount("/setcookie", SetCookieServlet) exit_code = lambda do begin script/test_server @@ -177,6 +177,21 @@ describe Patron::Session do body.header['authorization'].should == [encode_authz("foo", "bar")] end + it "should handle cookies if set" do + @session.handle_cookies + response = @session.get("/setcookie").body + YAML::load(response).header['cookie'].first.should == "session_id=foo123" + end + + it "should not handle cookies by default" do + response = @session.get("/setcookie").body + YAML::load(response).header.should_not include('cookie') + end + + it "should raise exception if cookie store is not writable or readable" do + lambda { @session.handle_cookies("/trash/clash/foo") }.should raise_error(ArgumentError) + end + def encode_authz(user, passwd) "Basic " + Base64.encode64("#{user}:#{passwd}").strip end spec/session_spec.rb e814e55dc6e898217f2de62d8c9b19d0855cf7ab Jannik Schürg jannschu@gmail.com http://github.com/toland/patron/commit/82f185e257ab81bd5ac32ace324333bb8bedcfb3 82f185e257ab81bd5ac32ace324333bb8bedcfb3 2009-08-13T08:45:18-07:00 2009-08-13T03:38:06-07:00 simple cookie handling added Signed-off-by: Phillip Toland <phil.toland@gmail.com> 81277ce170666e293142488ebd47359d07c998cd Phillip Toland phil.toland@gmail.com