--- parser3/src/classes/file.C 2002/11/25 14:57:32 1.105 +++ parser3/src/classes/file.C 2003/04/04 14:42:38 1.110 @@ -1,11 +1,13 @@ /** @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) + + portions by Victor Fedoseev" [January 23, 2003] */ -static const char* IDENT_FILE_C="$Date: 2002/11/25 14:57:32 $"; +static const char* IDENT_FILE_C="$Date: 2003/04/04 14:42:38 $"; #include "pa_config_includes.h" @@ -21,11 +23,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 @@ -190,6 +194,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 +203,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", @@ -269,27 +276,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()); } } @@ -301,61 +311,58 @@ 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=0; - VFile& self=*static_cast(r.get_self()); - - const String *body=&out; // ^file:exec - Value *content_type=0; - const char *eol_marker=0; size_t eol_marker_size; + const String *body=0; const String *header=0; + const char *eol_marker=0; size_t eol_marker_size; int header_break_pos; + + String *real_out=&raw_out; + String *real_err=&raw_err; 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); - - bool unix_header_break; - switch((dos_pos >= 0?10:00) + (unix_pos >= 0?01:00)) { - case 10: // dos - unix_header_break=false; - break; - case 01: // unix - unix_header_break=true; - break; - case 11: // dos & unix - unix_header_break=unix_possize(), real_out->cstr(), + (uint)real_err->size(), real_err->cstr()); - int header_break_pos; - if(unix_header_break) { - header_break_pos=unix_pos; - eol_marker="\n"; eol_marker_size=1; - } else { - header_break_pos=dos_pos; - eol_marker="\r\n"; eol_marker_size=2; + header=&real_out->mid(0, header_break_pos); + body=&real_out->mid(header_break_pos+eol_marker_size*2, real_out->size()); + }else{ // ^file:exec + status = pa_exec(false/*forced_allow*/, script_name, &env, argv, *real_in, raw_out, 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); } - - header=&out.mid(0, header_break_pos); - body=&out.mid(header_break_pos+eol_marker_size*2, out.size()); + body=real_out; } + + + + VFile& self=*static_cast(r.get_self()); + // body self.set(false/*not tainted*/, body->cstr(), body->size()); @@ -375,10 +382,10 @@ static void _exec_cgi(Request& r, const 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) { @@ -578,8 +585,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);