curb 0.6.0.0 → 0.6.2.0

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.6.0.0"
-#define CURB_VER_NUM   600
+#define CURB_VERSION   "0.6.2.0"
+#define CURB_VER_NUM   620
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   6
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   2
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -143,6 +143,8 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->debug_proc);
   rb_gc_mark(rbce->interface_hm);
   rb_gc_mark(rbce->userpwd);
+  rb_gc_mark(rbce->username);
+  rb_gc_mark(rbce->password);
   rb_gc_mark(rbce->proxypwd);
   rb_gc_mark(rbce->headers);
   rb_gc_mark(rbce->cookies);
@@ -162,10 +164,6 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->bodybuf);
   rb_gc_mark(rbce->headerbuf);
 
-  if( rbce->self != Qnil ) {
-    rb_gc_mark(rbce->self);
-  }
-
   if( rbce->upload != Qnil ) {
     rb_gc_mark(rbce->upload);
   }
@@ -216,6 +214,8 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->debug_proc = Qnil;
   rbce->interface_hm = Qnil;
   rbce->userpwd = Qnil;
+  rbce->username = Qnil;
+  rbce->password = Qnil;
   rbce->proxypwd = Qnil;
   rbce->headers = rb_hash_new();
   rbce->cookies = Qnil;
@@ -263,13 +263,12 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->headerbuf = Qnil;
   rbce->curl_headers = NULL;
 
-  rbce->self = Qnil;
   rbce->upload = Qnil;
 
   new_curl = Data_Wrap_Struct(klass, curl_easy_mark, curl_easy_free, rbce);
 
-  /* set the rbce pointer to the curl handle */
-  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)rbce);
+  /* set the new_curl pointer to the curl handle */
+  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)new_curl);
   if (ecode != CURLE_OK) {
     raise_curl_easy_error_exception(ecode);
   }
@@ -877,16 +876,61 @@ static VALUE ruby_curl_easy_proxy_type_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, proxy_type, -1);
 }
 
+#if defined(HAVE_CURLAUTH_DIGEST_IE)
+#define CURL_HTTPAUTH_STR_TO_NUM(node) \
+  (!strncmp("basic",node,5)) ? CURLAUTH_BASIC : \
+  (!strncmp("digest_ie",node,9)) ? CURLAUTH_DIGEST_IE : \
+  (!strncmp("digest",node,6)) ? CURLAUTH_DIGEST : \
+  (!strncmp("gssnegotiate",node,12)) ? CURLAUTH_GSSNEGOTIATE : \
+  (!strncmp("ntlm",node,4)) ? CURLAUTH_NTLM : \
+  (!strncmp("any",node,3)) ? CURLAUTH_ANY : \
+  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : 0
+#else 
+#define CURL_HTTPAUTH_STR_TO_NUM(node) \
+  (!strncmp("basic",node,5)) ? CURLAUTH_BASIC : \
+  (!strncmp("digest",node,6)) ? CURLAUTH_DIGEST : \
+  (!strncmp("gssnegotiate",node,12)) ? CURLAUTH_GSSNEGOTIATE : \
+  (!strncmp("ntlm",node,4)) ? CURLAUTH_NTLM : \
+  (!strncmp("any",node,3)) ? CURLAUTH_ANY : \
+  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : 0
+#endif
 /*
  * call-seq:
  *   easy.http_auth_types = fixnum or nil             => fixnum or nil
+ *   easy.http_auth_types = [:basic,:digest,:digest_ie,:gssnegotiate, :ntlm, :any, :anysafe]
  *
  * Set the HTTP authentication types that may be used for the following
  * +perform+ calls. This is a bitmap made by ORing together the
  * Curl::CURLAUTH constants.
  */
