--- parser3/src/include/pa_request.h 2001/09/24 14:34:25 1.97 +++ parser3/src/include/pa_request.h 2002/02/08 08:30:13 1.121 @@ -1,17 +1,15 @@ /** @file Parser: request class decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_request.h,v 1.97 2001/09/24 14:34:25 parser Exp $ + $Id: pa_request.h,v 1.121 2002/02/08 08:30:13 paf Exp $ */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -#include "pa_config_includes.h" #include "pa_pool.h" #include "pa_hash.h" #include "pa_wcontext.h" @@ -20,6 +18,7 @@ #include "pa_vclass.h" #include "pa_vobject.h" #include "pa_venv.h" +#include "pa_vstatus.h" #include "pa_vform.h" #include "pa_vmath.h" #include "pa_vrequest.h" @@ -27,6 +26,10 @@ #include "pa_vcookie.h" #include "pa_sql_driver_manager.h" +#ifdef RESOURCES_DEBUG +#include +#endif + #ifndef NO_STRING_ORIGIN # define COMPILE_PARAMS \ const char *source, \ @@ -46,12 +49,20 @@ class Temp_lang; class Methoded; +class VMethodFrame; /// Main workhorse. class Request : public Pooled { - friend Temp_lang; + friend class Temp_lang; + friend class Temp_connection; public: +#ifdef RESOURCES_DEBUG + /// measures + double sql_connect_time; + double sql_request_time; +#endif + /// some information from web server class Info { public: @@ -68,9 +79,10 @@ public: Request(Pool& apool, Info& ainfo, - String::Untaint_lang adefault_lang ///< all tainted data default untainting lang + uchar adefault_lang, ///< all tainted data default untainting lang + bool status_allowed ///< status class allowed ); - ~Request() {} + ~Request(); /// global classes Hash& classes() { return fclasses; } @@ -109,7 +121,8 @@ public: /// appending, sure of clean string inside void write_no_lang(const String& astring) { - wcontext->write(astring, String::UL_CLEAN); + wcontext->write(astring, + String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); } /// appending string, passing language built into string being written void write_pass_lang(const String& astring) { @@ -119,13 +132,18 @@ public: void write_assign_lang(Value& avalue) { wcontext->write(avalue, flang); } + /// 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) { - wcontext->write(avalue, String::UL_CLEAN); + wcontext->write(avalue, + String::UL_CLEAN | flang&String::UL_OPTIMIZE_BIT); } /// appending sure value, not VString void write_expr_result(Value& avalue) { @@ -141,6 +159,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(0, 0, + source, + "outside of 'connect' operator"); + + return fconnection; + } + public: /// info from web server @@ -152,6 +180,8 @@ public: Methoded& OP; /// $env:fields VEnv env; + /// $status:fields + VStatus status; /// $form:elements VForm form; /// $math:constants @@ -171,15 +201,9 @@ public: /// 'MAIN' class conglomerat VStateless_class *main_class; - /// connection - SQL_Connection *connection; - /// PCRE character tables - unsigned char *pcre_tables; - /// classes configured data Hash classes_conf; - private: // core data /// classes @@ -196,28 +220,28 @@ private: // core data */ 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 - - String::Untaint_lang flang; + Value *get_element(bool can_call_operator); private: // defaults - const String::Untaint_lang fdefault_lang; + const uchar fdefault_lang; Value *default_content_type; private: // mime types @@ -227,15 +251,37 @@ private: // mime types private: // lang manipulation - String::Untaint_lang set_lang(String::Untaint_lang alang) { - String::Untaint_lang result=flang; + uchar set_lang(uchar alang) { + uchar result=flang; flang=alang; return result; } - void restore_lang(String::Untaint_lang alang) { + void restore_lang(uchar alang) { 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; + + private: void output_result(const VFile& body_file, bool header_only); @@ -244,9 +290,9 @@ private: /// Auto-object used for temporary changing Request::flang. class Temp_lang { Request& frequest; - String::Untaint_lang saved_lang; + uchar saved_lang; public: - Temp_lang(Request& arequest, String::Untaint_lang alang) : + Temp_lang(Request& arequest, uchar alang) : frequest(arequest), saved_lang(arequest.set_lang(alang)) { } @@ -255,6 +301,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 @@ -279,12 +339,16 @@ public: return get_as(index, false, msg); } /// handy expression auto-processing to double - double as_double(int index, Request& r) { - return get_processed(index, r).as_double(); + double as_double(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_double(); } /// handy expression auto-processing to int - int as_int(int index, Request& r) { - return get_processed(index, r).as_int(); + int as_int(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_int(); + } + /// handy expression auto-processing to bool + bool as_bool(int index, const char *msg, Request& r) { + return get_processed(index, msg, r).as_bool(); } /// handy string ensurer const String& as_string(int index, const char *msg) { @@ -297,14 +361,15 @@ private: Value& get_as(int index, bool as_junction, const char *msg) { Value& result=get(index); if((result.get_junction()!=0) ^ as_junction) - THROW(0, 0, + throw Exception(0, 0, &fmethod_name, "%s (parameter #%d)", msg, 1+index); + return result; } - Value& get_processed(int index, Request& r) { - return r.process(get(index), + 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*/); }