taf2-curb 0.4.2.0 → 0.4.3.0

data/Rakefile

@@ -4,12 +4,6 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-#begin
-#  require 'rake/gempackagetask'
-#rescue LoadError
-#  $stderr.puts("Rubygems support disabled")
-#end
-
 CLEAN.include '**/*.o'
 CLEAN.include "**/*.#{Config::MAKEFILE_CONFIG['DLEXT']}"
 CLOBBER.include 'doc'

data/ext/curb.c

@@ -278,7 +278,7 @@ void Init_curb_core() {
 #ifdef HAVE_CURLAUTH_BASIC
   rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(CURLAUTH_BASIC));
 #else
-  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(0);
+  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use Digest authentication. */

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.4.2.0"
-#define CURB_VER_NUM   420
+#define CURB_VERSION   "0.4.3.0"
+#define CURB_VER_NUM   430
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   4
-#define CURB_VER_MIC   2
+#define CURB_VER_MIC   3
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -170,7 +170,11 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->cookiefile);
   rb_gc_mark(rbce->cookiejar);
   rb_gc_mark(rbce->cert);
+  rb_gc_mark(rbce->cacert);
+  rb_gc_mark(rbce->certpassword);
+  rb_gc_mark(rbce->certtype);
   rb_gc_mark(rbce->encoding);
+  rb_gc_mark(rbce->useragent);
   rb_gc_mark(rbce->success_proc);
   rb_gc_mark(rbce->failure_proc);
   rb_gc_mark(rbce->complete_proc);
@@ -238,7 +242,11 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->cookiefile = Qnil;
   rbce->cookiejar = Qnil;
   rbce->cert = Qnil;
+  rbce->cacert = Qnil;
+  rbce->certpassword = Qnil;
+  rbce->certtype = rb_str_new2("PEM");
   rbce->encoding = Qnil;
+  rbce->useragent = Qnil;
   rbce->success_proc = Qnil;
   rbce->failure_proc = Qnil;
   rbce->complete_proc = Qnil;
@@ -574,6 +582,60 @@ static VALUE ruby_curl_easy_cert_get(VALUE self) {
   CURB_OBJECT_GETTER(ruby_curl_easy, cert);
 }
 
+/*
+ * call-seq:
+ *   easy.cacert = "cacert.file"                      => ""
+ *
+ * Set a cacert bundle to use for this Curl::Easy instance. This file
+ * will be used to validate SSL certificates.
+ *
+ */
+static VALUE ruby_curl_easy_cacert_set(VALUE self, VALUE cacert) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, cacert);
+}
+
+/*
+ * call-seq:
+ *   easy.cacert                                      => "cacert.file"
+ *
+ * Obtain the cacert file to use for this Curl::Easy instance.
+ */
+static VALUE ruby_curl_easy_cacert_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, cacert);
+}
+
+/*
+ * call-seq:
+ *   easy.certpassword = "cert password"                   => ""
+ *
+ * Set a password used to open the specified cert
+ */
+static VALUE ruby_curl_easy_certpassword_set(VALUE self, VALUE certpassword) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, certpassword);
+}
+
+/*
+ * call-seq:
+ *   easy.certtype = "PEM|DER"                        => ""
+ *
+ * Set a cert type to use for this Curl::Easy instance.
+ * Default is PEM
+ *
+ */
+static VALUE ruby_curl_easy_certtype_set(VALUE self, VALUE certtype) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, certtype);
+}
+
+/*
+ * call-seq:
+ *   easy.certtype                                  => "cert.type"
+ *
+ * Obtain the cert type used for this Curl::Easy instance
+ */
+static VALUE ruby_curl_easy_certtype_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, certtype);
+}
+
 /*
  * call-seq:
  *   easy.encoding=                                     => "string"
@@ -595,6 +657,27 @@ static VALUE ruby_curl_easy_encoding_get(VALUE self) {
   CURB_OBJECT_GETTER(ruby_curl_easy, encoding);
 }
 
+/*
+ * call-seq:
+ *   easy.useragent = "Ruby/Curb"                      => ""
+ *
+ * Set the user agent string for this Curl::Easy instance
+ *
+ */
+static VALUE ruby_curl_easy_useragent_set(VALUE self, VALUE useragent) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, useragent);
+}
+
+/*
+ * call-seq:
+ *   easy.useragent                                  => "Ruby/Curb"
+ *
+ * Obtain the user agent string used for this Curl::Easy instance
+ */
+static VALUE ruby_curl_easy_useragent_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, useragent);
+}
+
 /* ================== IMMED ATTRS ==================*/
 
 /*
@@ -1488,9 +1571,22 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
 
   /* Set up HTTPS cert handling if necessary */
   if (rbce->cert != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, StringValuePtr(rbce->certtype));
     curl_easy_setopt(curl, CURLOPT_SSLCERT, StringValuePtr(rbce->cert));