-static VALUE ruby_curl_easy_http_auth_types_set(VALUE self, VALUE http_auth_types) {
-  CURB_IMMED_SETTER(ruby_curl_easy, http_auth_types, 0);
+static VALUE ruby_curl_easy_http_auth_types_set(int argc, VALUE *argv, VALUE self) {//VALUE self, VALUE http_auth_types) {
+  ruby_curl_easy *rbce;
+  VALUE args_ary;
+  rb_scan_args(argc, argv, "*", &args_ary);
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  int i, len = RARRAY_LEN(args_ary);
+  char* node = NULL;
+  long mask = 0x000000;
+
+  if (len == 1 && (TYPE(rb_ary_entry(args_ary,0)) == T_FIXNUM || rb_ary_entry(args_ary,0) == Qnil)) {
+    if (rb_ary_entry(args_ary,0) == Qnil) { 
+      rbce->http_auth_types = 0;
+    }
+    else {
+      rbce->http_auth_types = NUM2INT(rb_ary_entry(args_ary,0));
+    }
+  }
+  else {
+    // we could have multiple values, but they should be symbols
+    node = RSTRING_PTR(rb_funcall(rb_ary_entry(args_ary,0),rb_intern("to_s"),0));
+    mask = CURL_HTTPAUTH_STR_TO_NUM(node);
+    for( i = 1; i < len; ++i ) {
+      node = RSTRING_PTR(rb_funcall(rb_ary_entry(args_ary,i),rb_intern("to_s"),0));
+      mask |= CURL_HTTPAUTH_STR_TO_NUM(node);
+    }
+    rbce->http_auth_types = mask;
+  }
+  return INT2NUM(rbce->http_auth_types);
 }
 
 /*
@@ -1052,6 +1096,22 @@ static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self, VALUE ftp_respo
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_response_timeout, 0);
 }
 
+static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, username);
+}
+
+static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, username);
+}
+
+static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, password);
+}
+
+static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, password);
+}
+
 /* ================== BOOL ATTRS ===================*/
 
 /*
@@ -1340,7 +1400,7 @@ static VALUE ruby_curl_easy_on_body_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_success { ... }                 => &lt;old handler&gt;
+ *   easy.on_success { |easy| ... }                 => &lt;old handler&gt;
  *
  * Assign or remove the +on_success+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1355,7 +1415,7 @@ static VALUE ruby_curl_easy_on_success_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_failure { ... }                 => &lt;old handler&gt;
+ *   easy.on_failure {|easy,code| ... }                 => &lt;old handler&gt;
  *
  * Assign or remove the +on_failure+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1370,7 +1430,7 @@ static VALUE ruby_curl_easy_on_failure_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_complete { ... }                 => &lt;old handler&gt;
+ *   easy.on_complete {|easy| ... }                 => &lt;old handler&gt;
  *
  * Assign or remove the +on_complete+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1501,9 +1561,23 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
     curl_easy_setopt(curl, CURLOPT_INTERFACE, NULL);
   }
 
+#if HAVE_CURLOPT_USERNAME == 1 && HAVE_CURLOPT_PASSWORD == 1
+  if (rbce->username != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_USERNAME, StringValuePtr(rbce->username));
+  } else {
+    curl_easy_setopt(curl, CURLOPT_USERNAME, NULL);
+  }
+  if (rbce->password != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_PASSWORD, StringValuePtr(rbce->password));
+  }
+  else {
+    curl_easy_setopt(curl, CURLOPT_PASSWORD, NULL);
+  }
+#endif
+
   if (rbce->userpwd != Qnil) {
     curl_easy_setopt(curl, CURLOPT_USERPWD, StringValuePtr(rbce->userpwd));
-  } else {
+  } else if (rbce->username == Qnil && rbce->password == Qnil) { /* don't set this even to NULL if we have set username and password */
     curl_easy_setopt(curl, CURLOPT_USERPWD, NULL);
   }
 
@@ -2636,7 +2710,7 @@ static VALUE ruby_curl_easy_escape(VALUE self, VALUE svalue) {
 
 /*
  * call-seq:
- *   easy.unescape("some text")                       => "some%20text"
+ *   easy.unescape("some%20text")                       => "some text"
  *
  * Convert the given URL encoded input string to a "plain string" and return
  * the result. All input characters that are URL encoded (%XX where XX is a
@@ -2837,7 +2911,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "proxy_port", ruby_curl_easy_proxy_port_get, 0);
   rb_define_method(cCurlEasy, "proxy_type=", ruby_curl_easy_proxy_type_set, 1);
   rb_define_method(cCurlEasy, "proxy_type", ruby_curl_easy_proxy_type_get, 0);
-  rb_define_method(cCurlEasy, "http_auth_types=", ruby_curl_easy_http_auth_types_set, 1);
+  rb_define_method(cCurlEasy, "http_auth_types=", ruby_curl_easy_http_auth_types_set, -1);
   rb_define_method(cCurlEasy, "http_auth_types", ruby_curl_easy_http_auth_types_get, 0);
   rb_define_method(cCurlEasy, "proxy_auth_types=", ruby_curl_easy_proxy_auth_types_set, 1);
   rb_define_method(cCurlEasy, "proxy_auth_types", ruby_curl_easy_proxy_auth_types_get, 0);
@@ -2852,6 +2926,11 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "ftp_response_timeout=", ruby_curl_easy_ftp_response_timeout_set, 1);
   rb_define_method(cCurlEasy, "ftp_response_timeout", ruby_curl_easy_ftp_response_timeout_get, 0);
 
+  rb_define_method(cCurlEasy, "username=", ruby_curl_easy_username_set, 1);
+  rb_define_method(cCurlEasy, "username", ruby_curl_easy_username_get, 0);
+  rb_define_method(cCurlEasy, "password=", ruby_curl_easy_password_set, 1);
+  rb_define_method(cCurlEasy, "password", ruby_curl_easy_password_get, 0);
+
   rb_define_method(cCurlEasy, "proxy_tunnel=", ruby_curl_easy_proxy_tunnel_set, 1);
   rb_define_method(cCurlEasy, "proxy_tunnel?", ruby_curl_easy_proxy_tunnel_q, 0);
   rb_define_method(cCurlEasy, "fetch_file_time=", ruby_curl_easy_fetch_file_time_set, 1);

data/ext/curb_easy.h

@@ -86,11 +86,18 @@ typedef struct {
   VALUE headerbuf;
   struct curl_slist *curl_headers;
 
-  VALUE self; /* pointer to self, used by multi interface */
+//  VALUE self; /* pointer to self, used by multi interface */
   VALUE upload; /* pointer to an active upload otherwise Qnil */
 
   int last_result; /* last result code from multi loop */
 
+#if HAVE_CURLOPT_USERNAME == 1
+  VALUE username;
+#endif
+#if HAVE_CURLOPT_PASSWORD == 1
+  VALUE password;
+#endif
+
 } ruby_curl_easy;
 
 extern VALUE cCurlEasy;

