--- parser3/src/classes/op.C 2009/07/14 11:14:34 1.194 +++ parser3/src/classes/op.C 2010/11/15 23:31:08 1.205 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_OP_C="$Date: 2009/07/14 11:14:34 $"; +static const char * const IDENT_OP_C="$Date: 2010/11/15 23:31:08 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -38,15 +38,6 @@ public: VClassMAIN(); }; -// defines for globals - -#define CYCLE_DATA_NAME "CYCLE-DATA" - -// globals - -//^for & co -String cycle_data_name(CYCLE_DATA_NAME); - // defines for statics #define SWITCH_DATA_NAME "SWITCH-DATA" @@ -75,6 +66,7 @@ public: Untaint_lang_name2enum() { #define ULN(name, LANG) \ put(String::Body(name), (value_type)(String::L_##LANG)); + ULN("clean", CLEAN); ULN("as-is", AS_IS); ULN("optimized-as-is", AS_IS|String::L_OPTIMIZE_BIT); ULN("file-spec", FILE_SPEC); @@ -89,6 +81,7 @@ public: ULN("optimized-html", HTML|String::L_OPTIMIZE_BIT); ULN("regex", REGEX); ULN("parser-code", PARSER_CODE); + ULN("json", JSON); #undef ULN } } untaint_lang_name2enum; @@ -96,11 +89,19 @@ public: // methods static void _if(Request& r, MethodParams& params) { - bool condition=params.as_bool(0, "condition must be expression", r); - if(condition) - r.process_write(*params.get(1)); - else if(params.count()>2) - r.process_write(*params.get(2)); + size_t max_param=params.count()-1; + size_t i=0; + do { + bool condition=params.as_bool(i, "condition must be expression", r); + if(condition) { + r.process_write(*params.get(i+1)); + return; + } + i+=2; + } while (i < max_param); + + if(i == max_param) + r.process_write(*params.get(i)); } static String::Language get_untaint_lang(MethodParams& params, int index){ @@ -144,6 +145,13 @@ static void _taint(Request& r, MethodPar } } +static void _apply_taint(Request& r, MethodParams& params) { + String::Language lang=params.count()==1 ? String::L_AS_IS : get_untaint_lang(params, 0); + const String &sbody=params.as_string(params.count()-1, "body must be string"); + String::Body result_body=sbody.cstr_to_string_body_untaint(lang, 0, &r.charsets); + r.write_pass_lang(*new String(result_body, String::L_AS_IS)); +} + static void _process(Request& r, MethodParams& params) { Method* main_method; @@ -157,7 +165,7 @@ static void _process(Request& r, MethodP } { - VStateless_class *target_class=target_self->get_last_derived_class(); + VStateless_class *target_class=target_self->get_class(); if(!target_class) throw Exception(PARSER_RUNTIME, 0, @@ -173,12 +181,10 @@ static void _process(Request& r, MethodP size_t options_index=index+1; HashStringValue* options=0; if(options_indexcount()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } uint processe_file_no=file_alias? @@ -224,10 +228,10 @@ static void _process(Request& r, MethodP // after restoring current-request-lang // maybe-execute @main[] if(main_method) { - // temporarily set method_frame's self to target_self - Temp_method_frame_self tmfs(*r.get_method_frame(), *target_self); - // execute! - r.execute(*main_method->parser_code); + VMethodFrame frame(*main_method, r.get_method_frame()->caller(), *target_self); + frame.empty_params(); + r.op_call(frame); + r.write_pass_lang(frame.result()); } } @@ -236,8 +240,7 @@ static void _rem(Request&, MethodParams& } static void _while(Request& r, MethodParams& params) { - Temp_hash_value - cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + InCycle temp(r); Value& vcondition=params.as_expression(0, "condition must be number, bool or expression"); @@ -293,12 +296,13 @@ static void _while(Request& r, MethodPar static void _use(Request& r, MethodParams& params) { Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE); - r.use_file(r.main_class, vfile.as_string()); + + // _use could be called from the parser3 method only, so caller is always defined + r.use_file(r.main_class, vfile.as_string(), r.get_method_filename(&r.get_method_frame()->caller()->method)); } static void set_skip(Request& r, Request::Skip askip) { - void* data=r.classes_conf.get(cycle_data_name); - if(!data) + if(!r.get_in_cycle()) throw Exception(PARSER_RUNTIME, 0, "without cycle"); @@ -315,8 +319,7 @@ static void _continue(Request& r, Method } static void _for(Request& r, MethodParams& params) { - Temp_hash_value - cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); + InCycle temp(r); const String& var_name=params.as_string(0, "var name must be string"); int from=params.as_int(1, "from must be int", r); @@ -332,7 +335,7 @@ static void _for(Request& r, MethodParam VInt* vint=new VInt(0); VMethodFrame& caller=*r.get_method_frame()->caller(); - caller.put_element(caller, var_name, vint, false); + caller.put_element(var_name, vint, false); if(delim_maybe_code){ // delimiter set bool need_delim=false; @@ -391,8 +394,8 @@ struct timeval mt[2]; Value& body_code=params.as_junction(1, "body must be code"); Table* protocol2driver_and_client=0; - if(Value* sql=r.main_class.get_element(String(MAIN_SQL_NAME), r.main_class, false)) { - if(Value* element=sql->get_element(String(MAIN_SQL_DRIVERS_NAME), *sql, false)) { + if(Value* sql=r.main_class.get_element(String(MAIN_SQL_NAME))) { + if(Value* element=sql->get_element(String(MAIN_SQL_DRIVERS_NAME))) { protocol2driver_and_client=element->get_table(); } } @@ -540,15 +543,15 @@ static Try_catch_result try_catch(Reques Junction* junction=catch_code->get_junction(); Value* method_frame=junction->method_frame; - Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false); + Value* saved_exception_var_value=method_frame->get_element(exception_var_name); VMethodFrame& frame=*junction->method_frame; - frame.put_element(frame, exception_var_name, &details.vhash, false); + frame.put_element(exception_var_name, &details.vhash, false); result.processed_code=r.process(*catch_code); // retriving $exception.handled, restoring $exception var Value* vhandled=details.vhash.hash().get(exception_handled_part_name); - frame.put_element(frame, exception_var_name, saved_exception_var_value, false); + frame.put_element(exception_var_name, saved_exception_var_value, false); bool bhandled=false; if(vhandled) { @@ -711,7 +714,7 @@ static Cache_get_result cache_get(Reques static time_t as_expires(Request& r, MethodParams& params, int index, time_t now) { time_t result; - if(Value* vdate=params[index].as(VDATE_TYPE, false)) + if(Value* vdate=params[index].as(VDATE_TYPE)) result=static_cast(vdate)->get_time(); else result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); @@ -895,7 +898,8 @@ 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, Method::CO_WITHOUT_FRAME); + // ^if(condition){code-when-true} (another condition){code-when-true} ... {code-when-false} + add_native_method("if", Method::CT_ANY, _if, 2, 10000, Method::CO_WITHOUT_FRAME); // ^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); @@ -903,6 +907,9 @@ VClassMAIN::VClassMAIN(): VClass() { // ^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); + // ^apply-taint[untaint lang][string] + add_native_method("apply-taint", Method::CT_ANY, _apply_taint, 1, 2, Method::CO_WITHOUT_FRAME); + // ^process[code] add_native_method("process", Method::CT_ANY, _process, 1, 3);