--- parser3/src/classes/op.C 2008/05/26 14:23:46 1.178 +++ parser3/src/classes/op.C 2009/07/14 11:14:34 1.194 @@ -1,11 +1,11 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_OP_C="$Date: 2008/05/26 14:23:46 $"; +static const char * const IDENT_OP_C="$Date: 2009/07/14 11:14:34 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -70,7 +70,7 @@ static const String exception_var_name(E // helpers -class Untaint_lang_name2enum: public Hash { +class Untaint_lang_name2enum: public HashString { public: Untaint_lang_name2enum() { #define ULN(name, LANG) \ @@ -88,6 +88,7 @@ public: ULN("html", HTML); ULN("optimized-html", HTML|String::L_OPTIMIZE_BIT); ULN("regex", REGEX); + ULN("parser-code", PARSER_CODE); #undef ULN } } untaint_lang_name2enum; @@ -97,16 +98,16 @@ public: static void _if(Request& r, MethodParams& params) { bool condition=params.as_bool(0, "condition must be expression", r); if(condition) - r.write_pass_lang(r.process(*params.get(1))); + r.process_write(*params.get(1)); else if(params.count()>2) - r.write_pass_lang(r.process(*params.get(2))); + r.process_write(*params.get(2)); } static String::Language get_untaint_lang(MethodParams& params, int index){ const String& lang_name=params.as_string(index, "lang must be string"); String::Language lang=untaint_lang_name2enum.get(lang_name); if(!lang) - throw Exception(0, + throw Exception(PARSER_RUNTIME, &lang_name, "invalid taint language"); return lang; @@ -123,7 +124,8 @@ static void _untaint(Request& r, MethodP Value& vbody=params.as_junction(params.count()-1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang + StringOrValue result=r.process(vbody); // process marking tainted with that lang + r.write_assign_lang(result); } } @@ -137,11 +139,8 @@ static void _taint(Request& r, MethodPar { Value& vbody=params.as_no_junction(params.count()-1, "body must not be code"); - String result; - result.append( - vbody.as_string(), // process marking tainted with that lang - lang, true); // force result language to specified - r.write_pass_lang(result); + String result(vbody.as_string(), lang); // force result language to specified + r.write_assign_lang(result); } } @@ -165,7 +164,7 @@ static void _process(Request& r, MethodP "no target class"); // temporary remove language change - Temp_lang temp_lang(r, String::L_PASS_APPENDED); + Temp_lang temp_lang(r, String::L_PARSER_CODE); // temporary zero @main so to maybe-replace it in processed code Temp_method temp_method_main(*target_class, main_method_name, 0); // temporary zero @auto so it wouldn't be auto-called in Request::use_buf @@ -214,7 +213,7 @@ static void _process(Request& r, MethodP // evaluate source to process const String& source=r.process_to_string(vjunction); r.use_buf(*target_class, - source.cstr(String::L_UNSPECIFIED, r.connection(false)), + source.untaint_cstr(String::L_AS_IS, r.connection(false)), main_alias, processe_file_no, line_no_alias_offset); @@ -247,31 +246,48 @@ static void _while(Request& r, MethodPar // while... int endless_loop_count=0; - bool need_delim=false; - while(true) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(PARSER_RUNTIME, - 0, - "endless loop detected"); + if(delim_maybe_code){ // delimiter set + bool need_delim=false; + while(true) { + if(++endless_loop_count>=MAX_LOOPS) // endless loop? + throw Exception(PARSER_RUNTIME, + 0, + "endless loop detected"); - bool condition=r.process_to_value(vcondition, - false/*don't intercept string*/).as_bool(); - if(!condition) // ...condition is true - break; + if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + break; + + StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - StringOrValue sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - const String* s_processed=sv_processed.get_string(); - if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body - if(need_delim) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); - else - need_delim=true; + const String* s_processed=sv_processed.get_string(); + if(s_processed && !s_processed->is_empty()) { // we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + else + need_delim=true; + } + r.write_pass_lang(sv_processed); + + if(lskip==Request::SKIP_BREAK) + break; } - r.write_pass_lang(sv_processed); + } else { + while(true) { + if(++endless_loop_count>=MAX_LOOPS) // endless loop? + throw Exception(PARSER_RUNTIME, + 0, + "endless loop detected"); - if(lskip==Request::SKIP_BREAK) - break; + if(!r.process_to_value(vcondition, false/*don't intercept string*/).as_bool()) + break; + + r.process_write(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + if(lskip==Request::SKIP_BREAK) + break; + } } } @@ -305,7 +321,7 @@ static void _for(Request& r, MethodParam const String& var_name=params.as_string(0, "var name must be string"); int from=params.as_int(1, "from must be int", r); int to=params.as_int(2, "to must be int", r); - Value& body_code=params.as_junction(3, "body must be code"); + Value& body_code=params.as_junction(3, "body must be code"); Value* delim_maybe_code=params.count()>4?¶ms[4]:0; if(to-from>=MAX_LOOPS) // too long loop? @@ -313,27 +329,41 @@ static void _for(Request& r, MethodParam 0, "endless loop detected"); - bool need_delim=false; VInt* vint=new VInt(0); VMethodFrame& caller=*r.get_method_frame()->caller(); caller.put_element(caller, var_name, vint, false); - for(int i=from; i<=to; i++) { - vint->set_int(i); + if(delim_maybe_code){ // delimiter set + bool need_delim=false; + + for(int i=from; i<=to; i++) { + vint->set_int(i); + + StringOrValue sv_processed=r.process(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); + + const String* s_processed=sv_processed.get_string(); + if(s_processed && !s_processed->is_empty()) { // we have body + if(need_delim) // need delim & iteration produced string? + r.write_pass_lang(r.process(*delim_maybe_code)); + else + need_delim=true; + } + r.write_pass_lang(sv_processed); - StringOrValue sv_processed=r.process(body_code); - Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - const String* s_processed=sv_processed.get_string(); - if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body - if(need_delim) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); - else - need_delim=true; + if(lskip==Request::SKIP_BREAK) + break; } - r.write_pass_lang(sv_processed); + } else { + for(int i=from; i<=to; i++) { + vint->set_int(i); + + r.process_write(body_code); + Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING); - if(lskip==Request::SKIP_BREAK) - break; + if(lskip==Request::SKIP_BREAK) + break; + } } } @@ -374,7 +404,8 @@ gettimeofday(&mt[0],NULL); // connect SQL_Connection* connection=SQL_driver_manager->get_connection(url.as_string(), protocol2driver_and_client, - r.charsets.source().NAME().cstr()); + r.charsets.source().NAME().cstr(), + r.request_info.document_root); #ifdef RESOURCES_DEBUG //measure:after connect @@ -389,7 +420,7 @@ r.sql_connect_time+=t[1]-t[0]; Temp_connection temp_connection(r, connection); // execute body try { - r.write_assign_lang(r.process(body_code)); + r.process_write(body_code); connection->commit(); connection->close(); } catch(...) { // process problem @@ -403,12 +434,22 @@ r.sql_connect_time+=t[1]-t[0]; class Switch_data: public PA_Object { public: Request& r; - Value& searching; + const String* searching_string; + double searching_double; Value* found; Value* _default; public: Switch_data(Request& ar, Value& asearching): - r(ar), searching(asearching) {} + r(ar) + { + if(asearching.is_string() || asearching.is_void()){ + searching_string=&asearching.as_string(); + searching_double=0; + } else { + searching_string=0; + searching_double=asearching.as_double(); + } + } }; #endif static void _switch(Request& r, MethodParams& params) { @@ -431,32 +472,36 @@ static void _case(Request& r, MethodPara 0, "without switch"); + if(data->found) // matches already was found + return; + int count=params.count(); - Value& code=params.as_junction(--count, "case result must be code"); + Value* code=¶ms.as_expression(--count, "case result must be code"); + +#ifdef USE_DESTRUCTORS + Junction *j=code->get_junction(); + if (j){ + code=new VJunction(j->self,j->method,j->method_frame,j->rcontext,j->wcontext,j->code); + if (j->wcontext) j->wcontext->attach_junction((VJunction *)code); + } +#endif - Value& searching=data->searching; - bool we_are_searching_string_or_void=searching.is_string() || searching.is_void(); - for(int i=0; i_default=&code; - break; + if(value.is_string() && value.as_string() == CASE_DEFAULT_VALUE){ + data->_default=code; + continue; } bool matches; - if(we_are_searching_string_or_void) - matches=searching.as_string() == value.as_string(); + if(data->searching_string) + matches=(*data->searching_string) == value.as_string(); else - matches=searching.as_double() == value.as_double(); - - if(matches) { - if(data->found) - throw Exception(PARSER_RUNTIME, - 0, - "duplicate found"); + matches=data->searching_double == value.as_double(); - data->found=&code; + if(matches){ + data->found=code; break; } } @@ -474,9 +519,11 @@ struct Try_catch_result { template static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, - Value* catch_code, bool could_be_handled_by_caller=false) + Value* catch_code, + bool could_be_handled_by_caller=false) { Try_catch_result result; + if(!catch_code) { result.processed_code=body_code(r, info); return result; @@ -496,6 +543,7 @@ static Try_catch_result try_catch(Reques Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false); VMethodFrame& frame=*junction->method_frame; frame.put_element(frame, exception_var_name, &details.vhash, false); + result.processed_code=r.process(*catch_code); // retriving $exception.handled, restoring $exception var @@ -512,7 +560,7 @@ static Try_catch_result try_catch(Reques bhandled=false; } else - bhandled=vhandled->as_bool(); + bhandled=vhandled->as_bool(); } if(!bhandled) { @@ -520,6 +568,7 @@ static Try_catch_result try_catch(Reques rethrow; } } + return result; } @@ -765,18 +814,33 @@ static StringOrValue process_try_body_co static void _try_operator(Request& r, MethodParams& params) { Value& body_code=params.as_junction(0, "body_code must be code"); Value& catch_code=params.as_junction(1, "catch_code must be code"); + Value* finally_code=(params.count()==3) ? ¶ms.as_junction(2, "finally_code must be code") : 0; - Try_catch_result result=try_catch(r, - process_try_body_code, &body_code, - &catch_code); - - if(result.exception_should_be_handled) - throw Exception(PARSER_RUNTIME, - result.exception_should_be_handled, - "catch block must set $exception.handled to some boolean value, not string"); + Try_catch_result result; + StringOrValue finally_result; + try{ + result=try_catch(r, + process_try_body_code, &body_code, + &catch_code); + if(result.exception_should_be_handled) + throw Exception(PARSER_RUNTIME, + result.exception_should_be_handled, + "catch block must set $exception.handled to some boolean value, not string"); + } catch(...){ + if(finally_code) + finally_result=r.process(*finally_code); + rethrow; + } + + if(finally_code) + finally_result=r.process(*finally_code); // write out processed body_code or catch_code r.write_pass_lang(result.processed_code); + + // write out processed finally code + if(finally_code) + r.write_pass_lang(finally_result); } static void _throw_operator(Request&, MethodParams& params) { @@ -831,36 +895,38 @@ VClassMAIN::VClassMAIN(): VClass() { // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} - add_native_method("if", Method::CT_ANY, _if, 2, 3); + add_native_method("if", Method::CT_ANY, _if, 2, 3, Method::CO_WITHOUT_FRAME); - // ^untaint[as-is|uri|sql|js|html|html-typo]{code} - add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2); + // ^untaint[as-is|uri|sql|js|html|html-typo|regex|parser-code]{code} + add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2, Method::CO_WITHOUT_FRAME); - // ^taint[as-is|uri|sql|js|html|html-typo]{code} - add_native_method("taint", Method::CT_ANY, _taint, 1, 2); + // ^taint[as-is|uri|sql|js|html|html-typo|regex|parser-code]{code} + add_native_method("taint", Method::CT_ANY, _taint, 1, 2, Method::CO_WITHOUT_FRAME); // ^process[code] add_native_method("process", Method::CT_ANY, _process, 1, 3); // ^rem{code} - add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); + add_native_method("rem", Method::CT_ANY, _rem, 1, 10000, Method::CO_WITHOUT_FRAME); // ^while(condition){code} - add_native_method("while", Method::CT_ANY, _while, 2, 3); + add_native_method("while", Method::CT_ANY, _while, 2, 3, Method::CO_WITHOUT_FRAME); // ^use[file] add_native_method("use", Method::CT_ANY, _use, 1, 1); // ^break[] - add_native_method("break", Method::CT_ANY, _break, 0, 0); + add_native_method("break", Method::CT_ANY, _break, 0, 0, Method::CO_WITHOUT_FRAME); + // ^continue[] - add_native_method("continue", Method::CT_ANY, _continue, 0, 0); + add_native_method("continue", Method::CT_ANY, _continue, 0, 0, Method::CO_WITHOUT_FRAME); + // ^for[i](from-number;to-number-inclusive){code}[delim] - add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); + add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1, Method::CO_WITHOUT_WCONTEXT); // ^eval(expr) // ^eval(expr)[format] - add_native_method("eval", Method::CT_ANY, _eval, 1, 2); + add_native_method("eval", Method::CT_ANY, _eval, 1, 2, Method::CO_WITHOUT_FRAME); // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); @@ -874,15 +940,15 @@ VClassMAIN::VClassMAIN(): VClass() { // switch // ^switch[value]{cases} - add_native_method("switch", Method::CT_ANY, _switch, 2, 2); + add_native_method("switch", Method::CT_ANY, _switch, 2, 2, Method::CO_WITHOUT_FRAME); // ^case[value]{code} - add_native_method("case", Method::CT_ANY, _case, 2, 10000); + add_native_method("case", Method::CT_ANY, _case, 2, 10000, Method::CO_WITHOUT_FRAME); // try-catch // ^try{code}{catch code} - add_native_method("try", Method::CT_ANY, _try_operator, 2, 2); + add_native_method("try", Method::CT_ANY, _try_operator, 2, 3, Method::CO_WITHOUT_FRAME); // ^throw[$exception hash] // ^throw[type;source;comment] add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3);