--- parser3/src/include/pa_request.h 2001/12/15 21:28:19 1.115 +++ parser3/src/include/pa_request.h 2002/04/15 11:34:24 1.130 @@ -1,10 +1,10 @@ /** @file Parser: request class decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_request.h,v 1.115 2001/12/15 21:28:19 paf Exp $ + $Id: pa_request.h,v 1.130 2002/04/15 11:34:24 paf Exp $ */ #ifndef PA_REQUEST_H @@ -30,6 +30,12 @@ #include #endif +// consts + +const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500; + +// defines + #ifndef NO_STRING_ORIGIN # define COMPILE_PARAMS \ const char *source, \ @@ -49,10 +55,12 @@ class Temp_lang; class Methoded; +class VMethodFrame; /// Main workhorse. class Request : public Pooled { friend class Temp_lang; + friend class Temp_connection; public: #ifdef RESOURCES_DEBUG @@ -80,7 +88,7 @@ public: uchar adefault_lang, ///< all tainted data default untainting lang bool status_allowed ///< status class allowed ); - ~Request() {} + ~Request(); /// global classes Hash& classes() { return fclasses; } @@ -99,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( @@ -111,12 +131,18 @@ 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 + /// processes any code-junction there may be inside of @a value + StringOrValue process(Value& input_value, bool intercept_string); // 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(); + } + //@} + /// appending, sure of clean string inside void write_no_lang(const String& astring) { wcontext->write(astring, @@ -140,8 +166,11 @@ public: } /// appending sure value, that would be converted to clean string void write_no_lang(Value& avalue) { - wcontext->write(avalue, - String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); + 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) { @@ -157,6 +186,16 @@ public: /// returns the mime type of 'user_file_name_cstr' const String& mime_type_of(const char *user_file_name_cstr); + /// returns current SQL connection if any + SQL_Connection *connection(const String *source) { + if(!fconnection && source) + throw Exception("parser.runtime", + source, + "outside of 'connect' operator"); + + return fconnection; + } + public: /// info from web server @@ -181,17 +220,20 @@ public: /// $cookie:elements VCookie cookie; + //@{ request processing status + /// execution stack + Stack stack; /// contexts Value *self, *root, *rcontext; /// contexts WContext *wcontext; + /// exception stack trace + Stack exception_trace; + //@} /// 'MAIN' class conglomerat VStateless_class *main_class; - /// connection - SQL_Connection *connection; - /// classes configured data Hash classes_conf; @@ -203,35 +245,26 @@ private: // core data /// already used files to avoid cyclic uses Hash used_files; - /// execution stack - Stack stack; - /** endless execute(execute(... preventing counter @see ANTI_ENDLESS_EXECUTE_RECOURSION */ uint anti_endless_execute_recoursion; - /// stack trace - Stack trace; - private: // compile.C VStateless_class& real_compile(COMPILE_PARAMS); private: // execute.C - const String *execute_method(Value& aself, - const Method& method, bool return_cstr=true); - const String *execute_virtual_method(Value& aself, - const String& method_name, bool return_cstr=true); + const String *execute_method(Value& aself, const Method& method, + bool return_cstr); + const String& execute_method(VMethodFrame& amethodFrame, const Method& method); + const String *execute_virtual_method(Value& aself, const String& method_name); const String *execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, bool return_cstr=true); - - Value *get_element(); + const String& method_name, + bool return_cstr); -private: // lang&raw - - uchar flang; + Value *get_element(bool can_call_operator); private: // defaults @@ -254,8 +287,27 @@ private: // lang manipulation flang=alang; } +private: // lang&raw + + uchar flang; + + +private: // connection manipulation + + SQL_Connection *set_connection(SQL_Connection *aconnection) { + SQL_Connection *result=fconnection; + fconnection=aconnection; + return result; + } + void restore_connection(SQL_Connection *aconnection) { + fconnection=aconnection; + } + private: + /// connection + SQL_Connection *fconnection; + void output_result(const VFile& body_file, bool header_only); }; @@ -273,6 +325,20 @@ public: } }; +/// Auto-object used for temporary changing Request::fconnection. +class Temp_connection { + Request& frequest; + SQL_Connection *saved_connection; +public: + Temp_connection(Request& arequest, SQL_Connection *aconnection) : + frequest(arequest), + saved_connection(arequest.set_connection(aconnection)) { + } + ~Temp_connection() { + frequest.restore_connection(saved_connection); + } +}; + /** @b method parameters passed in this array. contains handy typecast ad junction/not junction ensurers @@ -319,7 +385,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); @@ -327,9 +393,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: