--- parser3/src/include/pa_request.h 2002/02/08 08:30:13 1.121 +++ parser3/src/include/pa_request.h 2002/09/18 12:40:38 1.149 @@ -3,13 +3,13 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_request.h,v 1.121 2002/02/08 08:30:13 paf Exp $ */ #ifndef PA_REQUEST_H #define PA_REQUEST_H +static const char* IDENT_REQUEST_H="$Date: 2002/09/18 12:40:38 $"; + #include "pa_pool.h" #include "pa_hash.h" #include "pa_wcontext.h" @@ -20,6 +20,7 @@ #include "pa_venv.h" #include "pa_vstatus.h" #include "pa_vform.h" +#include "pa_vmail.h" #include "pa_vmath.h" #include "pa_vrequest.h" #include "pa_vresponse.h" @@ -30,6 +31,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, \ @@ -55,6 +63,7 @@ class VMethodFrame; class Request : public Pooled { friend class Temp_lang; friend class Temp_connection; + friend class Request_context_saver; public: #ifdef RESOURCES_DEBUG @@ -74,7 +83,7 @@ public: const char *content_type; size_t content_length; const char *cookie; - const char *user_agent; + bool mail_received; }; Request(Pool& apool, @@ -93,62 +102,104 @@ public: BEWARE: may throw exception to you: catch it! */ void core( - const char *root_config_filespec, ///< system config filespec - bool root_config_fail_on_read_problem, ///< fail if system config file not found - const char *site_config_filespec, ///< site config filespec - bool site_config_fail_on_read_problem, ///< fail if site config file not found + const char *config_filespec, ///< system config filespec + bool config_fail_on_read_problem, ///< fail if system config file not found bool header_only); /// 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( const String& file_name, - bool ignore_class_path=false, bool fail_on_read_problem=true, + bool ignore_class_path=false, + bool fail_on_read_problem=true, bool fail_on_file_absence=true, const String *name=0, VStateless_class *base_class=0); // core.C /// compiles a @a source buffer VStateless_class *use_buf( - const char *source, const char *file, + const char *source, const String& filespec, const char *filespec_cstr, 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) { - 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); @@ -162,20 +213,27 @@ 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, main_class, false)!=0; // $ORIGINS mode + } + public: /// info from web server Info& info; /// user's post data - char *post_data; size_t post_size; + const 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 @@ -184,6 +242,8 @@ public: VStatus status; /// $form:elements VForm form; + /// $mail + VMail mail; /// $math:constants VMath math; /// $request:elements @@ -193,17 +253,35 @@ public: /// $cookie:elements VCookie cookie; - /// contexts - Value *self, *root, *rcontext; - /// contexts - WContext *wcontext; - /// 'MAIN' class conglomerat VStateless_class *main_class; /// classes configured data Hash classes_conf; +private: + + //@{ request processing status + /// exception stack trace + Stack exception_trace; + /// execution stack + Stack stack; + /// contexts + Value *self; + VMethodFrame *method_frame; + Value *rcontext; + WContext *wcontext; + /// current language + uchar flang; + /// current connection + SQL_Connection *fconnection; + //@} + +public: // status read methods + + Value *get_self() { return self; } + VMethodFrame *get_method_frame() { return method_frame; } + private: // core data /// classes @@ -212,16 +290,17 @@ 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: + + /// already executed some @conf method + bool configure_admin_done; + + void configure_admin(VStateless_class& conf_class, const String *source); private: // compile.C @@ -229,15 +308,21 @@ private: // compile.C private: // execute.C - const String *execute_method(Value& aself, const Method& method, - bool return_cstr); + /// for @postprocess[body] const String& execute_method(VMethodFrame& amethodFrame, const Method& method); + //{ for @conf[filespec] and @auto[filespec] + void execute_method(Value& aself, + const Method& method, VString *optional_param, + const String **return_string); + void execute_nonvirtual_method(VStateless_class& aclass, + const String& method_name, VString *optional_param, + const String **return_string, + const Method **return_method=0); + //} + /// for @main[] 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); - Value *get_element(bool can_call_operator); + Value *get_element(const String *& remember_name, bool can_call_operator); private: // defaults @@ -260,11 +345,6 @@ private: // lang manipulation flang=alang; } -private: // lang&raw - - uchar flang; - - private: // connection manipulation SQL_Connection *set_connection(SQL_Connection *aconnection) { @@ -278,13 +358,46 @@ private: // connection manipulation private: - /// connection - SQL_Connection *fconnection; + void output_result(const VFile& body_file, bool header_only); +}; +/// Auto-object used to save request context across ^try body +class Request_context_saver { -private: + Request& fr; - void output_result(const VFile& body_file, bool header_only); + /// exception stack trace + int exception_trace; + /// execution stack + int stack; + /// contexts + Value *self; + VMethodFrame *method_frame; + Value *rcontext; + WContext *wcontext; + /// current language + uchar flang; + /// current connection + SQL_Connection *fconnection; + +public: + Request_context_saver(Request& ar) : + exception_trace(ar.exception_trace.top_index()), + stack(ar.stack.top_index()), + self(ar.self), + method_frame(ar.method_frame), + rcontext(ar.rcontext), + wcontext(ar.wcontext), + flang(ar.flang), + fconnection(ar.fconnection), + fr(ar) {} + ~Request_context_saver() { + fr.exception_trace.top_index(exception_trace); + fr.stack.top_index(stack); + fr.self=self; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; + fr.flang=flang; + fr.fconnection=fconnection; + } }; /// Auto-object used for temporary changing Request::flang. @@ -361,7 +474,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); @@ -369,9 +482,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: