--- parser3/src/classes/Attic/root.C 2001/03/13 16:38:21 1.39 +++ parser3/src/classes/Attic/root.C 2001/03/28 09:01:20 1.52 @@ -3,16 +3,16 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: root.C,v 1.39 2001/03/13 16:38:21 paf Exp $ + $Id: root.C,v 1.52 2001/03/28 09:01:20 paf Exp $ */ -#include +#include "pa_config_includes.h" #include +#include "pa_common.h" #include "pa_request.h" #include "_root.h" #include "pa_vint.h" -#include "pa_common.h" static void _if(Request& r, const String& method_name, Array *params) { Value& condition_code=*static_cast(params->get(0)); @@ -22,16 +22,16 @@ static void _if(Request& r, const String bool condition=r.process(condition_code, 0/*no name*/, - false/*don't intercept string*/).get_bool(); + false/*don't intercept string*/).as_bool(); if(condition) { Value& then_code=*static_cast(params->get(1)); - // forcing ^if(this param type) + // forcing ^if{this param type} r.fail_if_junction_(false, then_code, method_name, "then-parameter must be junction"); r.write_pass_lang(r.process(then_code)); } else if(params->size()==3) { Value& else_code=*static_cast(params->get(2)); - // forcing ^if(this param type) + // forcing ^if{this param type} r.fail_if_junction_(false, else_code, method_name, "else-parameter must be junction"); r.write_pass_lang(r.process(else_code)); @@ -48,16 +48,40 @@ static void _untaint(Request& r, const S "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::UL_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 @@ -75,7 +99,9 @@ static void _process(Request& r, const S 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); + Temp_method temp_method_main(self_class, *main_method_name, 0); + // temporary zero @auto so it wouldn't be auto-called in Request::use_buf + Temp_method temp_method_auto(self_class, *auto_method_name, 0); // evaluate source to process const String& source= @@ -122,7 +148,7 @@ static void _while(Request& r, const Str r.process( vcondition, 0/*no name*/, - false/*don't intercept string*/).get_bool(); + false/*don't intercept string*/).as_bool(); if(!condition) // ...condition is true break; @@ -137,8 +163,7 @@ static void _use(Request& r, const Strin r.fail_if_junction_(true, vfile, method_name, "file name must not be junction"); - char *file=vfile.as_string().cstr(); - r.use_file(r.absolute(file)); + r.use_file(r.absolute(vfile.as_string())); } static void _for(Request& r, const String& method_name, Array *params) { @@ -146,8 +171,8 @@ static void _for(Request& r, const Strin Pool& pool=r.pool(); const String& var_name=r.process(*static_cast(params->get(0))).as_string(); - int from=(int)r.process(*static_cast(params->get(1))).get_double(); - int to=(int)r.process(*static_cast(params->get(2))).get_double(); + int from=(int)r.process(*static_cast(params->get(1))).as_double(); + int to=(int)r.process(*static_cast(params->get(2))).as_double(); Value& body_code=*static_cast(params->get(3)); // forcing ^menu{this param type} r.fail_if_junction_(false, body_code, @@ -183,7 +208,7 @@ static void _eval(Request& r, const Stri // evaluate expresion Value *result=r.process(expr, 0/*no name*/, - true/*don't intercept string*/).get_expr_result(); + true/*don't intercept string*/).as_expr_result(); if(params->size()==2) { Value& fmt=*static_cast(params->get(1)); // forcing ^format[this param type] @@ -191,11 +216,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->as_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); } @@ -214,8 +239,8 @@ static void double_one_op( r.fail_if_junction_(false, param, 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*/); + Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double())); + r.write_no_lang(result); } static void _round(Request& r, const String& method_name, Array *params) { @@ -238,14 +263,19 @@ static void _sign(Request& r, const Stri double_one_op(r, method_name, params, &sign); } +// 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);