--- parser3/src/classes/curl.C 2017/11/15 22:48:57 1.55 +++ parser3/src/classes/curl.C 2017/11/29 19:10:05 1.59 @@ -17,7 +17,7 @@ #include "pa_http.h" #include "ltdl.h" -volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.55 2017/11/15 22:48:57 moko Exp $"; +volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.59 2017/11/29 19:10:05 moko Exp $"; class MCurl: public Methoded { public: @@ -81,7 +81,11 @@ struct ParserOptions : public PA_Allocat struct curl_httppost *f_post; FILE *f_stderr; - ParserOptions() : filename(0), content_type(0), is_text(true), charset(0), response_charset(0), url(0), f_post(0), f_stderr(0){} + // stuff to walkaround curl content-length bugs + bool is_post; + bool has_content_length; + + ParserOptions() : filename(0), content_type(0), is_text(true), charset(0), response_charset(0), url(0), f_post(0), f_stderr(0), is_post(false), has_content_length(false){} ~ParserOptions() { f_curl_formfree(f_post); if(f_stderr) @@ -114,9 +118,9 @@ public: Temp_curl() : saved_curl(fcurl), saved_options(foptions){ fcurl = f_curl_easy_init(); foptions = new ParserOptions(); - f_curl_easy_setopt(fcurl, CURLOPT_POSTFIELDSIZE, 0); // fix libcurl bug f_curl_easy_setopt(fcurl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); // avoid ipv6 by default } + ~Temp_curl() { f_curl_easy_cleanup(fcurl); fcurl = saved_curl; @@ -167,10 +171,12 @@ struct CurlOption : public PA_Allocated{ CURL_URL, CURL_INT, CURL_POST, + CURL_POSTFIELDS, CURL_FORM, CURL_HEADERS, CURL_FILE, CURL_STDERR, + CURL_HTTP_VERSION, PARSER_LIBRARY, PARSER_NAME, PARSER_CONTENT_TYPE, @@ -215,13 +221,13 @@ public: CURL_OPT(CURL_INT, UNRESTRICTED_AUTH); CURL_OPT(CURL_INT, IPRESOLVE); - CURL_OPT(CURL_INT, POST); + CURL_OPT(CURL_POST, POST); CURL_OPT(CURL_INT, HTTPGET); CURL_OPT(CURL_INT, NOBODY); CURL_OPT(CURL_STRING, CUSTOMREQUEST); - CURL_OPT(CURL_POST, POSTFIELDS); // hopefully is safe too - CURL_OPT(CURL_POST, COPYPOSTFIELDS); + CURL_OPT(CURL_POSTFIELDS, POSTFIELDS); // hopefully is safe too + CURL_OPT(CURL_POSTFIELDS, COPYPOSTFIELDS); CURL_OPT(CURL_FORM, HTTPPOST); CURL_OPT(CURL_HEADERS, HTTPHEADER); @@ -275,6 +281,7 @@ public: CURL_OPT(CURL_STRING, SSL_CIPHER_LIST); CURL_OPT(CURL_INT, SSL_SESSIONID_CACHE); CURL_OPT(CURL_INT, SSLVERSION); + CURL_OPT(CURL_HTTP_VERSION, HTTP_VERSION); PARSER_OPT(PARSER_LIBRARY, "library"); PARSER_OPT(PARSER_NAME, "name"); @@ -291,7 +298,8 @@ struct CurlInfo : public PA_Allocated{ enum OptionType { CURL_STRING, CURL_INT, - CURL_DOUBLE + CURL_DOUBLE, + CURL_HTTP_VERSION }; CURLINFO id; @@ -329,6 +337,8 @@ public: CURL_INF(CURL_INT, SSL_VERIFYRESULT); CURL_INF(CURL_DOUBLE, STARTTRANSFER_TIME); CURL_INF(CURL_DOUBLE, TOTAL_TIME); + CURL_INF(CURL_HTTP_VERSION, HTTP_VERSION); + CURL_INF(CURL_STRING, SCHEME); } } *curl_infos=0; @@ -387,7 +397,7 @@ static void curl_form(HashStringValue *v CURLFORM_CONTENTTYPE, fvalue->fields().get("content-type")->as_string().taint_cstr(String::L_URI), CURLFORM_END); } else { - throw Exception("curl", new String(i.key(), String::L_TAINTED), "is %s, form option value can be string, table or file only", i.value()->type()); + throw Exception("curl", new String(i.key(), String::L_TAINTED), "is %s, form option value can be string, table or file only", i.value()->type()); } } } @@ -400,6 +410,28 @@ static const char *curl_check_file(const return file_spec_cstr; } +static long curl_http_version(const String &name){ + if(name.is_empty()) return CURL_HTTP_VERSION_NONE; + + if(name == "1.0") return CURL_HTTP_VERSION_1_0; + if(name == "1.1") return CURL_HTTP_VERSION_1_1; + if(name == "2") return CURL_HTTP_VERSION_2; + if(name == "2.0") return CURL_HTTP_VERSION_2_0; + + const char *sname = str_upper(name.cstr()); + if(!strcmp(sname,"2TLS")) return CURL_HTTP_VERSION_2TLS; + if(!strcmp(sname,"2ONLY")) return CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE; + throw Exception("curl", &name, "invalid http_version option value"); +} + +static const char *curl_http_version_name(long value){ + if(value == CURL_HTTP_VERSION_NONE) return "none"; + if(value == CURL_HTTP_VERSION_1_0) return "1.0"; + if(value == CURL_HTTP_VERSION_1_1) return "1.1"; + if(value == CURL_HTTP_VERSION_2) return "2"; + throw Exception("curl", 0, "invalid http version '%d' in info", value); +} + static void curl_setopt(HashStringValue::key_type key, HashStringValue::value_type value, Request& r) { CurlOption *opt=curl_options->get(key); @@ -438,6 +470,13 @@ static void curl_setopt(HashStringValue: break; } case CurlOption::CURL_POST:{ + // integer curl option + long value_int=(long)v.as_double(); + res=f_curl_easy_setopt(curl(), opt->id, value_int); + options().is_post=value_int != 0; + break; + } + case CurlOption::CURL_POSTFIELDS:{ // http post curl option if(v.get_string()){ if( (res=f_curl_easy_setopt(curl(), CURLOPT_POSTFIELDSIZE, -1L)) == CURLE_OK ) @@ -447,6 +486,7 @@ static void curl_setopt(HashStringValue: if( (res=f_curl_easy_setopt(curl(), CURLOPT_POSTFIELDSIZE, (long)file->value_size())) == CURLE_OK ) res=f_curl_easy_setopt(curl(), opt->id, file->value_ptr()); } + options().has_content_length=true; break; } case CurlOption::CURL_FORM:{ @@ -454,10 +494,12 @@ static void curl_setopt(HashStringValue: if(value_hash){ curl_form(value_hash, r); } else { - f_curl_formfree(options().f_post); + if(options().f_post) + f_curl_formfree(options().f_post); options().f_post = 0; } res=f_curl_easy_setopt(curl(), CURLOPT_HTTPPOST, foptions->f_post); + options().has_content_length=true; break; } case CurlOption::CURL_HEADERS:{ @@ -483,6 +525,12 @@ static void curl_setopt(HashStringValue: } break; } + case CurlOption::CURL_HTTP_VERSION:{ + // http protocol version name curl option + long value_int=curl_http_version(v.as_string()); + res=f_curl_easy_setopt(curl(), opt->id, value_int); + break; + } case CurlOption::PARSER_LIBRARY:{ // 'library' parser option if(!curl_linked){ @@ -537,13 +585,12 @@ static void _curl_options(Request& r, Me #define CURL_GETINFO(arg) \ if((res=f_curl_easy_getinfo(curl(), info->id, &arg)) != CURLE_OK){ \ - throw Exception("curl", 0, "failed to get %s info: %s", key.cstr(), f_curl_easy_strerror(res)); \ + if (fail_on_error) \ + throw Exception("curl", 0, "failed to get %s info: %s", key.cstr(), f_curl_easy_strerror(res)); \ + return 0; \ } -static Value *curl_getinfo(const String::Body &key, CurlInfo *info=0) { - if(info==0 && !(info=curl_infos->get(key))) - throw Exception("curl", 0, "called with invalid parameter '%s'", key.cstr()); - +static Value *curl_getinfo(const String::Body &key, CurlInfo *info, bool fail_on_error=false) { CURLcode res; switch (info->type){ case CurlInfo::CURL_STRING:{ @@ -561,6 +608,11 @@ static Value *curl_getinfo(const String: CURL_GETINFO(d); return new VDouble(d); } + case CurlInfo::CURL_HTTP_VERSION:{ + long l=0; + CURL_GETINFO(l); + return new VString(*new String(curl_http_version_name(l), String::L_TAINTED)); + } } return VVoid::get(); } @@ -570,17 +622,21 @@ static void _curl_info(Request& r, Metho curl_infos=new CurlInfoHash(); if(params.count()==1){ const String &name=params.as_string(0, "name must be string"); - r.write(*curl_getinfo(name)); + CurlInfo *info=curl_infos->get(name); + if(info==0) + throw Exception("curl", 0, "called with invalid parameter '%s'", name.cstr()); + r.write(*curl_getinfo(name, info, true)); } else { VHash& result=*new VHash; for(CurlInfoHash::Iterator i(*curl_infos); i; i.next() ){ - result.get_hash()->put(i.key(), curl_getinfo(i.key(), i.value())); + Value *value=curl_getinfo(i.key(), i.value()); + if(value) + result.get_hash()->put(i.key(), value); } r.write(result); } } - class Curl_buffer{ public: char *buf; @@ -650,6 +706,12 @@ static void _curl_load_action(Request& r CURL_SETOPT(CURLOPT_WRITEFUNCTION, curl_writer, "curl writer function"); CURL_SETOPT(CURLOPT_WRITEDATA, &body, "curl write buffer"); + if(options().is_post && !options().has_content_length){ + // libcurl bug walkaround. Prior to 7.38 (Debian Jessie) curl passed Content-length: -1 + // after that no Content-length header is passed, that hangs request to nginx. + CURL_SETOPT(CURLOPT_POSTFIELDSIZE, 0, "post content-length"); + } + if((res=f_curl_easy_perform(curl())) != CURLE_OK){ const char *ex_type = 0; switch(res){