--- parser3/src/classes/file.C 2002/11/20 10:01:01 1.103 +++ 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, 2002 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: 2002/11/20 10:01:01 $"; +static const char* IDENT_FILE_C="$Date: 2003/03/21 09:43:48 $"; #include "pa_config_includes.h" @@ -21,11 +21,13 @@ 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 @@ -116,21 +118,42 @@ static void _move(Request& r, const Stri r.absolute(vto_file_name.as_string())); } +static void _load_pass_param(const Hash::Key& key, Hash::Val *value, void *info) { + Hash& dest=*static_cast(info); + dest.put(key, value); +} 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->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) + alt_filename_param_index++; void *data; size_t size; + Hash *fields=0; file_read(pool, lfile_name, data, size, - vmode_name.as_string()==TEXT_MODE_NAME); + vmode_name.as_string()==TEXT_MODE_NAME, + third_param_hash, + &fields + ); - char *user_file_name=params->size()>2? - params->as_string(2, "filename must be string").cstr(String::UL_FILE_SPEC) + 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; + if(fields) + vcontent_type=static_cast(fields->get(*content_type_name)); + if(!vcontent_type) + vcontent_type=new(pool) VString(r.mime_type_of(user_file_name)); - static_cast(r.get_self())->set(true/*tainted*/, data, size, - user_file_name, new(pool) VString(r.mime_type_of(user_file_name))); + VFile& self=*static_cast(r.get_self()); + self.set(true/*tainted*/, data, size, user_file_name, vcontent_type); + if(fields) + fields->for_each(_load_pass_param, &self.fields()); } static void _stat(Request& r, const String& method_name, MethodParams *params) { @@ -169,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) { @@ -177,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", @@ -248,27 +274,30 @@ static void _exec_cgi(Request& r, const 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); + 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()); } } @@ -280,25 +309,40 @@ static void _exec_cgi(Request& r, const *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 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)) { @@ -318,8 +362,8 @@ static void _exec_cgi(Request& r, const "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 } @@ -332,8 +376,8 @@ static void _exec_cgi(Request& r, const 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()); @@ -350,14 +394,14 @@ static void _exec_cgi(Request& r, const // $status self.fields().put( - *new(pool) String(pool, "status"), + *file_status_name, 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, const String& method_name, MethodParams *params) { @@ -557,8 +601,12 @@ static void _fullpath(Request& r, const // /some/page.html: ^file:fullpath[a.gif] => /some/a.gif const String& full_disk_path=r.absolute(file_spec); size_t document_root_length=strlen(r.info.document_root); - if(document_root_length>0) - --document_root_length; + + if(document_root_length>0) { + char last_char=r.info.document_root[document_root_length-1]; + if(last_char == '/' || last_char == '\\') + --document_root_length; + } result=&full_disk_path.mid(document_root_length, full_disk_path.size()); } r.write_assign_lang(*result);