--- parser3/src/main/pa_common.C 2004/02/11 15:33:15 1.174 +++ parser3/src/main/pa_common.C 2004/04/05 09:23:31 1.182.4.1 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_COMMON_C="$Date: 2004/02/11 15:33:15 $"; +static const char * const IDENT_COMMON_C="$Date: 2004/04/05 09:23:31 $"; #include "pa_common.h" #include "pa_exception.h" @@ -64,6 +64,10 @@ int PASCAL closesocket(SOCKET); # endif #endif +# ifndef INADDR_NONE +# define INADDR_NONE ((ulong) -1) +# endif + // defines for globals #define FILE_STATUS_NAME "status" @@ -72,23 +76,18 @@ int PASCAL closesocket(SOCKET); const String file_status_name(FILE_STATUS_NAME); -// defines for statics +// defines #define HTTP_METHOD_NAME "method" +#define HTTP_FORM_NAME "form" +#define HTTP_BODY_NAME "body" #define HTTP_TIMEOUT_NAME "timeout" #define HTTP_HEADERS_NAME "headers" #define HTTP_ANY_STATUS_NAME "any-status" #define HTTP_CHARSET_NAME "charset" #define HTTP_TABLES_NAME "tables" - -// statics - -static const String http_method_name(HTTP_METHOD_NAME); -static const String http_timeout_name(HTTP_TIMEOUT_NAME); -static const String http_headers_name(HTTP_HEADERS_NAME); -static const String http_any_status_name(HTTP_ANY_STATUS_NAME); -static const String http_charset_name(HTTP_CHARSET_NAME); -static const String http_tables_name(HTTP_TABLES_NAME); +#define HTTP_USER "user" +#define HTTP_PASSWORD "password" // defines @@ -131,8 +130,8 @@ char* file_read_text(Request_charsets& c return file.success?file.str:0; } -#ifdef PA_HTTP //http request stuff +#ifdef PA_HTTP #undef CRLF #define CRLF "\r\n" @@ -142,7 +141,11 @@ static bool set_addr(struct sockaddr_in addr->sin_family=AF_INET; addr->sin_port=htons(port); if(host) { - if(struct hostent *hostIP=gethostbyname(host)) + ulong packed_ip=inet_addr(host); + struct hostent *hostIP = packed_ip==INADDR_NONE? + gethostbyname(host) + : gethostbyaddr((char *)&packed_ip, sizeof(packed_ip), AF_INET); + if(hostIP) memcpy(&addr->sin_addr, hostIP->h_addr, hostIP->h_length); else return false; @@ -171,7 +174,7 @@ static int http_read_response(char*& res ArrayString astatus; size_t pos_after=0; status_line.split(astatus, pos_after, " "); - const String& status_code=*astatus.get(1); + const String& status_code=*astatus.get(astatus.count()>1?1:0); result=status_code.as_int(); if(fail_on_status_ne_200 && result!=200) @@ -326,7 +329,62 @@ static Charset* detect_charset(Charset& return 0; } +static const String* basic_authorization_field(const char* user, const char* pass) { + if(!user&& !pass) + return 0; + String combined; + if(user) + combined<key, *row->get(0), info->result); +} +static void form_value2string( + HashStringValue::key_type key, + HashStringValue::value_type value, + String* result) +{ + if(const String* svalue=value->get_string()) + form_string_value2string(key, *svalue, *result); + else if(Table* tvalue=value->get_table()) { + Form_table_value2string_info info(key, *result); + tvalue->for_each(form_table_value2string, &info); + } else + throw Exception(0, + new String(key, String::L_TAINTED), + "is %s, "HTTP_FORM_NAME" option value must either string or table", value->type()); +} +static const char* form2string(HashStringValue& form) { + String string; + form.for_each(form_value2string, &string); + return string.cstr(String::L_UNSPECIFIED); +} #ifndef DOXYGEN struct File_read_http_result { char *str; size_t length; @@ -342,33 +400,53 @@ static File_read_http_result file_read_h char host[MAX_STRING]; const char* uri; int port; - const char* method=0; + const char* method="GET"; bool method_is_get; + HashStringValue* form=0; + const char* body_cstr=0; int timeout=2; bool fail_on_status_ne_200=true; Value* vheaders=0; Charset *asked_remote_charset=0; + const char* user_cstr=0; + const char* password_cstr=0; if(options) { int valid_options=0; - if(Value* vmethod=options->get(http_method_name)) { + if(Value* vmethod=options->get(HTTP_METHOD_NAME)) { valid_options++; method=vmethod->as_string().cstr(); } - if(Value* vtimeout=options->get(http_timeout_name)) { + if(Value* vform=options->get(HTTP_FORM_NAME)) { + valid_options++; + form=vform->get_hash(); + } + if(Value* vbody=options->get(HTTP_BODY_NAME)) { + valid_options++; + body_cstr=vbody->as_string().cstr(String::L_UNSPECIFIED); + } + if(Value* vtimeout=options->get(HTTP_TIMEOUT_NAME)) { valid_options++; timeout=vtimeout->as_int(); - } - if((vheaders=options->get(http_headers_name))) { + } + if((vheaders=options->get(HTTP_HEADERS_NAME))) { valid_options++; - } - if(Value* vany_status=options->get(http_any_status_name)) { + } + if(Value* vany_status=options->get(HTTP_ANY_STATUS_NAME)) { valid_options++; fail_on_status_ne_200=!vany_status->as_bool(); - } - if(Value* vcharset_name=options->get(http_charset_name)) { + } + if(Value* vcharset_name=options->get(HTTP_CHARSET_NAME)) { valid_options++; asked_remote_charset=&::charsets.get(vcharset_name->as_string(). change_case(charsets.source(), String::CC_UPPER)); + } + if(Value* vuser=options->get(HTTP_USER)) { + valid_options++; + user_cstr=vuser->as_string().cstr(); + } + if(Value* vpassword=options->get(HTTP_PASSWORD)) { + valid_options++; + password_cstr=vpassword->as_string().cstr(); } if(valid_options!=options->count()) @@ -379,12 +457,18 @@ static File_read_http_result file_read_h if(!asked_remote_charset) // defaulting to $request:charset asked_remote_charset=&charsets.source(); + method_is_get=strcmp(method, "GET")==0; + if(method_is_get && body_cstr) + throw Exception("parser.runtime", + 0, + "you can not use $."HTTP_BODY_NAME" option with method GET"); + //preparing request String& connect_string=*new String; // not in ^sql{... L_SQL ...} spirit, but closer to ^file::load one connect_string.append(file_spec, String::L_URI); // tainted pieces -> URI pieces - const char* request_cstr; + String request_head_and_body; { // influence URLencoding of tainted pieces to String::L_URI lang Temp_client_charset temp(charsets, *asked_remote_charset); @@ -405,19 +489,33 @@ static File_read_http_result file_read_h char* error_pos=0; port=port_cstr?strtol(port_cstr, &error_pos, 0):80; + if(strchr(uri, '?') && form) + throw Exception("parser.runtime", + 0, + "use either uri with ?params or $."HTTP_FORM_NAME" option"); - //making request - String request; - if(method) - request<is_string()) { // allow empty if(HashStringValue *headers=vheaders->get_hash()) { - Http_pass_header_info info={&charsets, &request, false}; + Http_pass_header_info info={&charsets, &head, false}; headers->for_each(http_pass_header, &info); user_agent_specified=info.user_agent_specified; } else @@ -426,23 +524,40 @@ static File_read_http_result file_read_h "headers param must be hash"); }; if(!user_agent_specified) // defaulting - request << "user-agent: " DEFAULT_USER_AGENT CRLF; - request << CRLF; + head << "user-agent: " DEFAULT_USER_AGENT CRLF; + + if(body_cstr) { + // recode those pieces which are not in String::L_URI lang + // [those violating HTTP standard, but widly used] + body_cstr=Charset::transcode( + String::C(body_cstr, strlen(body_cstr)), + charsets.source(), + *asked_remote_charset); + + head << "content-length: " << format(strlen(body_cstr), "%u") << CRLF; + } + + const char* head_cstr=head.cstr(String::L_UNSPECIFIED); - request_cstr=request.cstr(String::L_UNSPECIFIED); + // recode those pieces which are not in String::L_URI lang + // [those violating HTTP standard, but widly used] + head_cstr=Charset::transcode( + String::C(head_cstr, strlen(head_cstr)), + charsets.source(), + *asked_remote_charset); + + // head + end of header + request_head_and_body << head_cstr << CRLF; + // body + if(body_cstr) + request_head_and_body << body_cstr; } - // recode those pieces which are not in String::L_URI lang - // [those violating HTTP standard, but widly used] - request_cstr=Charset::transcode( - String::C(request_cstr, strlen(request_cstr)), - charsets.source(), - *asked_remote_charset); //sending request char* response; size_t response_size; int status_code=http_request(response, response_size, - host, port, request_cstr, + host, port, request_head_and_body.cstr(), timeout, fail_on_status_ne_200); //processing results @@ -462,7 +577,7 @@ static File_read_http_result file_read_h ArrayString aheaders; result.headers=new HashStringValue; VHash* vtables=new VHash; - result.headers->put(http_tables_name, vtables); + result.headers->put(HTTP_TABLES_NAME, vtables); HashStringValue& tables=vtables->hash(); size_t pos_after=0; @@ -1105,3 +1220,179 @@ int __snprintf(char* b, size_t s, const va_end(l); return r; } + +/* mime64 functions are from libgmime[http://spruce.sourceforge.net/gmime/] lib */ +/* + * Authors: Michael Zucchi + * Jeffrey Stedfast + * + * Copyright 2000 Helix Code, Inc. (www.helixcode.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * + */ +static char *base64_alphabet = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +/** + * g_mime_utils_base64_encode_step: + * @in: input stream + * @inlen: length of the input + * @out: output string + * @state: holds the number of bits that are stored in @save + * @save: leftover bits that have not yet been encoded + * + * Base64 encodes a chunk of data. Performs an 'encode step', only + * encodes blocks of 3 characters to the output at a time, saves + * left-over state in state and save (initialise to 0 on first + * invocation). + * + * Returns the number of bytes encoded. + **/ +static size_t +g_mime_utils_base64_encode_step (const unsigned char *in, size_t inlen, unsigned char *out, int *state, int *save) +{ + const register unsigned char *inptr; + register unsigned char *outptr; + + if (inlen <= 0) + return 0; + + inptr = in; + outptr = out; + + if (inlen + ((unsigned char *)save)[0] > 2) { + const unsigned char *inend = in + inlen - 2; + register int c1 = 0, c2 = 0, c3 = 0; + register int already; + + already = *state; + + switch (((char *)save)[0]) { + case 1: c1 = ((unsigned char *)save)[1]; goto skip1; + case 2: c1 = ((unsigned char *)save)[1]; + c2 = ((unsigned char *)save)[2]; goto skip2; + } + + /* yes, we jump into the loop, no i'm not going to change it, its beautiful! */ + while (inptr < inend) { + c1 = *inptr++; + skip1: + c2 = *inptr++; + skip2: + c3 = *inptr++; + *outptr++ = base64_alphabet [c1 >> 2]; + *outptr++ = base64_alphabet [(c2 >> 4) | ((c1 & 0x3) << 4)]; + *outptr++ = base64_alphabet [((c2 & 0x0f) << 2) | (c3 >> 6)]; + *outptr++ = base64_alphabet [c3 & 0x3f]; + /* this is a bit ugly ... */ + if ((++already) >= 19) { + *outptr++ = '\n'; + already = 0; + } + } + + ((unsigned char *)save)[0] = 0; + inlen = 2 - (inptr - inend); + *state = already; + } + + //d(printf ("state = %d, inlen = %d\n", (int)((char *)save)[0], inlen)); + + if (inlen > 0) { + register char *saveout; + + /* points to the slot for the next char to save */ + saveout = & (((char *)save)[1]) + ((char *)save)[0]; + + /* inlen can only be 0 1 or 2 */ + switch (inlen) { + case 2: *saveout++ = *inptr++; + case 1: *saveout++ = *inptr++; + } + ((char *)save)[0] += inlen; + } + + /*d(printf ("mode = %d\nc1 = %c\nc2 = %c\n", + (int)((char *)save)[0], + (int)((char *)save)[1], + (int)((char *)save)[2]));*/ + + return (outptr - out); +} + +/** + * g_mime_utils_base64_encode_close: + * @in: input stream + * @inlen: length of the input + * @out: output string + * @state: holds the number of bits that are stored in @save + * @save: leftover bits that have not yet been encoded + * + * Base64 encodes the input stream to the output stream. Call this + * when finished encoding data with g_mime_utils_base64_encode_step to + * flush off the last little bit. + * + * Returns the number of bytes encoded. + **/ +static size_t +g_mime_utils_base64_encode_close (const unsigned char *in, size_t inlen, unsigned char *out, int *state, int *save) +{ + unsigned char *outptr = out; + int c1, c2; + + if (inlen > 0) + outptr += g_mime_utils_base64_encode_step (in, inlen, outptr, state, save); + + c1 = ((unsigned char *)save)[1]; + c2 = ((unsigned char *)save)[2]; + + switch (((unsigned char *)save)[0]) { + case 2: + outptr[2] = base64_alphabet [(c2 & 0x0f) << 2]; + goto skip; + case 1: + outptr[2] = '='; + skip: + outptr[0] = base64_alphabet [c1 >> 2]; + outptr[1] = base64_alphabet [c2 >> 4 | ((c1 & 0x3) << 4)]; + outptr[3] = '='; + outptr += 4; + break; + } + + *outptr++ = 0; + + *save = 0; + *state = 0; + + return (outptr - out); +} + +char* pa_base64(const char *in, size_t len) +{ + /* wont go to more than 2x size (overly conservative) */ + char* result=new(PointerFreeGC) char[len * 2 + 6]; + int state=0; + int save=0; +#ifndef NDEBUG + size_t filled= +#endif + g_mime_utils_base64_encode_close ((const unsigned char*)in, len, + (unsigned char*)result, &state, &save); + assert(filled <= len * 2 + 6); + + return result; +}