+    if (rbce->certpassword != Qnil) {
+      curl_easy_setopt(curl, CURLOPT_SSLCERTPASSWD, StringValuePtr(rbce->certpassword));
+    }
+  }
+  if (rbce->cacert != Qnil) {
+    // XXX: This should really be using the output of 'curl-config --ca'
     curl_easy_setopt(curl, CURLOPT_CAINFO, "/usr/local/share/curl/curl-ca-bundle.crt");
   }
+  
+  /* Set the user-agent string if specified */
+  if (rbce->useragent != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_USERAGENT, StringValuePtr(rbce->useragent));
+  }
+
 
   /* Setup HTTP headers if necessary */
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);   // XXX: maybe we shouldn't be clearing this?
@@ -2742,8 +2838,15 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "cookiejar", ruby_curl_easy_cookiejar_get, 0);
   rb_define_method(cCurlEasy, "cert=", ruby_curl_easy_cert_set, 1);
   rb_define_method(cCurlEasy, "cert", ruby_curl_easy_cert_get, 0);
+  rb_define_method(cCurlEasy, "cacert=", ruby_curl_easy_cacert_set, 1);
+  rb_define_method(cCurlEasy, "cacert", ruby_curl_easy_cacert_get, 0);
+  rb_define_method(cCurlEasy, "certpassword=", ruby_curl_easy_certpassword_set, 1);
+  rb_define_method(cCurlEasy, "certtype=", ruby_curl_easy_certtype_set, 1);
+  rb_define_method(cCurlEasy, "certtype", ruby_curl_easy_certtype_get, 0);
   rb_define_method(cCurlEasy, "encoding=", ruby_curl_easy_encoding_set, 1);
   rb_define_method(cCurlEasy, "encoding", ruby_curl_easy_encoding_get, 0);
+  rb_define_method(cCurlEasy, "useragent=", ruby_curl_easy_useragent_set, 1);
+  rb_define_method(cCurlEasy, "useragent", ruby_curl_easy_useragent_get, 0);
 
   rb_define_method(cCurlEasy, "local_port=", ruby_curl_easy_local_port_set, 1);
   rb_define_method(cCurlEasy, "local_port", ruby_curl_easy_local_port_get, 0);

data/ext/curb_easy.h

