--- parser3/src/include/pa_request.h 2002/03/27 13:33:32 1.124 +++ parser3/src/include/pa_request.h 2002/06/12 10:58:42 1.136 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_request.h,v 1.124 2002/03/27 13:33:32 paf Exp $ + $Id: pa_request.h,v 1.136 2002/06/12 10:58:42 paf Exp $ */ #ifndef PA_REQUEST_H @@ -30,6 +30,13 @@ #include #endif +// consts + +#define MAIN_METHOD_NAME "main" +const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; + +// defines + #ifndef NO_STRING_ORIGIN # define COMPILE_PARAMS \ const char *source, \ @@ -74,7 +81,6 @@ public: const char *content_type; size_t content_length; const char *cookie; - const char *user_agent; }; Request(Pool& apool, @@ -101,6 +107,18 @@ public: /// executes ops void execute(const Array& ops); // execute.C + /// execute ops with anti-recoursion check + void recoursion_checked_execute(const String *name, const Array& ops) { + // anti_endless_execute_recoursion + if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) { + anti_endless_execute_recoursion=0; // give @exception a chance + throw Exception("parser.runtime", + name, + "call canceled - endless recursion detected"); + } + execute(ops); // execute it + anti_endless_execute_recoursion--; + } /// compiles the file, maybe forcing it's class @a name and @a base_class. VStateless_class *use_file( @@ -113,45 +131,73 @@ public: const char *source, const char *file, VStateless_class *aclass=0, const String *name=0, VStateless_class *base_class=0); // core.C + /// processes any code-junction there may be inside of @a value - Value& process( - Value& value, - const String *name=0, - bool intercept_string=true); // execute.C + StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C + //@{ convinient helpers + const String& process_to_string(Value& input_value) { + return process(input_value, true/*intercept_string*/).as_string(); + } + Value& process_to_value(Value& input_value, bool intercept_string=true) { + return process(input_value, intercept_string).as_value(); + } + //@} + + +#define DEFINE_DUAL(modification) \ + void write_##modification##_lang(StringOrValue dual) { \ + if(const String *string=dual.get_string()) \ + write_##modification##_lang(*string); \ + else \ + write_##modification##_lang(*dual.get_value()); \ + } +#define DEFINE_DUAL_CHECKED(modification) \ + void write_##modification##_lang(StringOrValue dual, const String *origin) { \ + if(const String *string=dual.get_string()) \ + write_##modification##_lang(*string); \ + else \ + write_##modification##_lang(*dual.get_value(), origin); \ + } /// appending, sure of clean string inside void write_no_lang(const String& astring) { wcontext->write(astring, String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); } + /// appending sure value, that would be converted to clean string + void write_no_lang(Value& avalue) { + if(wcontext->get_in_expression()) + wcontext->write(avalue); + else + wcontext->write(avalue, + String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); + } + //DEFINE_DUAL(no) + /// appending string, passing language built into string being written void write_pass_lang(const String& astring) { wcontext->write(astring, String::UL_PASS_APPENDED); } + /// appending possible string, passing language built into string being written + void write_pass_lang(Value& avalue) { + wcontext->write(avalue, String::UL_PASS_APPENDED); + } + DEFINE_DUAL(pass) + /// appending possible string, assigning untaint language void write_assign_lang(Value& avalue) { wcontext->write(avalue, flang); } + /// appending possible string, assigning untaint language + void write_assign_lang(Value& avalue, const String *origin) { + wcontext->write(avalue, flang, origin); + } /// appending string, assigning untaint language void write_assign_lang(const String& astring) { wcontext->write(astring, flang); } - /// appending possible string, passing language built into string being written - void write_pass_lang(Value& avalue) { - wcontext->write(avalue, String::UL_PASS_APPENDED); - } - /// appending sure value, that would be converted to clean string - void write_no_lang(Value& avalue) { - if(wcontext->get_in_expression()) - wcontext->write(avalue); - else - wcontext->write(avalue, - String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); - } - /// appending sure value, not VString - void write_expr_result(Value& avalue) { - wcontext->write(avalue); - } + DEFINE_DUAL(assign) + DEFINE_DUAL_CHECKED(assign) /// returns relative to @a path path to @a file const String& relative(const char *apath, const String& relative_name); @@ -165,13 +211,17 @@ public: /// returns current SQL connection if any SQL_Connection *connection(const String *source) { if(!fconnection && source) - throw Exception(0, 0, + throw Exception("parser.runtime", source, "outside of 'connect' operator"); return fconnection; } + bool origins_mode() { + return main_class->get_element(*origins_mode_name)!=0; // $ORIGINS mode + } + public: /// info from web server @@ -179,6 +229,9 @@ public: /// user's post data char *post_data; size_t post_size; + /// name of 'main' method + const String main_method_name; + /// operators are methods of this class Methoded& OP; /// $env:fields @@ -226,6 +279,13 @@ private: // core data */ uint anti_endless_execute_recoursion; +private: + + /// already executed some @conf method + bool configure_admin_done; + + void configure_admin(VStateless_class& conf_class, const String *source); + private: // compile.C VStateless_class& real_compile(COMPILE_PARAMS); @@ -240,7 +300,7 @@ private: // execute.C const String& method_name, bool return_cstr); - Value *get_element(bool can_call_operator); + Value *get_element(const String *& remember_name, bool can_call_operator); private: // defaults @@ -284,9 +344,6 @@ private: /// connection SQL_Connection *fconnection; - -private: - void output_result(const VFile& body_file, bool header_only); }; @@ -364,7 +421,7 @@ private: Value& get_as(int index, bool as_junction, const char *msg) { Value& result=get(index); if((result.get_junction()!=0) ^ as_junction) - throw Exception(0, 0, + throw Exception("parser.runtime", &fmethod_name, "%s (parameter #%d)", msg, 1+index); @@ -372,9 +429,7 @@ private: } Value& get_processed(int index, const char *msg, Request& r) { - return r.process(as_junction(index, msg), - 0/*no name*/, - false/*don't intercept string*/); + return r.process_to_value(as_junction(index, msg), 0/*no name*/); } private: