curb 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a6615cec70148cb19373a5ad0326a93b2e1b4424bd2d02734038857e261659
-  data.tar.gz: 85f2b05e3fd7e8b400d8cd86d65aa2778e4c60e55337442e34d6cda673278c55
+  metadata.gz: 832660904f4d95f97b0795a4e39850f2fca2c70e521a0bb795a9c551f6fdf9f3
+  data.tar.gz: 903cb16a9a77396e90ea9ab2f33fb94a84d6a811525d23506af43195ab49fec2
 SHA512:
-  metadata.gz: de609adca7bcd45c867a8fa91a20caa429e0064c68587d498bf25f455a1d4c49c6d00ec851af7c80aa1cc2694b4d0dd19291ebfb9b3010793dd8fa8c28e22d4c
-  data.tar.gz: af3d577715760e6b6ca977c5a6295d0af5d8b60858d673675d778deff7b06120876b72975ea35062c5299ac45fbab2d45a70b375cf94d07b410eb8c649a443d1
+  metadata.gz: bf99199469304444421b00adbaa2b64707c7eddcdaff9a3c662531ebf5f2220a1b6555145fa516422921ac0980c851e7ce234ff88391d608ca6783211f364ddf
+  data.tar.gz: 41aec998852a8458ed9f5508f37374ac72fb170c4235a7279e4f9864d2af143281cd81e1dec6099c80765d97b2263d1ee34bebd2b193701b9a4175a024ca5991

data/README.md

@@ -1,6 +1,10 @@
 # Curb - Libcurl bindings for Ruby
 