data/ext/curb_multi.c

@@ -199,9 +199,6 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
     raise_curl_multi_error_exception(mcode);
   }
 
-  /* save a pointer to self */
-  rbce->self = easy;
-
   /* setup the easy handle */
   ruby_curl_easy_setup( rbce, &(rbce->bodybuf), &(rbce->headerbuf), &(rbce->curl_headers) );
 
@@ -263,7 +260,7 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   // active should equal INT2FIX(RHASH(rbcm->requests)->tbl->num_entries)
   r = rb_hash_delete( rbcm->requests, easy );
   if( r != easy || r == Qnil ) {
-    rb_warn("Critical:: Unable to remove easy from requests");
+    rb_warn("Possibly lost track of Curl::Easy VALUE, it may not be reclaimed by GC");
   }
 }
 
@@ -287,16 +284,19 @@ static VALUE ruby_curl_multi_cancel(VALUE self) {
   
   rb_hash_foreach( rbcm->requests, ruby_curl_multi_cancel_callback, (VALUE)rbcm );
   
-  // for chaining
+  /* for chaining */
   return self;
 }
 
 static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int result) {
 
   long response_code = -1;
+  VALUE easy;
   ruby_curl_easy *rbce = NULL;
-  VALUE ref;
-  CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&rbce);
+
+  CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&easy);
+
+  Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
   if (ecode != 0) {
     raise_curl_easy_error_exception(ecode);
@@ -304,31 +304,27 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   rbce->last_result = result; /* save the last easy result code */
 
-  ruby_curl_multi_remove( self, rbce->self );
+  ruby_curl_multi_remove( self, easy );
 
   if (rbce->complete_proc != Qnil) {
-    rb_funcall( rbce->complete_proc, idCall, 1, rbce->self );
+    rb_funcall( rbce->complete_proc, idCall, 1, easy );
   }
 
   curl_easy_getinfo(rbce->curl, CURLINFO_RESPONSE_CODE, &response_code);
 
-  ref = rbce->self;
-  /* break reference */
-  rbce->self = Qnil;
-
   if (result != 0) {
     if (rbce->failure_proc != Qnil) {
-      rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
+      rb_funcall( rbce->failure_proc, idCall, 2, easy, rb_curl_easy_error(result) );
     }
   }
   else if (rbce->success_proc != Qnil &&
           ((response_code >= 200 && response_code < 300) || response_code == 0)) {
     /* NOTE: we allow response_code == 0, in the case of non http requests e.g. reading from disk */
-    rb_funcall( rbce->success_proc, idCall, 1, ref );
+    rb_funcall( rbce->success_proc, idCall, 1, easy );
   }
   else if (rbce->failure_proc != Qnil &&
           (response_code >= 300 && response_code <= 999)) {
-    rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
+    rb_funcall( rbce->failure_proc, idCall, 2, easy, rb_curl_easy_error(result) );
   }
 }
 

data/ext/extconf.rb

@@ -111,6 +111,13 @@ have_constant "curle_again"
 have_constant "curle_ssl_crl_badfile"
 have_constant "curle_ssl_issuer_error"
 
+# username/password added in 7.19.1
+have_constant "curlopt_username"
+have_constant "curlopt_password"
+
+# ie quirk added in 7.19.3
+have_constant "curlauth_digest_ie"
+
 # centos 4.5 build of libcurl
 have_constant "curlm_bad_socket"
 have_constant "curlm_unknown_option"

data/tests/helper.rb

@@ -59,6 +59,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def respond_with(method,req,res)
     res.body = method.to_s
+    $auth_header = req['Authorization']
     res['Content-Type'] = "text/plain"
   end
 

data/tests/tc_curl_easy.rb

@@ -655,6 +655,29 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert /ScrubDog$/,curl.useragent
   end
 
+  def test_username_password
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.username = "foo"
+    curl.password = "bar"
+    assert_equal "foo", curl.username
+    assert_equal "bar", curl.password
+    curl.http_auth_types = :basic
+    #curl.userpwd = "foo:bar"
+    #curl.verbose = true
+    curl.perform
+    assert_equal 'Basic Zm9vOmJhcg==', $auth_header
+
+    # curl checks the auth type supported by the server, so we have to create a 
+    # new easy handle if we're going to change the auth type...
+
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.username = "foo"
+    curl.password = "bar"
+    curl.http_auth_types = :ntlm
+    curl.perform
+    assert_equal 'NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=', $auth_header
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.0.0
+  version: 0.6.2.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2009-12-26 00:00:00 -05:00
 default_executable: 
 dependencies: []