--- parser3/src/classes/curl.C 2009/12/04 22:22:13 1.2 +++ parser3/src/classes/curl.C 2015/10/26 01:21:53 1.35 @@ -1,33 +1,33 @@ /** @file Parser: @b curl parser class. - Copyright(c) 2001-2009 ArtLebedev Group(http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) */ -static const char * const IDENT_INET_C="$Date: 2009/12/04 22:22:13 $"; +#include "pa_config_includes.h" #include "pa_vmethod_frame.h" #include "pa_request.h" #include "pa_vfile.h" #include "pa_charsets.h" +#include "pa_vstring.h" +#include "pa_vdate.h" +#include "pa_vtable.h" +#include "pa_common.h" +#include "pa_http.h" #include "ltdl.h" +volatile const char * IDENT_CURL_C="$Id: curl.C,v 1.35 2015/10/26 01:21:53 moko Exp $"; + class MCurl: public Methoded { public: MCurl(); - -public: // Methoded - bool used_directly() { return true; } }; // global variables DECLARE_CLASS_VAR(curl, new MCurl, 0); -// from file.C -extern bool is_text_mode(const String& mode); - -#ifdef HAVE_CURL #include "curl.h" typedef CURL *(*t_curl_easy_init)(); t_curl_easy_init f_curl_easy_init; @@ -35,14 +35,17 @@ typedef CURLcode (*t_curl_easy_setopt)(C typedef CURLcode (*t_curl_easy_perform)(CURL *); t_curl_easy_perform f_curl_easy_perform; typedef void (*t_curl_easy_cleanup)(CURL *); t_curl_easy_cleanup f_curl_easy_cleanup; typedef const char *(*t_curl_easy_strerror)(CURLcode); t_curl_easy_strerror f_curl_easy_strerror; +typedef CURLcode (*t_curl_easy_getinfo)(CURL *curl, CURLINFO info, ...); t_curl_easy_getinfo f_curl_easy_getinfo; typedef struct curl_slist *(*t_curl_slist_append)(struct curl_slist *,const char *); t_curl_slist_append f_curl_slist_append; +typedef const char *(*t_curl_version)(); t_curl_version f_curl_version; +typedef CURLFORMcode (*t_curl_formadd)(struct curl_httppost **httppost, struct curl_httppost **last_post, ...); t_curl_formadd f_curl_formadd; +typedef void (*t_curl_formfree)(struct curl_httppost *form); t_curl_formfree f_curl_formfree; #define GLINK(name) f_##name=(t_##name)lt_dlsym(handle, #name); #define DLINK(name) GLINK(name) if(!f_##name) return "function " #name " was not found"; -const char *dlink(const char *dlopen_file_spec) { - if(lt_dlinit()) - return lt_dlerror(); +static const char *dlink(const char *dlopen_file_spec) { + pa_dlinit(); lt_dlhandle handle=lt_dlopen(dlopen_file_spec); @@ -54,31 +57,39 @@ const char *dlink(const char *dlopen_fil DLINK(curl_easy_init); DLINK(curl_easy_cleanup); + DLINK(curl_version); DLINK(curl_easy_setopt); DLINK(curl_easy_perform); DLINK(curl_easy_strerror); + DLINK(curl_easy_getinfo); DLINK(curl_slist_append); + DLINK(curl_formadd); + DLINK(curl_formfree); return 0; } class ParserOptions { public: - const char *filename; + const String *filename; const String *content_type; bool is_text; - Charset *charset; - - ParserOptions() : filename(0), content_type(0), is_text(true), charset(0) {} + Charset *charset, *response_charset; + struct curl_httppost *f_post; + FILE *f_stderr; + + ParserOptions() : filename(0), content_type(0), is_text(true), charset(0), response_charset(0), f_post(0), f_stderr(0){} + ~ParserOptions() { + f_curl_formfree(f_post); + if(f_stderr) + fclose(f_stderr); + } + }; -// using thread local variables instead of keeping them in request -// not necessary for cgi version -#ifdef WIN32 -#define __thread __declspec(thread) -#endif -__thread CURL *fcurl=0; -__thread ParserOptions *foptions; +// using TLS instead of keeping variables in request +THREAD_LOCAL CURL *fcurl = 0; +THREAD_LOCAL ParserOptions *foptions = 0; static CURL *curl(){ if(!fcurl) @@ -94,12 +105,14 @@ static ParserOptions &options(){ // using temporal object scheme to garanty cleanup call class Temp_curl { - CURL* saved_curl; - ParserOptions* saved_options; + CURL *saved_curl; + ParserOptions *saved_options; public: - Temp_curl() : saved_curl(fcurl) { + 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); @@ -110,11 +123,7 @@ public: }; bool curl_linked = false; -#ifdef WIN32 -const char *curl_library="libcurl.dll"; -#else -const char *curl_library="libcurl.so"; -#endif +const char *curl_library="libcurl" LT_MODULE_EXT; const char *curl_status = 0; @@ -141,6 +150,13 @@ static void _curl_session(Request& r, Me temp_curl(_curl_session_action, r, params); } +static void _curl_version_action(Request& r, MethodParams& ){ + r.write_no_lang(*new VString(*new String(f_curl_version(), String::L_TAINTED))); +} + +static void _curl_version(Request& r, MethodParams& params){ + fcurl ? _curl_version_action(r, params) : temp_curl(_curl_version_action, r, params); +} static char *str_lower(const char *str){ char *result=pa_strdup(str); @@ -162,15 +178,19 @@ public: enum OptionType { CURL_STRING, CURL_URLENCODE, // url-encoded string + CURL_URL, CURL_INT, CURL_POST, + CURL_FORM, CURL_HEADERS, CURL_FILE, + CURL_STDERR, PARSER_LIBRARY, PARSER_NAME, PARSER_CONTENT_TYPE, PARSER_MODE, - PARSER_CHARSET + PARSER_CHARSET, + PARSER_RESPONSE_CHARSET }; CURLoption id; @@ -183,29 +203,40 @@ public: CurlOptionHash() { #define CURL_OPT(type, name) put(str_lower(#name),new CurlOption(CURLOPT_##name, CurlOption::type)); #define PARSER_OPT(type, name) put(name,new CurlOption((CURLoption)0, CurlOption::type)); - CURL_OPT(CURL_URLENCODE, URL); + CURL_OPT(CURL_URL, URL); CURL_OPT(CURL_STRING, INTERFACE); CURL_OPT(CURL_INT, LOCALPORT); CURL_OPT(CURL_INT, PORT); - + + CURL_OPT(CURL_INT, VERBOSE); + CURL_OPT(CURL_STDERR, STDERR); + CURL_OPT(CURL_INT, MAXFILESIZE); + CURL_OPT(CURL_INT, HTTPAUTH); CURL_OPT(CURL_STRING, USERPWD); -#ifdef CURLOPT_USERNAME CURL_OPT(CURL_STRING, USERNAME); CURL_OPT(CURL_STRING, PASSWORD); -#endif + CURL_OPT(CURL_URLENCODE, USERAGENT); + CURL_OPT(CURL_URLENCODE, REFERER); CURL_OPT(CURL_INT, AUTOREFERER); + CURL_OPT(CURL_STRING, ENCODING); // gzip or deflate + CURL_OPT(CURL_STRING, ACCEPT_ENCODING); // gzip or deflate + CURL_OPT(CURL_INT, FOLLOWLOCATION); CURL_OPT(CURL_INT, UNRESTRICTED_AUTH); + CURL_OPT(CURL_INT, IPRESOLVE); CURL_OPT(CURL_INT, 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_FORM, HTTPPOST); CURL_OPT(CURL_HEADERS, HTTPHEADER); CURL_OPT(CURL_URLENCODE, COOKIE); @@ -216,16 +247,29 @@ public: CURL_OPT(CURL_INT, HTTP_CONTENT_DECODING); CURL_OPT(CURL_INT, HTTP_TRANSFER_DECODING); + CURL_OPT(CURL_INT, MAXREDIRS); + CURL_OPT(CURL_INT, POSTREDIR); + + CURL_OPT(CURL_STRING, RANGE); + CURL_OPT(CURL_INT, TIMEOUT); CURL_OPT(CURL_INT, TIMEOUT_MS); CURL_OPT(CURL_INT, LOW_SPEED_LIMIT); CURL_OPT(CURL_INT, LOW_SPEED_TIME); CURL_OPT(CURL_INT, MAXCONNECTS); + CURL_OPT(CURL_STRING, PROXY); + CURL_OPT(CURL_INT, PROXYPORT); + CURL_OPT(CURL_INT, PROXYTYPE); + CURL_OPT(CURL_INT, HTTPPROXYTUNNEL); + CURL_OPT(CURL_STRING, PROXYUSERPWD); + CURL_OPT(CURL_INT, PROXYAUTH); + CURL_OPT(CURL_INT, FRESH_CONNECT); CURL_OPT(CURL_INT, FORBID_REUSE); CURL_OPT(CURL_INT, CONNECTTIMEOUT); CURL_OPT(CURL_INT, CONNECTTIMEOUT_MS); + CURL_OPT(CURL_INT, FAILONERROR); CURL_OPT(CURL_FILE, SSLCERT); CURL_OPT(CURL_STRING, SSLCERTTYPE); @@ -235,16 +279,11 @@ public: CURL_OPT(CURL_STRING, SSLENGINE); CURL_OPT(CURL_STRING, SSLENGINE_DEFAULT); -#ifdef CURLOPT_ISSUERCERT CURL_OPT(CURL_FILE, ISSUERCERT); -#endif - -#ifdef CURLOPT_CRLFILE CURL_OPT(CURL_FILE, CRLFILE); -#endif CURL_OPT(CURL_STRING, CAINFO); - CURL_OPT(CURL_STRING, CAPATH); + CURL_OPT(CURL_FILE, CAPATH); CURL_OPT(CURL_INT, SSL_VERIFYPEER); CURL_OPT(CURL_INT, SSL_VERIFYHOST); CURL_OPT(CURL_STRING, SSL_CIPHER_LIST); @@ -255,10 +294,59 @@ public: PARSER_OPT(PARSER_CONTENT_TYPE, "content-type"); PARSER_OPT(PARSER_MODE, "mode"); PARSER_OPT(PARSER_CHARSET, "charset"); + PARSER_OPT(PARSER_RESPONSE_CHARSET, "response-charset"); } } *curl_options=0; +class CurlInfo { +public: + + enum OptionType { + CURL_STRING, + CURL_INT, + CURL_DOUBLE + }; + + CURLINFO id; + OptionType type; + CurlInfo(CURLINFO aid, OptionType atype): id(aid), type(atype) {} +}; + +class CurlInfoHash: public HashString { +public: + CurlInfoHash() { +#define CURL_INF(type, name) put(str_lower(#name),new CurlInfo(CURLINFO_##name, CurlInfo::type)); + CURL_INF(CURL_DOUBLE, APPCONNECT_TIME); + CURL_INF(CURL_DOUBLE, CONNECT_TIME); + CURL_INF(CURL_DOUBLE, CONTENT_LENGTH_DOWNLOAD); + CURL_INF(CURL_DOUBLE, CONTENT_LENGTH_UPLOAD); + CURL_INF(CURL_STRING, CONTENT_TYPE); + CURL_INF(CURL_STRING, EFFECTIVE_URL); + CURL_INF(CURL_INT, HEADER_SIZE); + CURL_INF(CURL_INT, HTTPAUTH_AVAIL); + CURL_INF(CURL_DOUBLE, NAMELOOKUP_TIME); + CURL_INF(CURL_INT, NUM_CONNECTS); + CURL_INF(CURL_INT, OS_ERRNO); + CURL_INF(CURL_DOUBLE, PRETRANSFER_TIME); + CURL_INF(CURL_STRING, PRIMARY_IP); + CURL_INF(CURL_INT, PROXYAUTH_AVAIL); + CURL_INF(CURL_INT, REDIRECT_COUNT); + CURL_INF(CURL_DOUBLE, REDIRECT_TIME); + CURL_INF(CURL_STRING, REDIRECT_URL); + CURL_INF(CURL_INT, REQUEST_SIZE); + CURL_INF(CURL_INT, RESPONSE_CODE); + CURL_INF(CURL_DOUBLE, SIZE_DOWNLOAD); + CURL_INF(CURL_DOUBLE, SIZE_UPLOAD); + CURL_INF(CURL_DOUBLE, SPEED_DOWNLOAD); + CURL_INF(CURL_DOUBLE, SPEED_UPLOAD); + CURL_INF(CURL_INT, SSL_VERIFYRESULT); + CURL_INF(CURL_DOUBLE, STARTTRANSFER_TIME); + CURL_INF(CURL_DOUBLE, TOTAL_TIME); + } + +} *curl_infos=0; + static const char *curl_urlencode(const String &s, Request& r){ if(options().charset){ Temp_client_charset temp(r.charsets, *options().charset); @@ -272,15 +360,60 @@ static struct curl_slist *curl_headers(H for(HashStringValue::Iterator i(*value_hash); i; i.next() ){ String header = - String(capitalize(i.key().cstr()), String::L_URI) + String(pa_http_safe_header_name(capitalize(i.key().cstr())), String::L_AS_IS) << ": " - << String(i.value()->as_string(), String::L_URI); + << String(i.value()->as_string(), String::L_HTTP_HEADER); slist=f_curl_slist_append(slist, curl_urlencode(header, r)); } return slist; } +static const char* curl_transcode(const String &s, Request& r){ + return options().charset ? Charset::transcode(s.cstr(), r.charsets.source(), *options().charset).cstr() : s.cstr(); +} + +static void curl_form(HashStringValue *value_hash, Request& r){ + struct curl_httppost *f_last=0; + for(HashStringValue::Iterator i(*value_hash); i; i.next() ){ + const char *key = curl_transcode(String(i.key().cstr()), r); + if(const String* svalue = i.value()->get_string()){ + // string + f_curl_formadd(&options().f_post, &f_last, + CURLFORM_PTRNAME, key, + CURLFORM_PTRCONTENTS, curl_transcode(String(svalue->cstr()), r), + CURLFORM_END); + } else if(Table* tvalue = i.value()->get_table()){ + // table + for(size_t t = 0; t < tvalue->count(); t++) { + f_curl_formadd(&options().f_post, &f_last, + CURLFORM_PTRNAME, key, + CURLFORM_PTRCONTENTS, curl_transcode(String(tvalue->get(t)->get(0)->cstr()), r), + CURLFORM_END); + } + } else if(VFile* fvalue=static_cast(i.value()->as("file"))){ + // file + f_curl_formadd(&options().f_post, &f_last, + CURLFORM_PTRNAME, key, + CURLFORM_BUFFER, curl_transcode(String(fvalue->fields().get("name")->as_string(), String::L_FILE_SPEC), r), + CURLFORM_BUFFERLENGTH, (long)fvalue->value_size(), + CURLFORM_BUFFERPTR, fvalue->value_ptr(), + 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()); + } + } +} + +static const char *curl_check_file(const String &file_spec){ + const char *file_spec_cstr=file_spec.taint_cstr(String::L_FILE_SPEC); + struct stat finfo; + if(stat(file_spec_cstr, &finfo)==0) + check_safe_mode(finfo, file_spec, file_spec_cstr); + return file_spec_cstr; +} + static void curl_setopt(HashStringValue::key_type key, HashStringValue::value_type value, Request& r) { CurlOption *opt=curl_options->get(key); @@ -303,6 +436,15 @@ static void curl_setopt(HashStringValue: res=f_curl_easy_setopt(curl(), opt->id, value_str); break; } + case CurlOption::CURL_URL:{ + // url-encoded string curl_url option + const String url = v.as_string(); + if(!url.starts_with("http://") && !url.starts_with("https://")) + throw Exception("curl", 0, "failed to set option '%s': invalid url scheme '%s'", key.cstr(), url.cstr()); + const char *value_str=curl_urlencode(url, r); + res=f_curl_easy_setopt(curl(), opt->id, value_str); + break; + } case CurlOption::CURL_INT:{ // integer curl option long value_int=(long)v.as_double(); @@ -321,6 +463,19 @@ static void curl_setopt(HashStringValue: } break; } + case CurlOption::CURL_FORM:{ + HashStringValue *value_hash = v.get_hash(); + if(value_hash){ + curl_form(value_hash, r); + } else if(v.get_string()->is_empty()){ + f_curl_formfree(options().f_post); + options().f_post = 0; + } else { + throw Exception("curl", 0, "failed to set option '%s': value must be a hash", key.cstr()); + } + res=f_curl_easy_setopt(curl(), CURLOPT_HTTPPOST, foptions->f_post); + break; + } case CurlOption::CURL_HEADERS:{ // http headers curl option HashStringValue *value_hash=v.get_hash(); @@ -329,8 +484,19 @@ static void curl_setopt(HashStringValue: } case CurlOption::CURL_FILE:{ // file-spec curl option - const char *value_str=r.absolute(v.as_string()).taint_cstr(String::L_FILE_SPEC); - res=f_curl_easy_setopt(curl(), opt->id, value_str); + const char *file_spec_cstr=curl_check_file(r.absolute(v.as_string())); + res=f_curl_easy_setopt(curl(), opt->id, file_spec_cstr); + break; + } + case CurlOption::CURL_STDERR:{ + // verbose output redirection from stderr to file curl option + const char *file_spec_cstr=curl_check_file(r.absolute(v.as_string())); + FILE *f_stderr=options().f_stderr=fopen(file_spec_cstr, "wt"); + if (f_stderr){ + res=f_curl_easy_setopt(curl(), opt->id, f_stderr); + } else { + throw Exception("curl", 0, "failed to set option '%s': unable to open file '%s'", key.cstr(), file_spec_cstr); + } break; } case CurlOption::PARSER_LIBRARY:{ @@ -338,12 +504,12 @@ static void curl_setopt(HashStringValue: if(fcurl==0){ curl_library=v.as_string().taint_cstr(String::L_FILE_SPEC); } else - throw Exception("curl", 0, "failed to set option '%s': %s", key.cstr(), "already loaded"); + throw Exception("curl", 0, "failed to set option '%s': already loaded", key.cstr()); break; } case CurlOption::PARSER_NAME:{ // 'name' parser option - options().filename=v.as_string().taint_cstr(String::L_FILE_SPEC); + options().filename=&v.as_string(); break; } case CurlOption::PARSER_CONTENT_TYPE:{ @@ -353,12 +519,16 @@ static void curl_setopt(HashStringValue: } case CurlOption::PARSER_MODE:{ // 'mode' parser option - options().is_text=is_text_mode(v.as_string()); + options().is_text=VFile::is_text_mode(v.as_string()); break; } case CurlOption::PARSER_CHARSET:{ - // 'charset' parser option - options().charset=&::charsets.get(v.as_string().change_case(r.charsets.source(), String::CC_UPPER)); + // 'charset' parser option should be processed before other options + break; + } + case CurlOption::PARSER_RESPONSE_CHARSET:{ + // 'response-charset' parser option + options().response_charset=&::charsets.get(v.as_string().change_case(r.charsets.source(), String::CC_UPPER)); break; } } @@ -367,14 +537,63 @@ static void curl_setopt(HashStringValue: throw Exception("curl", 0, "failed to set option '%s': %s", key.cstr(), f_curl_easy_strerror(res)); } -static void _curl_option(Request& r, MethodParams& params){ +static void _curl_options(Request& r, MethodParams& params){ if(curl_options==0) curl_options=new CurlOptionHash(); - if(HashStringValue* options=params.as_no_junction(0, OPTIONS_MUST_NOT_BE_CODE).get_hash()){ - options->for_each(curl_setopt, r); - } else - throw Exception("curl", 0, "options must be hash"); + if(HashStringValue* options_hash=params.as_hash(0)){ + if(Value* value=options_hash->get("charset")){ + // charset should be handled first as params may require transcode + Value &v=r.process_to_value(*value); + options().charset=&::charsets.get(v.as_string().change_case(r.charsets.source(), String::CC_UPPER)); + } + options_hash->for_each(curl_setopt, r); + } +} + +#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)); \ + } + +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()); + + CURLcode res; + switch (info->type){ + case CurlInfo::CURL_STRING:{ + char *str=0; + CURL_GETINFO(str); + return new VString(str ? *new String(pa_strdup(str), String::L_TAINTED) : String::Empty); + } + case CurlInfo::CURL_INT:{ + long l=0; + CURL_GETINFO(l); + return new VInt(l); + } + case CurlInfo::CURL_DOUBLE:{ + double d=0; + CURL_GETINFO(d); + return new VDouble(d); + } + } + return VVoid::get(); +} + +static void _curl_info(Request& r, MethodParams& params){ + if(curl_infos==0) + curl_infos=new CurlInfoHash(); + if(params.count()==1){ + const String &name=params.as_string(0, "name must be string"); + r.write_assign_lang(*curl_getinfo(name)); + } 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())); + } + r.write_no_lang(result); + } } @@ -403,7 +622,13 @@ static int curl_writer(char *data, size_ return size; } -static int curl_header(char *data, size_t size, size_t nmemb, HASH_STRING *result){ +class Curl_response { +public: + HASH_STRING headers; + Array cookies; +}; + +static int curl_header(char *data, size_t size, size_t nmemb, Curl_response *result){ if(result == 0) return 0; @@ -413,7 +638,10 @@ static int curl_header(char *data, size_ char *value=lsplit(line,':'); if(value && *line){ // we need only headers, not the response code - result->put(str_upper(line), value); + const char* HEADER_NAME=str_upper(line); + result->headers.put(HEADER_NAME, value); + if(strcmp(HEADER_NAME, "SET-COOKIE")==0) + result->cookies+=value; } } return size; @@ -426,7 +654,7 @@ static int curl_header(char *data, size_ static void _curl_load_action(Request& r, MethodParams& params){ if(params.count()==1) - _curl_option(r, params); + _curl_options(r, params); CURLcode res; @@ -435,18 +663,43 @@ static void _curl_load_action(Request& r CURL_SETOPT(CURLOPT_WRITEDATA, &body, "curl write buffer"); // we need a container for headers as VFile fields can be put only after VFile.set - HASH_STRING headers; + Curl_response response; CURL_SETOPT(CURLOPT_HEADERFUNCTION, curl_header, "curl header function"); - CURL_SETOPT(CURLOPT_WRITEHEADER, &headers, "curl header buffer"); + CURL_SETOPT(CURLOPT_WRITEHEADER, &response, "curl header buffer"); if((res=f_curl_easy_perform(curl())) != CURLE_OK){ - throw Exception("curl", 0, "failed to exec curl session: %s", f_curl_easy_strerror(res)); + const char *ex_type = 0; + switch(res){ + case CURLE_OPERATION_TIMEDOUT: + ex_type = "curl.timeout"; break; + case CURLE_COULDNT_RESOLVE_HOST: + ex_type = "curl.host"; break; + case CURLE_COULDNT_CONNECT: + ex_type = "curl.connect"; break; + case CURLE_HTTP_RETURNED_ERROR: + ex_type = "curl.status"; break; + case CURLE_SSL_CONNECT_ERROR: + case CURLE_SSL_CERTPROBLEM: + case CURLE_SSL_CIPHER: + case CURLE_SSL_CACERT: + case CURLE_SSL_ENGINE_INITFAILED: + ex_type = "curl.ssl"; break; + default: break; + } + throw Exception( ex_type ? ex_type : "curl.fail", 0, "%s", f_curl_easy_strerror(res)); } // assure trailing zero body.buf[body.length]=0; - Charset *asked_charset=options().charset; + VFile& result=*new VFile; + + String::Body ct_header = response.headers.get(HTTP_CONTENT_TYPE_UPPER); + Charset *asked_charset = options().response_charset; + if (asked_charset == 0){ + Charset *remote_charset = ct_header.is_empty() ? 0 : detect_charset(ct_header.trim(String::TRIM_BOTH, " \t\n\r").cstr()); + asked_charset = remote_charset ? remote_charset : options().charset; + } if(options().is_text && asked_charset != 0){ String::C c=Charset::transcode(String::C(body.buf, body.length), *asked_charset, r.charsets.source()); @@ -454,24 +707,43 @@ static void _curl_load_action(Request& r body.length=c.length; } - Value* vcontent_type= - options().content_type ? new VString(*options().content_type) : - options().filename ? new VString(r.mime_type_of(options().filename)) : 0; - - VFile& result=*new VFile; - result.set(true /*tainted*/, body.buf, body.length, options().filename, vcontent_type); - result.set_mode(options().is_text); + result.set(true/*tainted*/, options().is_text, body.buf, body.length, options().filename + , options().content_type ? new VString(*options().content_type) : 0, &r); + long http_status = 0; + if(f_curl_easy_getinfo(curl(), CURLINFO_RESPONSE_CODE, &http_status) == CURLE_OK){ + result.fields().put("status", new VInt(http_status)); + } - for(HASH_STRING::Iterator i(headers); i; i.next() ){ - String::Body key=i.key(); + for(HASH_STRING::Iterator i(response.headers); i; i.next() ){ + String::Body HEADER_NAME=i.key(); String::Body value=i.value(); if(asked_charset){ - key=Charset::transcode(key, *asked_charset, r.charsets.source()); + HEADER_NAME=Charset::transcode(HEADER_NAME, *asked_charset, r.charsets.source()); value=Charset::transcode(value, *asked_charset, r.charsets.source()); } - result.fields().put(key, new VString(*new String(value.trim(String::TRIM_BOTH, " \t\n\r"), String::L_TAINTED))); + result.fields().put(HEADER_NAME, new VString(*new String(value.trim(String::TRIM_BOTH, " \t\n\r"), String::L_TAINTED))); + } + + // filling $.cookies + Table* tcookies=0; + + for(Array_iterator i(response.cookies); i.has_next(); ){ + if(!tcookies){ + Table::columns_type columns=new ArrayString(1); + *columns+=new String("value"); + tcookies=new Table(columns); + } + String::Body value=i.next(); + if(asked_charset) + value=Charset::transcode(value, *asked_charset, r.charsets.source()); + ArrayString& row=*new ArrayString(1); + row+=new String(value.trim(String::TRIM_BOTH, " \t\n\r"), String::L_TAINTED); + *tcookies+=&row; } + if(tcookies) + result.fields().put(HTTP_COOKIES_NAME, new VTable(parse_cookies(r, tcookies))); + r.write_no_lang(result); } @@ -479,13 +751,11 @@ static void _curl_load(Request& r, Metho fcurl ? _curl_load_action(r, params) : temp_curl(_curl_load_action, r, params); } -#endif // HAVE_CURL - // constructor MCurl::MCurl(): Methoded("curl") { -#ifdef HAVE_CURL add_native_method("session", Method::CT_STATIC, _curl_session, 1, 1); - add_native_method("option", Method::CT_STATIC, _curl_option, 1, 1); + add_native_method("version", Method::CT_STATIC, _curl_version, 0, 0); + add_native_method("options", Method::CT_STATIC, _curl_options, 1, 1); + add_native_method("info", Method::CT_STATIC, _curl_info, 0, 1); add_native_method("load", Method::CT_STATIC, _curl_load, 0, 1); -#endif // HAVE_CURL }