@@ -36,7 +36,11 @@ typedef struct {
   VALUE cookiefile;     /* filename */
   VALUE cookiejar;      /* filename */
   VALUE cert;
+  VALUE cacert;
+  VALUE certpassword;
+  VALUE certtype;
   VALUE encoding;
+  VALUE useragent;
 
   VALUE success_proc;
   VALUE failure_proc;

data/ext/curb_multi.c

@@ -249,7 +249,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
       ruby_curl_multi_remove( self, rbce->self );
 
       if (rbce->complete_proc != Qnil) {
-        rb_funcall( rbce->complete_proc, idCall, 1, self );
+        rb_funcall( rbce->complete_proc, idCall, 1, rbce->self );
       }
 
       long response_code = -1;

data/lib/curb.rb

@@ -1,9 +1,4 @@
-begin
-  require 'curb_core'
-rescue LoadError
-  $: << File.dirname(__FILE__)
-  require 'curb_core'
-end
+require 'curb_core'
 
 module Curl
   class Easy
@@ -43,5 +38,48 @@ module Curl
         return curl
       end
     end
+
+    # Allow the incoming cert string to be file:password
+    # but be careful to not use a colon from a windows file path
+    # as the split point. Mimic what curl's main does
+    alias_method :native_cert=, :cert=
+    def cert=(cert_file)
+      pos = cert_file.rindex(':')
+      if pos && pos > 1
+        self.native_cert= cert_file[0..pos-1]
+        self.certpassword= cert_file[pos+1..-1]
+      else
+        self.native_cert= cert_file
+      end
+      self.cert
+    end
+  end
+  class Multi
+    class << self
+      # call-seq:
+      #   Curl::Multi.get('url1','url2','url3','url4','url5', :follow_location => true) do|easy|
+      #     easy
+      #   end
+      # 
+      # Blocking call to fetch multiple url's in parallel.
+      def get(urls, easy_options={}, multi_options={}, &blk)
+        m = Curl::Multi.new
+        # configure the multi handle
+        multi_options.each do|k,v|
+          m.send("#{k}=", v)
+        end
+
+        # create and configure each easy handle
+        urls.each do|url|
+          c = Curl::Easy.new(url)
+          easy_options.each do|k,v|
+            c.send("#{k}=",v)
+          end
+          c.on_complete {|curl| blk.call curl }
+          m.add(c)
+        end
+        m.perform
+      end
+    end
   end
 end

data/tests/helper.rb

@@ -21,7 +21,7 @@ require 'webrick'
 # or to test with multiple threads set it to false
 # this is important since, some code paths will change depending
 # on the presence of multiple threads
-TEST_SINGLE_THREADED=false
+TEST_SINGLE_THREADED=true
 
 # keep webrick quiet
 class ::WEBrick::HTTPServer
@@ -106,6 +106,8 @@ module TestServerMethods
           server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
           server.mount(servlet.path, servlet)
+          server.mount("/ext", WEBrick::HTTPServlet::FileHandler, File.join(File.dirname(__FILE__),'..','ext'))
+
           trap("INT") { server.shutdown }
           GC.start
           wr.flush
@@ -120,6 +122,7 @@ module TestServerMethods
         @server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
         @server.mount(servlet.path, servlet)
+        @server.mount("/ext", WEBrick::HTTPServlet::FileHandler, File.join(File.dirname(__FILE__),'..','ext'))
         queue = Queue.new # synchronize the thread startup to the main thread
 
         @test_thread = Thread.new { queue << 1; @server.start }

data/tests/tc_curl_download.rb

@@ -4,24 +4,29 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   include TestServerMethods 
 
   def setup
-    server_setup(9130)
+    server_setup
   end
   
   def test_download_url_to_file
-    dl_url = "http://127.0.0.1:9130/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join("/tmp/dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
     assert File.exist?(dl_path)
+    assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
   end
 
   def test_download_bad_url_gives_404
-    dl_url = "http://127.0.0.1:9130/this_file_does_not_exist.html"
+    dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
     dl_path = File.join("/tmp/dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
     assert_equal Curl::Easy, curb.class
     assert_equal 404, curb.response_code
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
   end
 
 end

data/tests/tc_curl_easy.rb

@@ -547,6 +547,46 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
   end
 
+  # Generate a self-signed cert with
+  # openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 \
+  #   -keyout tests/cert.pem  -out tests/cert.pem
+  def test_cert
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.cert= File.join(File.dirname(__FILE__),"cert.pem")
+    assert /cert.pem$/,curl.cert
+  end
+
+  def test_cert_with_password
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.cert= File.join(File.dirname(__FILE__),"cert.pem:password")
+    assert /cert.pem$/,curl.cert
+  end
+
+  def test_cert_type
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.certtype= "DER"
+    assert "DER", curl.certtype
+  end
+
+  def test_default_certtype
+    curl = Curl::Easy.new(TestServlet.url)
+    assert "PEM", curl.certtype
+  end
+
+  # Generate a CA cert with instructions at
+  # http://technocage.com/~caskey/openssl/
+  def test_ca_cert
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.cacert= File.join(File.dirname(__FILE__),"cacert.pem")
+    assert /cacert.pem$/, curl.cacert
+  end
+
+  def test_user_agent
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.useragent= "Curb-Easy/Ruby"
+    assert /ScrubDog$/,curl.useragent
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_multi.rb

@@ -89,7 +89,6 @@ class TestCurbCurlMulti < Test::Unit::TestCase
         end
         m.add c
       end
-
       m.perform
 
       assert n, responses.size
@@ -246,4 +245,22 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 =end
 
+  def test_multi_easy_get_01
+    urls = []
+    root_uri = 'http://127.0.0.1:9129/ext/'
+    # send a request to fetch all c files in the ext dir
+    Dir[File.dirname(__FILE__) + "/../ext/*.c"].each do|path|
+      urls << root_uri + File.basename(path)
+    end
+    Curl::Multi.get(urls, {:follow_location => true}, {:pipeline => true}) do|curl|
+      assert_equal 200, curl.response_code
+    end
+  end
+
+  include TestServerMethods 
+
+  def setup
+    server_setup
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.2.0
+  version: 0.4.3.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: []