--- parser3/src/classes/Attic/root.C 2001/03/13 11:15:03 1.35 +++ parser3/src/classes/Attic/root.C 2001/03/18 17:24:54 1.45 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: root.C,v 1.35 2001/03/13 11:15:03 paf Exp $ + $Id: root.C,v 1.45 2001/03/18 17:24:54 paf Exp $ */ #include @@ -19,10 +19,10 @@ static void _if(Request& r, const String // forcing ^if(this param type) r.fail_if_junction_(false, condition_code, method_name, "condition must be junction"); + bool condition=r.process(condition_code, 0/*no name*/, false/*don't intercept string*/).get_bool(); - if(condition) { Value& then_code=*static_cast(params->get(1)); // forcing ^if(this param type) @@ -43,21 +43,45 @@ static void _untaint(Request& r, const S String::Untaint_lang lang=static_cast( untaint_lang_name2enum->get_int(lang_name)); if(!lang) - R_THROW(0, 0, + RTHROW(0, 0, &lang_name, "invalid untaint language"); { - Temp_lang temp_lang(r, lang); Value *vbody=static_cast(params->get(1)); // forcing ^untaint[]{this param type} r.fail_if_junction_(false, *vbody, method_name, "body must be junction"); - r.write_pass_lang(r.process(*vbody)); + Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; + r.write_pass_lang(r.process(*vbody)); // process marking tainted with that lang + } +} + +static void _taint(Request& r, const String& method_name, Array *params) { + const String& lang_name=r.process(*static_cast(params->get(0))).as_string(); + String::Untaint_lang lang=static_cast( + untaint_lang_name2enum->get_int(lang_name)); + if(!lang) + RTHROW(0, 0, + &lang_name, + "invalid taint language"); + + { + Value *vbody=static_cast(params->get(1)); + // forcing ^untaint[]{this param type} + r.fail_if_junction_(true, *vbody, + method_name, "body must not be junction"); + + // set temporarily as-is language + Temp_lang temp_lang(r, String::Untaint_lang::AS_IS); + String result(r.pool()); + result.append( + r.process(*vbody).as_string(), // process marking tainted with that lang + lang, true); // force result language to specified + r.write_pass_lang(result); } } - static void _process(Request& r, const String& method_name, Array *params) { // calculate pseudo file name of processed chars @@ -72,7 +96,7 @@ static void _process(Request& r, const S strncpy(place, MAX_STRING, method_name.cstr()); #endif - VClass& self_class=*r.self->get_class(); + VStateless_class& self_class=*r.self->get_class(); { // temporary zero @main so to maybe-replace it in processed code Temp_method temp_method(self_class, *main_method_name, 0); @@ -114,7 +138,7 @@ static void _while(Request& r, const Str int endless_loop_count=0; while(true) { if(++endless_loop_count>=1973) // endless loop? - R_THROW(0, 0, + RTHROW(0, 0, &method_name, "endless loop detected"); @@ -155,12 +179,14 @@ static void _for(Request& r, const Strin Value *delim_code=params->size()==3+1+1?static_cast(params->get(3+1)):0; bool need_delim=false; + VInt *vint=new(pool) VInt(pool, 0); int endless_loop_count=0; - for(VInt *vint=new(pool) VInt(pool, from); vint->get_int()<=to; vint->inc()) { + for(int i=from; i<=to; i++) { if(++endless_loop_count>=2001) // endless loop? - R_THROW(0, 0, + RTHROW(0, 0, &method_name, "endless loop detected"); + vint->set_int(i); r.wcontext->put_element(var_name, vint); Value& processed_body=r.process(body_code); @@ -189,11 +215,11 @@ static void _eval(Request& r, const Stri method_name, "fmt must not be junction"); Pool& pool=r.pool(); - String *string=new(pool) String(pool); - string->APPEND_CONST(format(pool, result->get_double(), fmt.as_string().cstr())); - result=new(pool) VString(*string); + String& string=*new(pool) String(pool); + string.APPEND_CONST(format(pool, result->get_double(), fmt.as_string().cstr())); + result=new(pool) VString(string); } - r.wcontext->write(*result, String::Untaint_lang::NO /*always object, not string*/); + r.write_no_lang(*result); } @@ -201,7 +227,7 @@ typedef double (*math_one_double_op_func static double round(double op) { return floor(op+0.5); } static double sign(double op) { return op > 0 ? 1 : ( op < 0 ? -1 : 0 ); } -static void _math_one_double_op( +static void double_one_op( Request& r, const String& method_name, Array *params, math_one_double_op_func_ptr func) { @@ -213,37 +239,42 @@ static void _math_one_double_op( method_name, "parameter must be expression"); Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).get_double())); - r.wcontext->write(result, String::Untaint_lang::NO /*always object, not string*/); + r.write_no_lang(result); } static void _round(Request& r, const String& method_name, Array *params) { - _math_one_double_op(r, method_name, params, &round); + double_one_op(r, method_name, params, &round); } static void _floor(Request& r, const String& method_name, Array *params) { - _math_one_double_op(r, method_name, params, &floor); + double_one_op(r, method_name, params, &floor); } static void _ceiling(Request& r, const String& method_name, Array *params) { - _math_one_double_op(r, method_name, params, &ceil); + double_one_op(r, method_name, params, &ceil); } static void _abs(Request& r, const String& method_name, Array *params) { - _math_one_double_op(r, method_name, params, &fabs); + double_one_op(r, method_name, params, &fabs); } static void _sign(Request& r, const String& method_name, Array *params) { - _math_one_double_op(r, method_name, params, &sign); + double_one_op(r, method_name, params, &sign); } -void initialize_root_class(Pool& pool, VClass& vclass) { +// initialize + +void initialize_root_class(Pool& pool, VStateless_class& vclass) { // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} vclass.add_native_method("if", _if, 2, 3); - // ^untaint[as-is|sql|js|html|html-typo]{code} + // ^untaint[as-is|uri|sql|js|html|html-typo]{code} vclass.add_native_method("untaint", _untaint, 2, 2); + // ^taint[as-is|uri|sql|js|html|html-typo]{code} + vclass.add_native_method("taint", _taint, 2, 2); + // ^process[code] vclass.add_native_method("process", _process, 1, 1);