--- parser3/src/include/pa_request.h 2009/06/16 08:39:00 1.194 +++ parser3/src/include/pa_request.h 2015/10/26 01:21:56 1.221 @@ -1,14 +1,14 @@ /** @file Parser: request class decl. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_REQUEST_H #define PA_REQUEST_H -static const char * const IDENT_REQUEST_H="$Date: 2009/06/16 08:39:00 $"; +#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.221 2015/10/26 01:21:56 moko Exp $" #include "pa_pool.h" #include "pa_hash.h" @@ -18,11 +18,6 @@ static const char * const IDENT_REQUEST_ #include "pa_request_info.h" #include "pa_request_charsets.h" #include "pa_sapi.h" -#include "pa_vconsole.h" - -#ifdef RESOURCES_DEBUG -#include -#endif // consts @@ -39,13 +34,15 @@ class VForm; class VResponse; class VCookie; class VStateless_class; +class VConsole; /// Main workhorse. class Request: public PA_Object { friend class Temp_lang; friend class Temp_connection; - friend class Request_context_saver; friend class Temp_request_self; + friend class Temp_value_element; + friend class Request_context_saver; friend class Exception_trace; public: @@ -55,7 +52,6 @@ public: public: Trace(): fname(0) {} void clear() { fname=0; } - operator bool() const { return fname!=0; } Trace(const String* aname, const Operation::Origin aorigin): fname(aname), forigin(aorigin) {} @@ -111,17 +107,16 @@ private: bool is_empty() { return fused==fbottom; } - - const element_type extract_origin(const String*& problem_source); }; ///@{ core data /// classes - HashStringValue fclasses; + HashString fclasses; /// already used files to avoid cyclic uses HashString used_files; + HashString searched_along_class_path; /// list of all used files, Operation::file_no = index to it Array file_list; @@ -139,6 +134,8 @@ private: Exception_trace exception_trace; public: + bool allow_class_replace; + //@{ request processing status /// contexts VMethodFrame* method_frame; @@ -152,19 +149,16 @@ public: /// interrupted flag, raised on signals [SIGPIPE] bool finterrupted; Skip fskip; + int fin_cycle; public: uint register_file(String::Body file_spec); struct Exception_details { - const Trace trace; + const Operation::Origin origin; const String* problem_source; VHash& vhash; - - Exception_details( - const Trace atrace, - const String* aproblem_source, - VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {} + Exception_details(const Operation::Origin aorigin, const String* aproblem_source, VHash& avhash): origin(aorigin), problem_source(aproblem_source), vhash(avhash) {} }; Exception_details get_details(const Exception& e); const char* get_exception_cstr(const Exception& e, Exception_details& details); @@ -181,13 +175,13 @@ public: #endif Request(SAPI_Info& asapi_info, Request_info& arequest_info, - String::Language adefault_lang, ///< all tainted data default untainting lang - bool status_allowed ///< status class allowed + String::Language adefault_lang ///< all tainted data default untainting lang ); ~Request(); /// global classes - HashStringValue& classes() { return fclasses; } + HashString& classes() { return fclasses; } + Value* get_class(const String& name); /** core request processing @@ -203,7 +197,8 @@ public: void execute(ArrayOperation& ops); // execute.C void op_call(VMethodFrame &frame); void op_call_write(VMethodFrame &frame); - void op_call(VMethodFrame &frame, bool constructing); + 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 @@ -217,21 +212,25 @@ public: anti_endless_execute_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 + void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec); + void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec, Operation::Origin origin); + /// compiles a @a source buffer void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, - int line_no_offset=0); // pa_request.C + 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 @@ -242,7 +241,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) { \ @@ -255,7 +255,7 @@ public: /// appending, sure of clean string inside void write_no_lang(const String& astring) { wcontext->write(astring, - (String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT)); + (String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) )); } /// appending sure value, that would be converted to clean string void write_no_lang(Value& avalue) { @@ -263,7 +263,7 @@ public: wcontext->write(avalue); else wcontext->write(avalue, - (String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT)); + (String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) )); } /// appending string, passing language built into string being written @@ -292,6 +292,9 @@ public: /// returns an absolute @a path to relative @a name const String& absolute(const String& relative_name); + /// returns the mime type of 'user_file_name' + const String& mime_type_of(const String* file_name); + /// returns the mime type of 'user_file_name_cstr' const String& mime_type_of(const char* user_file_name_cstr); @@ -311,6 +314,9 @@ public: 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 @@ -352,11 +358,15 @@ 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); - /// for @postprocess[body] - StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method); + /// 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, @@ -402,8 +412,10 @@ private: // compile.C private: // execute.C - void put_element(Value& ncontext, const String& name, Value* value); Value& get_element(Value& ncontext, const String& name); +#ifdef FEATURE_GET_ELEMENT4CALL + Value& get_element4call(Value& ncontext, const String& name); +#endif private: // defaults @@ -511,14 +523,42 @@ 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 +/// Auto-object used for temporary changing Request::allow_class_replace. +class Temp_class_replace { + Request& frequest; +public: + Temp_class_replace(Request& arequest, bool avalue) : frequest(arequest){ + frequest.allow_class_replace=avalue; + } + ~Temp_class_replace() { + frequest.allow_class_replace=false; + } +}; + +/// Auto-object used for temporarily substituting/removing elements +class Temp_value_element { + Request& frequest; + Value& fwhere; + const String& fname; + Value* saved; +public: + Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat); + ~Temp_value_element(); +}; -#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding" -#define CONTENT_DISPOSITION_NAME "content-disposition" -#define CONTENT_DISPOSITION_ATTACHMENT "attachment" -#define CONTENT_DISPOSITION_INLINE "inline" -#define CONTENT_DISPOSITION_FILENAME_NAME "filename" +// defines for externs #define EXCEPTION_HANDLED_PART_NAME "handled" @@ -527,13 +567,6 @@ public: extern const String main_method_name; extern const String auto_method_name; -extern const String body_name; - -extern const String content_transfer_encoding_name; -extern const String content_disposition_name; -extern const String content_disposition_attachment; -extern const String content_disposition_inline; -extern const String content_disposition_filename_name; extern const String exception_type_part_name; extern const String exception_source_part_name;