Annotation of parser3/src/main/untaint.C, revision 1.115.2.12.2.23
1.7 paf 1: /** @file
1.8 paf 2: Parser: String class part: untaint mechanizm.
3:
1.115.2.6 paf 4: Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
1.89 paf 5: Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
1.103 paf 6: */
1.8 paf 7:
1.115.2.12.2. 3(paf 8:3): static const char* IDENT_UNTAINT_C="$Date: 2003/04/08 08:10:26 $";
(paf 9:):
1.1 paf 10:
11: #include "pa_string.h"
12: #include "pa_hash.h"
13: #include "pa_exception.h"
1.13 paf 14: #include "pa_table.h"
1.32 paf 15: #include "pa_globals.h"
1.58 parser 16: #include "pa_dictionary.h"
1.66 parser 17: #include "pa_common.h"
1.85 paf 18: #include "pa_charset.h"
1.115.2.4 paf 19: #include "pa_request_charsets.h"
1.115.2.12.2. 9(paf 20:3): #include "pa_sapi.h"
1.1 paf 21:
1.115.2.12.2. (paf 22:): extern "C" { // author forgot to do that
23:): #include "ec.h"
24:): }
25:):
6(paf 26:3): #define PA_SQL
(paf 27:):
28:): #ifdef PA_SQL
29:): #include "pa_sql_connection.h"
30:): #endif
31:):
3(paf 32:3): // defines
33:3):
34:3):
35:3): #undef CORD_ec_append
36:3): // redefining to intercept flushes and implement whitespace optimization
37:3): // of all consequent white space chars leaving only first one
38:3): #define CORD_ec_append(x, c) \
39:3): { \
40:3): bool skip=false; \
41:3): if(optimize) switch(c) { \
42:3): case ' ': case '\r': case '\n': case '\t': \
43:3): if(whitespace) \
44:3): skip=true; /*skipping subsequent*/ \
45:3): else \
46:3): whitespace=true; \
47:3): break; \
48:3): default: \
49:3): whitespace=false; \
50:3): break; \
51:3): } \
52:3): if(!skip) { \
53:3): if ((x)[0].ec_bufptr == (x)[0].ec_buf + CORD_BUFSZ) { \
54:3): CORD_ec_flush_buf(x); \
55:3): } \
56:3): *((x)[0].ec_bufptr)++ = (c); \
57:3): } \
58:3): }
59:3):
60:3):
1.18 paf 61: #define escape(action) \
1.115.2.12.2. (paf 62:): for(; fragment_length--; CORD_next(pos)) { \
63:): char c=CORD_pos_fetch(pos); \
64:): action \
1.1 paf 65: }
1.115.2.12.2. (paf 66:): #define _default default: CORD_ec_append(result, c); break
5(paf 67:3): #define encode(need_encode_func, prefix, otherwise) \
(paf 68:): if(need_encode_func(c)) { \
69:): static const char* hex="0123456789ABCDEF"; \
70:): CORD_ec_append(result, prefix); \
71:): CORD_ec_append(result, hex[((unsigned char)c)/0x10]); \
72:): CORD_ec_append(result, hex[((unsigned char)c)%0x10]); \
73:): } else \
5(paf 74:3): CORD_ec_append(result, otherwise);
(paf 75:): #define to_char(c) CORD_ec_append(result, c)
76:): #define to_string(s) CORD_ec_append_cord(result, s)
1.4 paf 77:
1.9 paf 78: inline bool need_file_encode(unsigned char c){
1.108 paf 79: // russian letters and space ENABLED
80: // encoding only these...
81: return strchr(
82: "*?'\"<>|"
83: #ifndef WIN32
84: ":\\~"
1.31 paf 85: #endif
1.108 paf 86: , c)!=0;
1.9 paf 87: }
1.5 paf 88: inline bool need_uri_encode(unsigned char c){
1.13 paf 89: if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z'))
1.4 paf 90: return false;
91:
1.5 paf 92: return !strchr("_-./", c);
93: }
1.36 paf 94: inline bool need_http_header_encode(unsigned char c){
1.18 paf 95: if(strchr(" , :", c))
1.5 paf 96: return false;
97:
98: return need_uri_encode(c);
1.4 paf 99: }
1.1 paf 100:
1.56 parser 101: //
102:
1.115.2.6 paf 103: static const char* String_Untaint_lang_name[]={
1.56 parser 104: "U", ///< zero value handy for hash lookup @see untaint_lang_name2enum
105: "C", ///< clean
106: "T", ///< tainted, untaint language as assigned later
107: // untaint languages. assigned by ^untaint[lang]{...}
108: "P",
109: /**<
110: leave language built into string being appended.
111: just a flag, that value not stored
112: */
113: "A", ///< leave all characters intact
1.68 parser 114: "F", ///< file specification
115: "H", ///< ext in HTTP response header
1.56 parser 116: "M", ///< text in mail header
117: "URI", ///< text in uri
118: "T", ///< ^table:set body
119: "SQL", ///< ^table:sql body
120: "JS", ///< JavaScript code
1.68 parser 121: "XML", ///< ^dom:set xml
1.82 paf 122: "HTML" ///< HTML code (for editing)
1.56 parser 123: };
124:
125:
1.1 paf 126: // String
127:
1.41 paf 128: /*
129:
130: HTTP-header = field-name ":" [ field-value ] CRLF
131:
132: field-name = token
133: field-value = *( field-content | LWS )
134:
135: field-content = <the OCTETs making up the field-value
136: and consisting of either *TEXT or combinations
137: of token, tspecials, and quoted-string>
138:
139:
140:
141: word = token | quoted-string
142:
143: token = 1*<any CHAR except CTLs or tspecials>
144:
145:
146:
147: tspecials = "(" | ")" | "<" | ">" | "@"
148: | "," | ";" | ":" | "\" | <">
149: | "/" | "[" | "]" | "?" | "="
150: | "{" | "}" | SP | HT
151:
152: SP = <US-ASCII SP, space (32)>
153: HT = <US-ASCII HT, horizontal-tab (9)>
154:
155: LWS = [CRLF] 1*( SP | HT )
156: TEXT = <any OCTET except CTLs,
157: but including LWS>
158:
159: quoted-pair = "\" CHAR
160:
161: if(strchr("()<>@,;:\\\"/[]?={} \t", *ptr))
162: */
1.115.2.6 paf 163: inline bool need_quote_http_header(const char* ptr, size_t size) {
1.41 paf 164: for(; size--; ptr++)
1.42 paf 165: if(strchr(";\\\"= \t" /* excluded ()<>@, :/ ? []{} */, *ptr))
1.41 paf 166: return true;
167: return false;
168: }
169:
1.115.2.12.2. (paf 170:):
1.91 paf 171: /**
1.115.2.1 paf 172: appends to other String,
1.91 paf 173: marking all tainted pieces of it with @a lang.
1.92 paf 174: or marking ALL pieces of it with a @a lang when @a forced to,
175: and propagating OPTIMIZE language bit.
1.91 paf 176: */
1.115.2.12.2. (paf 177:): String& String::append_to(String& dest, Language lang, bool forced) const {
0(paf 178:3): if(is_empty())
1.115.2.1 paf 179: return dest;
180:
1.115.2.12.2. (paf 181:): // first: letters
7(paf 182:3): dest.body<<body;
1.91 paf 183:
1.115.2.12.2. (paf 184:): // next: fragment infos
185:):
186:): if(lang==L_PASS_APPENDED) // without language-chage string?
187:): dest.fragments.append(fragments);
188:): else if(forced) //forcing passed lang?
189:): dest.fragments+=Fragment(lang, length());
190:): else if(lang&L_OPTIMIZE_BIT) {
191:): Array_iterator<ArrayFragment::element_type> i(fragments);
192:): while(i.has_next()) {
8(paf 193:3): const Fragment fragment=i.next();
(paf 194:): // main idea here:
195:): // tainted piece would get OPTIMIZED bit from 'lang'
196:): // clean piece would be marked OPTIMIZED manually
197:): // pieces with determined languages [not tainted|clean] would retain theirs langs
198:): dest.fragments+=Fragment(static_cast<Language>(
199:): fragment.lang==L_TAINTED?lang:(
200:): fragment.lang==L_CLEAN?L_CLEAN|L_OPTIMIZE_BIT: // ORing with OPTIMIZED flag
201:): fragment.lang)),
202:): fragment.length);
203:): }
204:): } else { // The core idea: tainted pieces got marked with context's lang
205:): Array_iterator<ArrayFragment::element_type> i(fragments);
206:): while(i.has_next()) {
8(paf 207:3): const Fragment fragment=i.next();
(paf 208:): dest.fragments+=Fragment(
209:): fragment.lang==L_TAINTED?lang:fragment.lang,
210:): fragment.length);
211:): }
212:): }
1.115.2.1 paf 213:
214: return dest;
1.77 paf 215: }
216:
1.109 paf 217: /** http://www.ietf.org/rfc/rfc2047.txt
218: RFC
219: (3) As a replacement for a 'word' entity within a 'phrase', for example,
220: one that precedes an address in a From, To, or Cc header. The ABNF
221: definition for 'phrase' from RFC 822 thus becomes:
222:
223: phrase = 1*( encoded-word / word )
224:
225: In this case the set of characters that may be used in a "Q"-encoded
226: 'encoded-word' is restricted to: <upper and lower case ASCII
227: letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
228: (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
229: 'phrase' MUST be separated from any adjacent 'word', 'text' or
230: 'special' by 'linear-white-space'.
231: ...
232: (2) The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be
233: represented as "_" (underscore, ASCII 95.). (This character may
234: not pass through some internetwork mail gateways, but its use
235: will greatly enhance readability of "Q" encoded data with mail
236: readers that do not support this encoding.) Note that the "_"
237: always represents hexadecimal 20, even if the SPACE character
238: occupies a different code position in the character set in use.
239:
240: paf: obviously,
241: without "=", or one could not differ "=E0" and "russian letter a"
242: and without "_", or in would mean 0x20
243: */
1.115.2.12.2. (paf 244:): inline bool mail_header_char_valid_within_Qencoded(char c) {
1.109 paf 245: return c>='A' && c<='Z'
246: || c>='a' && c<='Z'
247: || c>='0' && c<='9'
248: || strchr("!*+-/", c);
249: }
1.115.2.12.2. 5(paf 250:3): /**
251:3): RFC
252:3): Upper case should be used for hexadecimal digits "A" through "F"
253:3): The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE)
254:3): may be represented as "_"
255:3): */
256:3): inline bool mail_header_nonspace_char(char c) {
257:3): return c != 0x20;
258:3): }
2(paf 259:3): inline void ec_append(CORD_ec& result, bool& optimize, bool& whitespace, CORD_pos pos, size_t size) {
(paf 260:): while(size--) {
261:): CORD_ec_append(result, CORD_pos_fetch(pos));
262:): CORD_next(pos);
263:): }
264:): }
3(paf 265:3): inline void pa_CORD_pos_advance(CORD_pos pos, size_t n) {
1(paf 266:3): while(true) {
267:3): size_t avail=CORD_pos_chars_left(pos);
268:3): if(avail==0) {
269:3): CORD_next(pos);
3(paf 270:3): if(!--n)
1(paf 271:3): break;
3(paf 272:3): } else if(avail<n) {
1(paf 273:3): CORD_pos_advance(pos, avail);
3(paf 274:3): n-=avail;
275:3): } else { // avail>=n
276:3): CORD_pos_advance(pos, n);
1(paf 277:3): break;
278:3): }
279:3): }
280:3): }
0(paf 281:3): StringBody String::cstr_to_string_body(Language lang,
(paf 282:): SQL_Connection* connection,
283:): const Request_charsets *charsets) const {
284:): CORD_ec result; CORD_ec_init(result);
0(paf 285:3): CORD_pos pos; body.set_pos(pos, 0);
(paf 286:):
1.44 paf 287: bool whitespace=true;
1.111 paf 288:
1.115.2.12.2. (paf 289:): size_t fragment_begin=0;
290:): size_t fragment_end;
291:): for(Array_iterator<Fragment> i(fragments); i.has_next(); fragment_begin=fragment_end) {
8(paf 292:3): const Fragment fragment=i.next();
(paf 293:): size_t fragment_length=fragment.length;
294:): fragment_end=fragment_begin+fragment_length;
2(paf 295:3): //fprintf(stderr, "%d, %d\n", fragment.lang, fragment.length);
1.77 paf 296:
1.115.2.12.2. (paf 297:): Language to_lang=lang==L_UNSPECIFIED?fragment.lang:lang;
3(paf 298:3): bool optimize=(to_lang & L_OPTIMIZE_BIT)!=0;
299:3): if(!optimize)
300:3): whitespace=false;
0(paf 301:3):
(paf 302:): switch(to_lang & ~L_OPTIMIZE_BIT) {
303:): case L_CLEAN:
304:): case L_TAINTED:
305:): case L_AS_IS:
1.77 paf 306: // clean piece
307:
308: // tainted piece, but undefined untaint language
309: // for VString.as_double of tainted values
310: // for ^process{body} evaluation
311:
312: // tainted, untaint language: as-is
1.115.2.12.2. 3(paf 313:3): ec_append(result, optimize, whitespace, pos, fragment_length);
1.77 paf 314: break;
1.115.2.12.2. (paf 315:): case L_FILE_SPEC:
1.77 paf 316: // tainted, untaint language: file [name]
1.83 paf 317: escape(
1.113 paf 318: // Macintosh has problems with small Russian letter 'r'
1.115.2.12.2. (paf 319:): if( c=='\xF0' && charsets && charsets->source().name()=="windows-1251" ) {
1.113 paf 320: // fixing that letter for most common charset
1.115.2.2 paf 321: to_char('p');
1.114 paf 322: } else // fallback to default
1.115.2.12.2. 5(paf 323:3): encode(need_file_encode, '_', c);
1.83 paf 324: );
1.77 paf 325: break;
1.115.2.12.2. (paf 326:): case L_URI:
1.77 paf 327: // tainted, untaint language: uri
1.85 paf 328: {
1.115.2.12.2. 6(paf 329:3): const char *fragment_str=body.mid(fragment_begin, fragment_length).cstr();
4(paf 330:3): // skip source [we use recoded version]
1(paf 331:3): pa_CORD_pos_advance(pos, fragment_length);
(paf 332:): const void *client_ptr;
333:): size_t client_size;
334:): if(charsets)
335:): Charset::transcode(
6(paf 336:3): charsets->source(), fragment_str, fragment_length,
(paf 337:): charsets->client(), client_ptr, client_size);
338:): else {
6(paf 339:3): client_ptr=fragment_str;
340:3): client_size=fragment_length;
(paf 341:): }
342:):
343:): char c;
344:): for(const char* src=(const char* )client_ptr; c=*src++; )
5(paf 345:3): encode(need_uri_encode, '%', c);
1.85 paf 346: }
1.77 paf 347: break;
1.115.2.12.2. (paf 348:): case L_HTTP_HEADER:
1.77 paf 349: // tainted, untaint language: http-field-content-text
1.108 paf 350: escape(
1.115.2.12.2. 5(paf 351:3): encode(need_uri_encode, '%', c);
1.108 paf 352: );
1.77 paf 353: break;
1.115.2.12.2. (paf 354:): case L_MAIL_HEADER:
1.77 paf 355: // tainted, untaint language: mail-header
1.105 paf 356: // http://www.ietf.org/rfc/rfc2047.txt
1.115.2.4 paf 357: if(charsets) {
1.115.2.12.2. 5(paf 358:3): size_t mail_size;
359:3): const char *mail_ptr=
360:3): body.mid(fragment_begin, mail_size=fragment_length).cstr();
361:3): // skip source [we use recoded version]
1(paf 362:3): pa_CORD_pos_advance(pos, mail_size);
5(paf 363:3):
364:3): const char* charset_name=charsets->mail().name().cstr();
1.87 paf 365:
1.77 paf 366: // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
367: bool to_quoted_printable=false;
1.105 paf 368:
1.111 paf 369: bool email=false;
1.115.2.12.2. 5(paf 370:3): uchar c;
371:3): for(const char* src=mail_ptr; c=(uchar)*src++; ) {
1.111 paf 372: //RFC + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'.
1.115.2.12.2. (paf 373:): if(to_quoted_printable && (c==',' || c=='<')) {
374:): email=c=='<';
5(paf 375:3): to_string("?=");
1.107 paf 376: to_quoted_printable=false;
1.105 paf 377: }
1.111 paf 378: if(!email && (
1.115.2.12.2. (paf 379:): !to_quoted_printable && (c & 0x80) // starting quote-printable-encoding on first 8bit char
380:): || to_quoted_printable && !mail_header_char_valid_within_Qencoded(c)
1.105 paf 381: )) {
1.77 paf 382: if(!to_quoted_printable) {
1.115.2.12.2. 5(paf 383:3): to_string("=?");
384:3): to_string(charset_name);
385:3): to_string("?Q?");
1.77 paf 386: to_quoted_printable=true;
387: }
1.115.2.12.2. 5(paf 388:3): encode(mail_header_nonspace_char, '=', '_');
1.105 paf 389: } else
1.115.2.12.2. 5(paf 390:3): to_char(c);
(paf 391:): if(c=='>')
1.111 paf 392: email=false;
1.44 paf 393: }
1.112 paf 394: if(to_quoted_printable) // close
1.115.2.12.2. 5(paf 395:3): to_string("?=");
1.87 paf 396:
1.115.2.12.2. 5(paf 397:3): } else
398:3): ec_append(result, optimize, whitespace, pos, fragment_length);
1.77 paf 399: break;
1.115.2.12.2. (paf 400:): case L_TABLE:
1.77 paf 401: // tainted, untaint language: table
1.115.2.12.2. (paf 402:): escape(switch(c) {
1.77 paf 403: case '\t': to_char(' '); break;
404: case '\n': to_char(' '); break;
405: _default;
406: });
407: break;
1.115.2.12.2. (paf 408:): #ifdef PA_SQL
409:): case L_SQL:
1.77 paf 410: // tainted, untaint language: sql
1.115.2.12.2. (paf 411:): if(connection) {
6(paf 412:3): const char *fragment_str=body.mid(fragment_begin, fragment_length).cstr();
413:3): // skip source [we use recoded version]
1(paf 414:3): pa_CORD_pos_advance(pos, fragment_length);
(paf 415:):
6(paf 416:3): to_string(connection->quote(fragment_str, fragment_length));
417:3): } else
(paf 418:): throw Exception(0,
419:): 0,
1.77 paf 420: "untaint in SQL language failed - no connection specified");
421: break;
1.115.2.12.2. (paf 422:): #endif
423:): case L_JS:
424:): escape(switch(c) {
425:): case '"': to_string("\\\""); break;
426:): case '\'': to_string("\\'"); break;
427:): case '\n': to_string("\\n"); break;
428:): case '\\': to_string("\\\\"); break;
429:): case '\xFF': to_string("\\\xFF"); break;
1.77 paf 430: _default;
431: });
432: break;
1.115.2.12.2. (paf 433:): case L_XML:
434:): escape(switch(c) {
435:): case '&': to_string("&"); break;
436:): case '>': to_string(">"); break;
437:): case '<': to_string("<"); break;
438:): case '"': to_string("""); break;
439:): case '\'': to_string("'"); break;
1.77 paf 440: _default;
441: });
442: break;
1.115.2.12.2. (paf 443:): case L_HTML:
444:): escape(switch(c) {
445:): case '&': to_string("&"); break;
446:): case '>': to_string(">"); break;
447:): case '<': to_string("<"); break;
448:): case '"': to_string("""); break;
1.77 paf 449: _default;
450: });
451: break;
452: default:
1.115.2.12.2. 9(paf 453:3): SAPI::die("unknown untaint language #%d",
454:3): static_cast<int>(to_lang)); // should never
1.77 paf 455: break; // never
1.76 paf 456: }
1.115.2.1 paf 457: }
458:
1.115.2.12.2. 0(paf 459:3): return StringBody(CORD_ec_to_cord(result));
1.1 paf 460: }
E-mail:
![[BACK]](/cvsweb/icons/back.gif){kind=icon}
Return to untaint.C CVS log ![[TXT]](/cvsweb/icons/text.gif){kind=icon}
![[DIR]](/cvsweb/icons/dir.gif){kind=icon}
Up to [parser3project] / parser3 / src / main