--- parser3/src/include/pa_request.h 2003/10/21 04:45:19 1.166 +++ parser3/src/include/pa_request.h 2010/09/24 08:18:57 1.207 @@ -1,15 +1,16 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char* IDENT_REQUEST_H="$Date: 2003/10/21 04:45:19 $"; +static const char * const IDENT_REQUEST_H="$Date: 2010/09/24 08:18:57 $"; +#include "pa_pool.h" #include "pa_hash.h" #include "pa_wcontext.h" #include "pa_value.h" @@ -17,6 +18,7 @@ static const char* IDENT_REQUEST_H="$Dat #include "pa_request_info.h" #include "pa_request_charsets.h" #include "pa_sapi.h" +#include "pa_vconsole.h" #ifdef RESOURCES_DEBUG #include @@ -25,6 +27,7 @@ static const char* IDENT_REQUEST_H="$Dat // consts const uint ANTI_ENDLESS_EXECUTE_RECOURSION=1000; +const uint ANTI_ENDLESS_JSON_STRING_RECOURSION=100; const size_t pseudo_file_no__process=1; // forwards @@ -32,7 +35,6 @@ const size_t pseudo_file_no__process=1; class Temp_lang; class Methoded; class VMethodFrame; -class GdomeDOMString_auto_ptr; class VMail; class VForm; class VResponse; @@ -63,6 +65,16 @@ public: const Operation::Origin origin() const { return forigin; } }; + enum Skip { + SKIP_NOTHING, + SKIP_BREAK, + SKIP_CONTINUE + }; + +private: + Pool fpool; +public: + Pool& pool() { return fpool; } private: union StackItem { @@ -72,9 +84,7 @@ private: public: Value& value() const { return *fvalue; } const String& string() const { - const String* result=fvalue->get_string(); - assert(result); - return *result; + return fvalue->as_string(); } ArrayOperation& ops() const { return *fops; } VMethodFrame& method_frame() const { return *fmethod_frame; } @@ -96,11 +106,11 @@ private: element_type bottom_value() { return get(bottom_index()); } void clear() { - ftop=fbottom=0; + fused=fbottom=0; } bool is_empty() { - return ftop==fbottom; + return fused==fbottom; } const element_type extract_origin(const String*& problem_source); @@ -109,10 +119,11 @@ private: ///@{ core data /// classes - HashStringValue fclasses; + HashString fclasses; /// already used files to avoid cyclic uses - Hash used_files; + HashString used_files; + HashString searched_along_class_path; /// list of all used files, Operation::file_no = index to it Array file_list; @@ -121,6 +132,8 @@ private: */ uint anti_endless_execute_recoursion; + uint anti_endless_json_string_recoursion; + ///@} /// execution stack @@ -142,9 +155,11 @@ public: //@} /// interrupted flag, raised on signals [SIGPIPE] bool finterrupted; + Skip fskip; + int fin_cycle; public: - size_t register_file(String::Body file_spec); + uint register_file(String::Body file_spec); struct Exception_details { const Trace trace; @@ -157,6 +172,7 @@ public: VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {} }; Exception_details get_details(const Exception& e); + const char* get_exception_cstr(const Exception& e, Exception_details& details); /// @see Stack::wipe_unused void wipe_unused_execution_stack() { @@ -176,7 +192,8 @@ public: ~Request(); /// global classes - HashStringValue& classes() { return fclasses; } + HashString& classes() { return fclasses; } + Value* get_class(const String& name); /** core request processing @@ -190,12 +207,16 @@ public: /// executes ops void execute(ArrayOperation& ops); // execute.C + void op_call(VMethodFrame &frame); + void op_call_write(VMethodFrame &frame); + Value& construct(Value &class_value, const Method &method); + /// execute ops with anti-recoursion check void recoursion_checked_execute(/*const String& name, */ArrayOperation& 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", + throw Exception(PARSER_RUNTIME, 0, //&name, "call canceled - endless recursion detected"); } @@ -203,21 +224,43 @@ public: anti_endless_execute_recoursion--; } + uint json_string_recoursion_go_down(){ + if(++anti_endless_json_string_recoursion==ANTI_ENDLESS_JSON_STRING_RECOURSION){ + anti_endless_json_string_recoursion=0; + throw Exception(PARSER_RUNTIME, + 0, + "call canceled - endless json recursion detected"); + } + return anti_endless_json_string_recoursion; + } + + void json_string_recoursion_go_up(){ + if(anti_endless_json_string_recoursion) + anti_endless_json_string_recoursion--; + } + + /// + void use_file_directly(VStateless_class& aclass, + const String& file_spec, + bool fail_on_read_problem=true, + bool fail_on_file_absence=true); + /// compiles the file, maybe forcing it's class @a name and @a base_class. void use_file(VStateless_class& aclass, - const String& file_name, - const String* main_alias=0, - bool ignore_class_path=false, - bool fail_on_read_problem=true, - bool fail_on_file_absence=true); // pa_request.C + const String& file_name, + const String* use_filespec); + /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, - uint file_no); // pa_request.C + uint file_no, + int line_no_offset=0); /// processes any code-junction there may be inside of @a value + StringOrValue process_getter(Junction& junction); // execute.C StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C + void process_write(Value& input_value); // execute.C //@{ convinient helpers const String& process_to_string(Value& input_value) { return process(input_value, true/*intercept_string*/).as_string(); @@ -226,7 +269,8 @@ public: return process(input_value, intercept_string).as_value(); } //@} - + const String* get_method_filename(const Method* method); // execute.C + const String* get_used_filename(uint file_no); #define DEFINE_DUAL(modification) \ void write_##modification##_lang(StringOrValue dual) { \ @@ -282,7 +326,7 @@ public: /// returns current SQL connection if any SQL_Connection* connection(bool fail_on_error=true) { if(fail_on_error && !fconnection) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "outside of 'connect' operator"); @@ -292,6 +336,12 @@ public: void set_interrupted(bool ainterrupted) { finterrupted=ainterrupted; } bool get_interrupted() { return finterrupted; } + void set_skip(Skip askip) { fskip=askip; } + Skip get_skip() { return fskip; } + + void set_in_cycle(int adelta) { fin_cycle+=adelta; } + bool get_in_cycle() { return fin_cycle>0; } + public: /// info from web server @@ -313,9 +363,11 @@ public: VResponse& response; /// $cookie:elements VCookie& cookie; + /// $console + VConsole& console; /// classes configured data - HashStringObject classes_conf; + HashString classes_conf; public: // status read methods @@ -331,17 +383,39 @@ public: // status read methods } */ + /// public for ^reflection:copy[] + void put_element(Value& ncontext, const String& name, Value* value); + + /// for @main[] + const String* execute_virtual_method(Value& aself, const String& method_name); + + /// executes parser method, use op_call(frame) to execute native method + void execute_method(VMethodFrame& aframe); + + //{ for @conf[filespec] and @auto[filespec] and parser://method/call + const String* execute_method(Value& aself, + const Method& method, Value* optional_param, + bool do_return_string); + struct Execute_nonvirtual_method_result { + const String* string; + Method* method; + Execute_nonvirtual_method_result(): string(0), method(0) {} + }; + Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, + const String& method_name, + VString* optional_param, + bool do_return_string); + //} + #ifdef XML public: // charset helpers /// @see Charset::transcode - GdomeDOMString_auto_ptr transcode(const String& s); - /// @see Charset::transcode - GdomeDOMString_auto_ptr transcode(const String::Body s); + xmlChar* transcode(const String& s); /// @see Charset::transcode - const String& transcode(GdomeDOMString* s); + xmlChar* transcode(const String::Body s); /// @see Charset::transcode - const String& transcode(xmlChar* s); + const String& transcode(const xmlChar* s); #endif @@ -352,33 +426,18 @@ private: void configure_admin(VStateless_class& conf_class); + void configure(); + private: // compile.C - VStateless_class& compile(VStateless_class* aclass, + ArrayClass& compile(VStateless_class* aclass, const char* source, const String* main_alias, - uint file_no); + uint file_no, + int line_no_offset); private: // execute.C - /// for @postprocess[body] - StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); - //{ for @conf[filespec] and @auto[filespec] - const String* execute_method(Value& aself, - const Method& method, VString* optional_param, - bool do_return_string); - struct Execute_nonvirtual_method_result { - const String* string; - Method* method; - Execute_nonvirtual_method_result(): string(0), method(0) {} - }; - Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString* optional_param, - bool do_return_string); - //} - /// for @main[] - const String* execute_virtual_method(Value& aself, const String& method_name); - - Value& get_element(Value& ncontext, const String& name, bool can_call_operator); + Value& get_element(Value& ncontext, const String& name); private: // defaults @@ -426,6 +485,7 @@ class Request_context_saver { /// execution stack size_t stack; uint anti_endless_execute_recoursion; + uint anti_endless_json_string_recoursion; /// contexts VMethodFrame* method_frame; Value* rcontext; @@ -437,21 +497,23 @@ class Request_context_saver { public: Request_context_saver(Request& ar) : + fr(ar), exception_trace_top(ar.exception_trace.top_index()), exception_trace_bottom(ar.exception_trace.bottom_index()), stack(ar.stack.top_index()), anti_endless_execute_recoursion(ar.anti_endless_execute_recoursion), + anti_endless_json_string_recoursion(ar.anti_endless_json_string_recoursion), method_frame(ar.method_frame), rcontext(ar.rcontext), wcontext(ar.wcontext), flang(ar.flang), - fconnection(ar.fconnection), - fr(ar) {} + fconnection(ar.fconnection) {} void restore() { fr.exception_trace.set_top_index(exception_trace_top); fr.exception_trace.set_bottom_index(exception_trace_bottom); fr.stack.set_top_index(stack); fr.anti_endless_execute_recoursion=anti_endless_execute_recoursion; + fr.anti_endless_json_string_recoursion=anti_endless_json_string_recoursion; fr.method_frame=method_frame, fr.rcontext=rcontext; fr.wcontext=wcontext; fr.flang=flang; fr.fconnection=fconnection; @@ -486,21 +548,28 @@ public: } }; +/// Auto-object used for break out of cycle check +class InCycle { + Request& frequest; +public: + InCycle(Request& arequest) : frequest(arequest) { + frequest.set_in_cycle(1); + } + ~InCycle() { + frequest.set_in_cycle(-1); + } +}; // defines for externs -#define CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_VALUE "attachment" -#define CONTENT_DISPOSITION_FILENAME_NAME "filename" +#define EXCEPTION_HANDLED_PART_NAME "handled" + // externs extern const String main_method_name; extern const String auto_method_name; extern const String body_name; -extern const String content_disposition_name; -extern const String content_disposition_value; -extern const String content_disposition_filename_name; extern const String exception_type_part_name; extern const String exception_source_part_name;