--- parser3/src/classes/file.C 2003/02/04 14:04:45 1.107.2.4 +++ parser3/src/classes/file.C 2003/03/21 09:43:48 1.109 @@ -1,11 +1,11 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_FILE_C="$Date: 2003/02/04 14:04:45 $"; +static const char* IDENT_FILE_C="$Date: 2003/03/21 09:43:48 $"; #include "pa_config_includes.h" @@ -21,16 +21,18 @@ static const char* IDENT_FILE_C="$Date: #include "pa_dir.h" #include "pa_vtable.h" #include "pa_charset.h" +#include "pa_charsets.h" // defines #define TEXT_MODE_NAME "text" #define STDIN_EXEC_PARAM_NAME "stdin" +#define CHARSET_EXEC_PARAM_NAME "charset" // consts /// from apache-1.3|src|support|suexec.c -static const char* suexec_safe_env_lst[]={ +static const char *suexec_safe_env_lst[]={ "AUTH_TYPE", "CONTENT_LENGTH", "CONTENT_TYPE", @@ -78,7 +80,7 @@ static const char* suexec_safe_env_lst[] class MFile : public Methoded { public: // VStateless_class - ValuePtr create_new_value() { return ValuePtr(new VFile()); } + Value *create_new_value(Pool& pool) { return new(pool) VFile(pool); } public: // Methoded bool used_directly() { return true; } @@ -90,25 +92,25 @@ public: // methods -static void _save(Request& r, StringPtr /*method_name*/, MethodParams& params) { - Value& vmode_name=params. as_no_junction(0, "mode must not be code"); - Value& vfile_name=params.as_no_junction(1, "file name must not be code"); +static void _save(Request& r, const String&, MethodParams *params) { + Value& vmode_name=params-> as_no_junction(0, "mode must not be code"); + Value& vfile_name=params->as_no_junction(1, "file name must not be code"); // save static_cast(r.get_self())->save(r.absolute(vfile_name.as_string()), vmode_name.as_string()==TEXT_MODE_NAME); } -static void _delete(Request& r, StringPtr /*method_name*/, MethodParams& params) { - Value& vfile_name=params.as_no_junction(0, "file name must not be code"); +static void _delete(Request& r, const String&, MethodParams *params) { + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); // unlink file_delete(r.absolute(vfile_name.as_string())); } -static void _move(Request& r, StringPtr /*method_name*/, MethodParams& params) { - Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code"); - Value& vto_file_name=params.as_no_junction(1, "to file name must not be code"); +static void _move(Request& r, const String&, MethodParams *params) { + Value& vfrom_file_name=params->as_no_junction(0, "from file name must not be code"); + Value& vto_file_name=params->as_no_junction(1, "to file name must not be code"); // move file_move( @@ -120,11 +122,11 @@ static void _load_pass_param(const Hash: Hash& dest=*static_cast(info); dest.put(key, value); } -static void _load(Request& r, StringPtr method_name, MethodParams& params) { +static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vmode_name=params. as_no_junction(0, "mode must not be code"); - const String& lfile_name=r.absolute(params.as_no_junction(1, "file name must not be code").as_string()); - Value *third_param=params.count()>2?¶ms.as_no_junction(2, "filename or options must not be code"):0; + Value& vmode_name=params-> as_no_junction(0, "mode must not be code"); + const String& lfile_name=r.absolute(params->as_no_junction(1, "file name must not be code").as_string()); + Value *third_param=params->size()>2?¶ms->as_no_junction(2, "filename or options must not be code"):0; Hash *third_param_hash=third_param?third_param->get_hash(&method_name):0; int alt_filename_param_index=2; if(third_param_hash) @@ -138,8 +140,8 @@ static void _load(Request& r, StringPtr &fields ); - char *user_file_name=params.count()>alt_filename_param_index? - params.as_string(alt_filename_param_index, "filename must be string") + char *user_file_name=params->size()>alt_filename_param_index? + params->as_string(alt_filename_param_index, "filename must be string").cstr(String::UL_FILE_SPEC) :lfile_name.cstr(String::UL_FILE_SPEC); Value *vcontent_type=0; @@ -154,9 +156,9 @@ static void _load(Request& r, StringPtr fields->for_each(_load_pass_param, &self.fields()); } -static void _stat(Request& r, StringPtr method_name, MethodParams& params) { +static void _stat(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params.as_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& lfile_name=vfile_name.as_string(); @@ -175,7 +177,7 @@ static void _stat(Request& r, StringPtr ff.put(*content_type_name, new(pool) VString(r.mime_type_of(lfile_name.cstr(String::UL_FILE_SPEC)))); } -static bool is_safe_env_key(const char* key) { +static bool is_safe_env_key(const char *key) { if(strncasecmp(key, "HTTP_", 5)==0) return true; if(strncasecmp(key, "CGI_", 4)==0) @@ -190,6 +192,7 @@ static bool is_safe_env_key(const char* struct Append_env_pair_info { Hash* hash; Value* vstdin; + Value* vcharset; }; #endif static void append_env_pair(const Hash::Key& key, Hash::Val *avalue, void *info) { @@ -198,6 +201,8 @@ static void append_env_pair(const Hash:: if(key==STDIN_EXEC_PARAM_NAME) { pi.vstdin=&value; + } else if(key==CHARSET_EXEC_PARAM_NAME) { + pi.vcharset=&value; } else { if(!is_safe_env_key(key.cstr())) throw Exception("parser.runtime", @@ -226,11 +231,11 @@ static void pass_cgi_header_attribute(Ar } } /// @todo fix `` in perl - they produced flipping consoles and no output to perl -static void _exec_cgi(Request& r, StringPtr method_name, MethodParams& params, +static void _exec_cgi(Request& r, const String& method_name, MethodParams *params, bool cgi) { Pool& pool=r.pool(); - Value& vfile_name=params.as_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& script_name=r.absolute(vfile_name.as_string()); @@ -243,9 +248,9 @@ static void _exec_cgi(Request& r, String env.put(name##key, &name##value); \ } // passing SAPI::environment - if(const char* const *pairs=SAPI::environment(pool)) { - while(const char* pair=*pairs++) - if(const char* eq_at=strchr(pair, '=')) { + if(const char *const *pairs=SAPI::environment(pool)) { + while(const char *pair=*pairs++) + if(const char *eq_at=strchr(pair, '=')) { String& key=*new(pool) String(pool, pair, eq_at-pair); String& value=*new(pool) String(pool, eq_at+1); env.put(key, &value); @@ -269,57 +274,75 @@ static void _exec_cgi(Request& r, String env.put(*new(pool) String(pool, "SCRIPT_NAME"), &script_name); //env.put(*new(pool) String(pool, "SCRIPT_FILENAME"), ??&script_name); - bool stdin_specified=false; // environment & stdin from param - String in(pool); - if(params.count()>1) { - Value& venv=params.as_no_junction(1, "env must not be code"); + String raw_in(pool); + Charset *charset=0; // default script works raw_in 'source' charset = no transcoding needed + if(params->size()>1) { + Value& venv=params->as_no_junction(1, "env must not be code"); if(Hash *user_env=venv.get_hash(&method_name)) { Append_env_pair_info info={&env}; user_env->for_each(append_env_pair, &info); + // $.stdin if(info.vstdin) { - stdin_specified=true; if(const String *sstdin=info.vstdin->get_string()) { - in.append(*sstdin, String::UL_CLEAN, true); + raw_in.append(*sstdin, String::UL_CLEAN, true); } else if(VFile *vfile=static_cast(info.vstdin->as("file", false))) - in.APPEND_TAINTED((const char* )vfile->value_ptr(), vfile->value_size(), + raw_in.APPEND_TAINTED((const char *)vfile->value_ptr(), vfile->value_size(), "$.stdin[assigned]", 0); else throw Exception("parser.runtime", &method_name, STDIN_EXEC_PARAM_NAME " parameter must be string or file"); } + // $.charset + if(info.vcharset) + charset=&charsets->get_charset(info.vcharset->as_string()); } } // argv from params Array *argv=0; - if(params.count()>2) { - argv=new(pool) Array(pool, params.count()-2); - for(int i=2; isize()>2) { + argv=new(pool) Array(pool, params->size()-2); + for(int i=2; isize(); i++) + *argv+=¶ms->as_string(i, "parameter must be string"); } - // passing POST data - if(!stdin_specified) // if $.stdin[...] not specified - in.APPEND(r.post_data, r.post_size, String::UL_CLEAN, "POST data (passed)", 0); + // transcode if necessary + String* real_in=&raw_in; + if(charset) { + Charset::transcode(pool, pool.get_source_charset(), *charset, env); + if(argv) + Charset::transcode(pool, pool.get_source_charset(), *charset, *argv); + real_in=&Charset::transcode(pool, pool.get_source_charset(), *charset, raw_in); + } // exec! - String out(pool); - String& err=*new(pool) String(pool); - int status=pa_exec(false/*forced_allow*/, script_name, &env, argv, in, out, err); + String raw_out(pool); + String& raw_err=*new(pool) String(pool); + int status=pa_exec(false/*forced_allow*/, script_name, &env, argv, *real_in, raw_out, raw_err); + + String *real_out=&raw_out; + String *real_err=&raw_err; + + // transcode if necessary + if(charset) { + real_out=&Charset::transcode(pool, *charset, pool.get_source_charset(), raw_out); + real_err=&Charset::transcode(pool, *charset, pool.get_source_charset(), raw_err); + } + VFile& self=*static_cast(r.get_self()); - const String *body=&out; // ^file:exec + const String *body=real_out; // ^file:exec Value *content_type=0; - const char* eol_marker=0; size_t eol_marker_size; + const char *eol_marker=0; size_t eol_marker_size; const String *header=0; if(cgi) { // ^file:cgi // construct with 'out' body and header - int dos_pos=out.pos("\r\n\r\n", 4); - int unix_pos=out.pos("\n\n", 2); + int dos_pos=real_out->pos("\r\n\r\n", 4); + int unix_pos=real_out->pos("\n\n", 2); bool unix_header_break; switch((dos_pos >= 0?10:00) + (unix_pos >= 0?01:00)) { @@ -339,8 +362,8 @@ static void _exec_cgi(Request& r, String "output does not contain CGI header; " "exit status=%d; stdoutsize=%u; stdout: \"%s\"; stderrsize=%u; stderr: \"%s\"", status, - (uint)out.size(), out.cstr(), - (uint)err.size(), err.cstr()); + (uint)real_out->size(), real_out->cstr(), + (uint)real_err->size(), real_err->cstr()); break; //never reached } @@ -353,8 +376,8 @@ static void _exec_cgi(Request& r, String eol_marker="\r\n"; eol_marker_size=2; } - header=&out.mid(0, header_break_pos); - body=&out.mid(header_break_pos+eol_marker_size*2, out.size()); + header=&real_out->mid(0, header_break_pos); + body=&real_out->mid(header_break_pos+eol_marker_size*2, real_out->size()); } // body self.set(false/*not tainted*/, body->cstr(), body->size()); @@ -375,33 +398,33 @@ static void _exec_cgi(Request& r, String new(pool) VInt(pool, status)); // $stderr - if(err.size()) { + if(real_err->size()) { self.fields().put( *new(pool) String(pool, "stderr"), - new(pool) VString(err)); + new(pool) VString(*real_err)); } } -static void _exec(Request& r, StringPtr method_name, MethodParams& params) { +static void _exec(Request& r, const String& method_name, MethodParams *params) { _exec_cgi(r, method_name, params, false); } -static void _cgi(Request& r, StringPtr method_name, MethodParams& params) { +static void _cgi(Request& r, const String& method_name, MethodParams *params) { _exec_cgi(r, method_name, params, true); } -static void _list(Request& r, StringPtr method_name, MethodParams& params) { +static void _list(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& relative_path=params.as_no_junction(0, "path must not be code"); + Value& relative_path=params->as_no_junction(0, "path must not be code"); const String *regexp; pcre *regexp_code; const int ovecsize=(1/*match*/)*3; int ovector[ovecsize]; - if(params.count()>1) { - regexp=¶ms.as_no_junction(1, "regexp must not be code").as_string(); + if(params->size()>1) { + regexp=¶ms->as_no_junction(1, "regexp must not be code").as_string(); - const char* pattern=regexp->cstr(); - const char* errptr; + const char *pattern=regexp->cstr(); + const char *errptr; int erroffset; regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, &errptr, &erroffset, @@ -474,15 +497,15 @@ static void lock_execute_body(int , void // execute body info.r->write_assign_lang(info.r->process(*info.body_code)); }; -static void _lock(Request& r, StringPtr method_name, MethodParams& params) { - const String& file_spec=r.absolute(params.as_string(0, "file name must be string")); - Value& body_code=params.as_junction(1, "body must be code"); +static void _lock(Request& r, const String& method_name, MethodParams *params) { + const String& file_spec=r.absolute(params->as_string(0, "file name must be string")); + Value& body_code=params->as_junction(1, "body must be code"); Lock_execute_body_info info={&r, &body_code}; file_write_action_under_lock(file_spec, "lock", lock_execute_body, &info); } -static int lastposafter(const String& s, int after, const char* substr, size_t substr_size, bool beforelast=false) { +static int lastposafter(const String& s, int after, const char *substr, size_t substr_size, bool beforelast=false) { size_t size; if(beforelast) size=s.size(); @@ -497,9 +520,9 @@ static int lastposafter(const String& s, return after; } -static void _find(Request& r, StringPtr method_name, MethodParams& params) { +static void _find(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String &file_name=params.as_no_junction(0, "file name must not be code").as_string(); + const String &file_name=params->as_no_junction(0, "file name must not be code").as_string(); const String *file_spec; if(file_name.first_char()=='/') file_spec=&file_name; @@ -529,15 +552,15 @@ static void _find(Request& r, StringPtr } // no way, not found - if(params.count()==2) { - Value& not_found_code=params.as_junction(1, "not-found param must be code"); + if(params->size()==2) { + Value& not_found_code=params->as_junction(1, "not-found param must be code"); r.write_pass_lang(r.process(not_found_code)); } } -static void _dirname(Request& r, StringPtr method_name, MethodParams& params) { +static void _dirname(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& file_spec=params.as_string(0, "file name must be string"); + const String& file_spec=params->as_string(0, "file name must be string"); // /a/some.tar.gz > /a // /a/b/ > /a int afterslash=lastposafter(file_spec, 0, "/", 1, true); @@ -547,30 +570,30 @@ static void _dirname(Request& r, StringP r.write_assign_lang(*new(pool) String(pool, ".", 1)); } -static void _basename(Request& r, StringPtr method_name, MethodParams& params) { - const String& file_spec=params.as_string(0, "file name must be string"); +static void _basename(Request& r, const String& method_name, MethodParams *params) { + const String& file_spec=params->as_string(0, "file name must be string"); // /a/some.tar.gz > some.tar.gz int afterslash=lastposafter(file_spec, 0, "/", 1); r.write_assign_lang(file_spec.mid(afterslash, file_spec.size())); } -static void _justname(Request& r, StringPtr method_name, MethodParams& params) { - const String& file_spec=params.as_string(0, "file name must be string"); +static void _justname(Request& r, const String& method_name, MethodParams *params) { + const String& file_spec=params->as_string(0, "file name must be string"); // /a/some.tar.gz > some.tar int afterslash=lastposafter(file_spec, 0, "/", 1); int afterdot=lastposafter(file_spec, afterslash, ".", 1); r.write_assign_lang(file_spec.mid(afterslash, afterdot!=afterslash?afterdot-1:file_spec.size())); } -static void _justext(Request& r, StringPtr method_name, MethodParams& params) { - const String& file_spec=params.as_string(0, "file name must be string"); +static void _justext(Request& r, const String& method_name, MethodParams *params) { + const String& file_spec=params->as_string(0, "file name must be string"); // /a/some.tar.gz > gz int afterdot=lastposafter(file_spec, 0, ".", 1); if(afterdot>0) r.write_assign_lang(file_spec.mid(afterdot, file_spec.size())); } -static void _fullpath(Request& r, StringPtr method_name, MethodParams& params) { - const String& file_spec=params.as_string(0, "file name must be string"); +static void _fullpath(Request& r, const String& method_name, MethodParams *params) { + const String& file_spec=params->as_string(0, "file name must be string"); const String *result; if(file_spec.first_char()=='/') result=&file_spec;