--- parser3/src/main/untaint.C 2003/01/28 15:16:50 1.115.2.2 +++ parser3/src/main/untaint.C 2003/02/14 12:59:10 1.115.2.9 @@ -1,11 +1,11 @@ /** @file Parser: String class part: untaint mechanizm. - Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_UNTAINT_C="$Date: 2003/01/28 15:16:50 $"; +static const char* IDENT_UNTAINT_C="$Date: 2003/02/14 12:59:10 $"; #include "pa_pool.h" #include "pa_string.h" @@ -17,17 +17,18 @@ static const char* IDENT_UNTAINT_C="$Dat #include "pa_dictionary.h" #include "pa_common.h" #include "pa_charset.h" +#include "pa_request_charsets.h" #define escape(action) \ { \ - const char *src=fragment->ptr; \ + const char* src=fragment->ptr; \ for(int size=fragment->size; size--; src++) \ action \ } #define _default default: *dest++=*src; break #define encode(need_encode_func, prefix) \ if(need_encode_func(*src)) { \ - static const char *hex="0123456789ABCDEF"; \ + static const char* hex="0123456789ABCDEF"; \ char chunk[3]={prefix}; \ chunk[1]=hex[((unsigned char)*src)/0x10]; \ chunk[2]=hex[((unsigned char)*src)%0x10]; \ @@ -65,7 +66,7 @@ inline bool need_http_header_encode(unsi // -static const char * String_Untaint_lang_name[]={ +static const char* String_Untaint_lang_name[]={ "U", ///< zero value handy for hash lookup @see untaint_lang_name2enum "C", ///< clean "T", ///< tainted, untaint language as assigned later @@ -125,7 +126,7 @@ quoted-pair = "\" CHAR if(strchr("()<>@,;:\\\"/[]?={} \t", *ptr)) */ -inline bool need_quote_http_header(const char *ptr, size_t size) { +inline bool need_quote_http_header(const char* ptr, size_t size) { for(; size--; ptr++) if(strchr(";\\\"= \t" /* excluded ()<>@, :/ ? []{} */, *ptr)) return true; @@ -143,8 +144,13 @@ String& String::append_to(String& dest, if(is_empty()) return dest; - // without language-chage, small[fitting dest tail] string? - if(lang==UL_PASS_APPENDED && fused<=(dest.fallocated-dest.fused)) { + // without language-chage string? + if(lang==UL_PASS_APPENDED) { + // can simply append elements + ssize_t delta=fused-(dest.fallocated-dest.fused); + if(delta>0) // they don't fit? + dest.expand(delta); + // felements[fused...]=src.felements[0..fused], fused+=src.fused memcpy(&dest.felements[dest.fused], felements, sizeof(felements[0])*fused); dest.fused+=fused; @@ -188,7 +194,7 @@ String& String::append_to(String& dest, size_t String::cstr_bufsize(Untaint_lang lang, SQL_Connection *connection, - const Request_charset_info *charsets) const { + const Request_charsets *charsets) const { size_t dest=1; // for terminating 0 STRING_FOREACH_FRAGMENT( uchar to_lang=lang==UL_UNSPECIFIED?fragment->lang:lang; @@ -220,11 +226,11 @@ size_t String::cstr_bufsize(Untaint_lang break; case UL_MAIL_HEADER: // tainted, untaint language: mail-header - if(charsets && charsets->mail) { + if(charsets) { int parts_count=1; - const char *prev=fragment->ptr; + const char* prev=fragment->ptr; size_t size=fragment->size; - while(const char *comma_at=(const char*)memchr(prev, ',', size)) { + while(const char* comma_at=(const char*)memchr(prev, ',', size)) { parts_count++; size-=comma_at-prev; prev=comma_at+1; @@ -232,7 +238,7 @@ size_t String::cstr_bufsize(Untaint_lang // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= dest+= fragment->size*3+ - parts_count*(charsets->mail->name()->size()+MAX_STRING/* worst: =?charset?Q?=%XX?= */); + parts_count*(charsets->mail().name()->size()+MAX_STRING/* worst: =?charset?Q?=%XX?= */); } else dest+=fragment->size; break; @@ -312,7 +318,7 @@ static bool mail_header_char_valid_withi } char *String::store_to(char *dest, Untaint_lang lang, SQL_Connection *connection, - const Request_charset_info *charsets) const { + const Request_charsets *charsets) const { // WARNING: // before any changes check cstr_bufsize first!!! bool whitespace=true; @@ -341,7 +347,7 @@ char *String::store_to(char *dest, Untai // tainted, untaint language: file [name] escape( // Macintosh has problems with small Russian letter 'r' - if( *src=='\xF0' && charsets && *charsets->source->name()=="windows-1251" ) { + if( *src=='\xF0' && charsets && *charsets->source().name()=="windows-1251" ) { // fixing that letter for most common charset to_char('p'); } else // fallback to default @@ -353,16 +359,16 @@ char *String::store_to(char *dest, Untai const void *client_ptr; size_t client_size; if(charsets) - Charset::transcode(*charsets->pool, - *charsets->source, fragment->ptr, fragment->size, - *charsets->client, client_ptr, client_size); + Charset::transcode(charsets->pool(), + charsets->source(), fragment->ptr, fragment->size, + charsets->client(), client_ptr, client_size); else { client_ptr=fragment->ptr; client_size=fragment->size; } { - const char *src=(const char *)client_ptr; + const char* src=(const char* )client_ptr; for(int size=client_size; size--; src++) encode(need_uri_encode, '%'); } @@ -376,19 +382,20 @@ char *String::store_to(char *dest, Untai case UL_MAIL_HEADER: // tainted, untaint language: mail-header // http://www.ietf.org/rfc/rfc2047.txt - if(charsets && charsets->mail) { + if(charsets) { const void *mail_ptr; size_t mail_size; - Charset::transcode(*charsets->pool, - *charsets->source, fragment->ptr, fragment->size, - *charsets->mail, mail_ptr, mail_size); + Charset::transcode(charsets->pool(), + charsets->source(), fragment->ptr, fragment->size, + charsets->mail(), mail_ptr, mail_size); + CharPtr charset_name=charsets->mail().name()->cstr(); // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= - const char *src=(const char *)mail_ptr; + const char* src=(const char* )mail_ptr; bool to_quoted_printable=false; bool email=false; - for(const char *end=src+mail_size; srcquote(dest, fragment->ptr, fragment->size); else - throw Exception(0, - ConstStringPtr(this), + throw Exception(Exception::undefined_type, + Exception::undefined_source, "untaint in SQL language failed - no connection specified"); break; case UL_JS: @@ -468,8 +475,8 @@ char *String::store_to(char *dest, Untai }); break; default: - throw Exception(0, - ConstStringPtr(this), + throw Exception(Exception::undefined_type, + Exception::undefined_source, "unknown untaint language #%d", static_cast(to_lang)); // should never break; // never @@ -516,8 +523,8 @@ IFNDEF_NO_STRING_ORIGIN( ); uchar show_lang=fragment->lang & ~UL_OPTIMIZE_BIT; if(show_lang>=sizeof(String_Untaint_lang_name)/sizeof(String_Untaint_lang_name[0])) - throw Exception(0, - ConstStringPtr(this), + throw Exception(Exception::undefined_type, + Exception::undefined_source, "unknown untaint language #%d", static_cast(show_lang)); // sould never