--- parser3/src/include/pa_request.h 2001/02/21 17:36:30 1.7 +++ parser3/src/include/pa_request.h 2001/03/18 14:45:26 1.59 @@ -1,110 +1,199 @@ /* - $Id: pa_request.h,v 1.7 2001/02/21 17:36:30 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_request.h,v 1.59 2001/03/18 14:45:26 paf Exp $ */ #ifndef PA_REQUEST_H #define PA_REQUEST_H #include "pa_pool.h" -#include "pa_exception.h" #include "pa_hash.h" #include "pa_wcontext.h" #include "pa_value.h" #include "pa_stack.h" - -#define MAIN_METHOD_NAME "main" +#include "pa_vclass.h" +#include "pa_vobject.h" +#include "pa_venv.h" +#include "pa_vform.h" +#include "pa_vrequest.h" +#include "pa_vresponse.h" #ifndef NO_STRING_ORIGIN -# define COMPILE_PARAMS char *source, char *file -# define COMPILE(source, file) real_compile(source, file) +# define COMPILE_PARAMS \ + const char *source, \ + VStateless_class *aclass, const String *name, \ + VStateless_class *base_class, \ + const char *file +# define COMPILE(source, aclass, name, base_class, file) \ + real_compile(source, aclass, name, base_class, file) #else -# define COMPILE_PARAMS char *source -# define COMPILE(source, file) real_compile(source) +# define COMPILE_PARAMS \ + const char *source, \ + VStateless_class *aclass, const String *name, \ + VStateless_class *base_class +# define COMPILE(source, aclass, name, base_class, file) \ + real_compile(source, aclass, name, base_class) #endif -class Local_request_exception; +class Temp_lang; class Request : public Pooled { - friend Local_request_exception; + friend Temp_lang; public: - Request(Pool& apool) : Pooled(apool), - fpool(apool), - stack(apool), - fclasses(apool) - { - } + struct Info { + const char *document_root; + const char *path_translated; + const char *method; + const char *query_string; + const char *uri; + const char *content_type; + size_t content_length; + }; + + Request(Pool& apool, + Info& ainfo, + String::Untaint_lang adefault_lang + ); ~Request() {} - // IMPORTANT: don't use without Local_request_exception - Exception& exception() { return *fexception; } - // global classes Hash& classes() { return fclasses; } // core request processing - void core(); + void core(Exception& system_exception, + const char *sys_auto_path1, + const char *sys_auto_path2); + + void execute(const Array& ops); + + VStateless_class *use_file( + const char *file, bool fail_on_read_problem=true, + const String *name=0, + VStateless_class *base_class=0); // core.C + VStateless_class *use_buf( + const char *source, const char *file, + VStateless_class *aclass=0, const String *name=0, + VStateless_class *base_class=0); // core.C + Value& process( + Value& value, + const String *name=0, + bool intercept_string=true); // execute.C + + // write(const) = clean + void write(const String& astring) { + wcontext->write(astring, String::Untaint_lang::NO); + } + // appending, sure of clean string inside + void write_no_lang(String& astring) { + wcontext->write(astring, String::Untaint_lang::NO); + } + // appending string, passing language built into string being written + void write_pass_lang(String& astring) { + wcontext->write(astring, String::Untaint_lang::PASS_APPEND); + } + // appending possible string, assigning untaint language + void write_assign_lang(Value& avalue) { + wcontext->write(avalue, flang); + } + // appending possible string, passing language built into string being written + void write_pass_lang(Value& avalue) { + wcontext->write(avalue, String::Untaint_lang::PASS_APPEND); + } + // appending sure value, that would be converted to clean string + void write_no_lang(Value& avalue) { + wcontext->write(avalue, String::Untaint_lang::NO); + } + // appending sure value, not VString + void write_expr_result(Value& avalue) { + wcontext->write(avalue); + } + + void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg); + + char *relative(const char *path, const char *file); + char *absolute(const char *name); + +public: + + // + Info& info; + + // default base + VClass ROOT; + // $env:fields here + VEnv env; + // $form:elements here + VForm form; + // $request:elements here + VRequest request; + // $response: + VResponse response; + + // contexts + Value *self, *root, *rcontext; + WContext *wcontext; private: // core data // classes Hash fclasses; - // contexts - Value *root, *self, *rcontext; - WContext *wcontext; - // execution stack Stack stack; -private: // core.C - - Array& load_and_compile_RUN(); - VClass *construct_class(String& name, Array& compiled_methods); - char *execute_MAIN(VClass *class_RUN); - private: // compile.C - Array& real_compile(COMPILE_PARAMS); + VStateless_class& real_compile(COMPILE_PARAMS); private: // execute.C - void execute(Array& ops); + const String *execute_method(Value& aself, const Method& method, + bool return_cstr=true); + const String *execute_method(Value& aself, const String& method_name, + bool return_cstr=true); -protected: + Value *get_element(); - // all request' objects are allocated in this pool - Pool& fpool; +private: // lang&raw + + String::Untaint_lang flang; + +private: // defaults + + const String::Untaint_lang fdefault_lang; + Value *fdefault_content_type; + +private: // lang manipulation - // exception replacement mechanism is protected from direct usage - // Local_request_exception object enforces paired set/restore - Exception *set_exception(Exception *e){ - Exception *r=fexception; - fexception=e; - return r; + String::Untaint_lang set_lang(String::Untaint_lang alang) { + String::Untaint_lang result=flang; + flang=alang; + return result; } - void restore_exception(Exception *e) { - fexception=e; + void restore_lang(String::Untaint_lang alang) { + flang=alang; } private: - // current request's exception object - Exception *fexception; - + void output_result(const String& body_string); }; -class Local_request_exception { - Request request; - Exception *saved_exception; +class Temp_lang { + Request& frequest; + String::Untaint_lang saved_lang; public: - Local_request_exception(Request& arequest, Exception& exception) : - request(arequest), - saved_exception(arequest.set_exception(&exception)) {} - ~Local_request_exception() { request.restore_exception(saved_exception); } + Temp_lang(Request& arequest, String::Untaint_lang alang) : + frequest(arequest), + saved_lang(arequest.set_lang(alang)) { + } + ~Temp_lang() { + frequest.restore_lang(saved_lang); + } }; -// core func -void core(); - #endif