-* [CI Build Status](https://github.com/taf2/curb/actions/workflows/CI.yml)
+[![CI](https://github.com/taf2/curb/actions/workflows/ci.yml/badge.svg)](https://github.com/taf2/curb/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/taf2/curb/branch/master/graph/badge.svg)](https://codecov.io/gh/taf2/curb)
+[![Gem Version](https://badge.fury.io/rb/curb.svg)](https://badge.fury.io/rb/curb)
+
+* [CI Build Status](https://github.com/taf2/curb/actions/workflows/ci.yml)
 * [rubydoc rdoc](http://www.rubydoc.info/github/taf2/curb/)
 * [github project](http://github.com/taf2/curb/tree/master)
 

data/ext/curb.c

@@ -143,12 +143,14 @@ static VALUE ruby_curl_asyncdns_q(VALUE mod) {
  * in RFC 2478). For libcurl versions < 7.10.8, always returns false.
  */
 static VALUE ruby_curl_spnego_q(VALUE mod) {
-#ifdef HAVE_CURL_VERSION_SPNEGO
   curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
-  return((ver->features & CURL_VERSION_SPNEGO) ? Qtrue : Qfalse);
-#else
-  return Qfalse;
+#ifdef HAVE_CURL_VERSION_SPNEGO
+  if (ver->features & CURL_VERSION_SPNEGO) return Qtrue;
 #endif
+#ifdef HAVE_CURL_VERSION_GSSNEGOTIATE
+  if (ver->features & CURL_VERSION_GSSNEGOTIATE) return Qtrue;
+#endif
+  return Qfalse;
 }
 
 /*

data/ext/curb.h

@@ -28,10 +28,10 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "1.1.0"
-#define CURB_VER_NUM   1010
+#define CURB_VERSION   "1.2.0"
+#define CURB_VER_NUM   1020
 #define CURB_VER_MAJ   1
-#define CURB_VER_MIN   1
+#define CURB_VER_MIN   2
 #define CURB_VER_MIC   0
 #define CURB_VER_PATCH 0
 

data/ext/curb_easy.c

@@ -12,6 +12,9 @@
 
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
+#include <strings.h>
+#endif
 
 extern VALUE mCurl;
 
@@ -309,6 +312,7 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->enable_cookies = 0;
   rbce->ignore_content_length = 0;
   rbce->callback_active = 0;
+  rbce->last_result = 0;
 }
 
 /*
@@ -317,6 +321,9 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
 static VALUE ruby_curl_easy_allocate(VALUE klass) {
   ruby_curl_easy *rbce;
   rbce = ALLOC(ruby_curl_easy);
+  if (!rbce) {
+    rb_raise(rb_eNoMemError, "Failed to allocate memory for Curl::Easy");
+  }
   rbce->curl = NULL;
   rbce->opts  = Qnil;
   rbce->multi = Qnil;
@@ -375,8 +382,14 @@ static VALUE ruby_curl_easy_initialize(int argc, VALUE *argv, VALUE self) {
 static struct curl_slist *duplicate_curl_slist(struct curl_slist *list) {
     struct curl_slist *dup = NULL;
     struct curl_slist *tmp;
+    struct curl_slist *new_list;
     for (tmp = list; tmp; tmp = tmp->next) {
-        dup = curl_slist_append(dup, tmp->data);
+        new_list = curl_slist_append(dup, tmp->data);
+        if (!new_list) {
+            if (dup) { curl_slist_free_all(dup); }
+            rb_raise(rb_eNoMemError, "Failed to duplicate curl_slist");
+        }
+        dup = new_list;
     }
     return dup;
 }
@@ -395,6 +408,9 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
   newrbce = ALLOC(ruby_curl_easy);
+  if (!newrbce) {
+    rb_raise(rb_eNoMemError, "Failed to allocate memory for Curl::Easy clone");
+  }
   /* shallow copy */
   memcpy(newrbce, rbce, sizeof(ruby_curl_easy));
 
@@ -405,6 +421,9 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
   newrbce->curl_ftp_commands = (rbce->curl_ftp_commands) ? duplicate_curl_slist(rbce->curl_ftp_commands) : NULL;
   newrbce->curl_resolve = (rbce->curl_resolve) ? duplicate_curl_slist(rbce->curl_resolve) : NULL;
 
+  /* A cloned easy should not retain ownership reference to the original multi. */
+  newrbce->multi = Qnil;
+
   if (rbce->opts != Qnil) {
     newrbce->opts = rb_funcall(rbce->opts, rb_intern("dup"), 0);
   }
@@ -2165,7 +2184,11 @@ static VALUE cb_each_http_header(VALUE header, VALUE wrap, int _c, const VALUE *
 
   //rb_p(header_str);
 
-  *list = curl_slist_append(*list, StringValuePtr(header_str));
+  struct curl_slist *new_list = curl_slist_append(*list, StringValuePtr(header_str));
+  if (!new_list) {
+    rb_raise(rb_eNoMemError, "Failed to append to header list");
+  }
+  *list = new_list;
   return header_str;
 }
 
@@ -2197,7 +2220,11 @@ static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap, int _c, c
 
   //rb_p(header_str);
 
-  *list = curl_slist_append(*list, StringValuePtr(proxy_header_str));
+  struct curl_slist *new_list = curl_slist_append(*list, StringValuePtr(proxy_header_str));
+  if (!new_list) {
+    rb_raise(rb_eNoMemError, "Failed to append to proxy header list");
+  }
+  *list = new_list;
   return proxy_header_str;
 }
 
@@ -2210,7 +2237,11 @@ static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap, int _c, const VA
   Data_Get_Struct(wrap, struct curl_slist *, list);
 
   ftp_command_string = rb_obj_as_string(ftp_command);
-  *list = curl_slist_append(*list, StringValuePtr(ftp_command));
+  struct curl_slist *new_list = curl_slist_append(*list, StringValuePtr(ftp_command));
+  if (!new_list) {
+    rb_raise(rb_eNoMemError, "Failed to append to FTP command list");
+  }
+  *list = new_list;
 
   return ftp_command_string;
 }
@@ -2224,7 +2255,11 @@ static VALUE cb_each_resolve(VALUE resolve, VALUE wrap, int _c, const VALUE *_pt
   Data_Get_Struct(wrap, struct curl_slist *, list);
 
   resolve_string = rb_obj_as_string(resolve);
-  *list = curl_slist_append(*list, StringValuePtr(resolve));
+  struct curl_slist *new_list = curl_slist_append(*list, StringValuePtr(resolve));
+  if (!new_list) {
+    rb_raise(rb_eNoMemError, "Failed to append to resolve list");
+  }
+  *list = new_list;
 
   return resolve_string;
 }
@@ -2296,6 +2331,14 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
     curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, rb_easy_get_str("proxypwd"));
   }
 
+#if HAVE_CURLOPT_NOPROXY
+  if (rb_easy_nil("noproxy")) {
+    curl_easy_setopt(curl, CURLOPT_NOPROXY, NULL);
+  } else {
+    curl_easy_setopt(curl, CURLOPT_NOPROXY, rb_easy_get_str("noproxy"));
+  }
+#endif
+
   // body/header procs
   if (!rb_easy_nil("body_proc")) {
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&proc_data_handler_body);
@@ -2517,7 +2560,11 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
       rb_iterate(rb_each, rb_easy_get("headers"), cb_each_http_header, wrap);
     } else {
       VALUE headers_str = rb_obj_as_string(rb_easy_get("headers"));
-      *hdrs = curl_slist_append(*hdrs, StringValuePtr(headers_str));
+      struct curl_slist *new_list = curl_slist_append(*hdrs, StringValuePtr(headers_str));
+      if (!new_list) {
+        rb_raise(rb_eNoMemError, "Failed to append to headers list");
+      }
+      *hdrs = new_list;
     }
 
     if (*hdrs) {
@@ -2535,7 +2582,11 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
       rb_iterate(rb_each, rb_easy_get("proxy_headers"), cb_each_http_proxy_header, wrap);
     } else {
       VALUE proxy_headers_str = rb_obj_as_string(rb_easy_get("proxy_headers"));
-      *phdrs = curl_slist_append(*phdrs, StringValuePtr(proxy_headers_str));
+      struct curl_slist *new_list = curl_slist_append(*phdrs, StringValuePtr(proxy_headers_str));
+      if (!new_list) {
+        rb_raise(rb_eNoMemError, "Failed to append to proxy headers list");
+      }
+      *phdrs = new_list;
     }
 
     if (*phdrs) {
@@ -2635,10 +2686,31 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
 
   memset(rbce->err_buf, 0, CURL_ERROR_SIZE);
 
+  /* Use method override and adjust related options for special verbs. */
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
+  /* For HEAD, ensure no body is requested/downloaded, as some servers
+   * include a Content-Length header which should not cause libcurl to
+   * wait for a body that will never arrive. */
+  int is_head = (verb && (
+#ifdef _WIN32
+    _stricmp(verb, "HEAD") == 0
+#else
+    strcasecmp(verb, "HEAD") == 0
+#endif
+  ));
+  if (is_head) {
+    curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 0L);
+    curl_easy_setopt(curl, CURLOPT_POST, 0L);
+  }
+
   retval = rb_funcall(self, rb_intern("perform"), 0);
 
+  /* Restore state after request. */
+  if (is_head) {
+    curl_easy_setopt(curl, CURLOPT_NOBODY, 0L);
+  }
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
   return retval;
@@ -3725,6 +3797,12 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     VALUE proxypwd = val;
     CURB_OBJECT_HSETTER(ruby_curl_easy, proxypwd);
     } break;
+#if HAVE_CURLOPT_NOPROXY
+  case CURLOPT_NOPROXY: {
+    VALUE noproxy = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, noproxy);
+    } break;
+#endif
   case CURLOPT_COOKIE: {
     VALUE cookies = val;
     CURB_OBJECT_HSETTER(ruby_curl_easy, cookies);
@@ -3802,6 +3880,9 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     Check_Type(val, T_FILE);
     GetOpenFile(val, open_f_ptr);
     curl_easy_setopt(rbce->curl, CURLOPT_STDERR, rb_io_stdio_file(open_f_ptr));
+    /* Retain a Ruby reference to the IO to prevent GC/finalization
+     * while libcurl still holds and writes to the underlying FILE*. */
+    rb_easy_set("stderr_io", val);
     break;
   case CURLOPT_PROTOCOLS:
   case CURLOPT_REDIR_PROTOCOLS:
@@ -3832,11 +3913,19 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
       long i, len = RARRAY_LEN(val);
       for (i = 0; i < len; i++) {
         VALUE item = rb_ary_entry(val, i);
-        list = curl_slist_append(list, StringValueCStr(item));
+        struct curl_slist *new_list = curl_slist_append(list, StringValueCStr(item));
+        if (!new_list) {
+          curl_slist_free_all(list);
+          rb_raise(rb_eNoMemError, "Failed to append to resolve list");
+        }
+        list = new_list;
       }
     } else {
       /* If a single string is passed, use it directly */
       list = curl_slist_append(NULL, StringValueCStr(val));
+      if (!list) {
+        rb_raise(rb_eNoMemError, "Failed to create resolve list");
+      }
     }
     /* Save the list pointer in the ruby_curl_easy structure for cleanup later */
     rbce->curl_resolve = list;