--- parser3/src/classes/file.C 2001/09/30 09:56:43 1.56 +++ parser3/src/classes/file.C 2002/04/15 13:17:03 1.78 @@ -1,10 +1,10 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: file.C,v 1.56 2001/09/30 09:56:43 parser Exp $ + $Id: file.C,v 1.78 2002/04/15 13:17:03 paf Exp $ */ #include "pa_config_includes.h" @@ -20,6 +20,7 @@ #include "pa_vdate.h" #include "pa_dir.h" #include "pa_vtable.h" +#include "pa_charset.h" // consts @@ -60,20 +61,18 @@ static void _save(Request& r, const Stri } static void _delete(Request& r, const String&, MethodParams *params) { - Pool& pool=r.pool(); Value& vfile_name=params->as_no_junction(0, "file name must not be code"); // unlink - file_delete(pool, r.absolute(vfile_name.as_string())); + file_delete(r.absolute(vfile_name.as_string())); } static void _move(Request& r, const String&, MethodParams *params) { - Pool& pool=r.pool(); 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(pool, + file_move( r.absolute(vfrom_file_name.as_string()), r.absolute(vto_file_name.as_string())); } @@ -86,18 +85,18 @@ static void _find(Request& r, const Stri // passed file name simply exists in current dir if(file_readable(r.absolute(lfile_name))) { - r.write_no_lang(*new(pool) VString(lfile_name)); + r.write_no_lang(lfile_name); return; } // scan .. dirs for result for(int i=0; isize()>2?params->get(2).as_string().cstr() + char *user_file_name=params->size()>2? + params->as_string(2, "filename must be string").cstr(String::UL_FILE_SPEC) :lfile_name.cstr(String::UL_FILE_SPEC); static_cast(r.self)->set(true/*tainted*/, data, size, @@ -160,7 +160,9 @@ static void pass_cgi_header_attribute(Ar hash.put(string.mid(0, colon_pos), new(string.pool()) VString(string.mid(colon_pos+1, string.size()))); } -/// @todo fix `` in perl - they produced flipping consoles and no output to perl +/** @todo fix `` in perl - they produced flipping consoles and no output to perl + @test EPASS, ECSTR [touched them when optimized hash] +*/ static void _exec_cgi(Request& r, const String& method_name, MethodParams *params, bool cgi) { Pool& pool=r.pool(); @@ -170,52 +172,54 @@ static void _exec_cgi(Request& r, const const String& script_name=r.absolute(vfile_name.as_string()); Hash env(pool); - #define PASS(key) \ - String key(pool); \ - if(const char *value=SAPI::get_env(pool, #key)) { \ - key.APPEND_CONST(value); \ - env.put(String(pool, #key), &key); \ + #define ECSTR(name, value_cstr) \ + String name##key(pool, #name); \ + String name##value(pool); \ + if(value_cstr) { \ + name##value.APPEND_CONST(value_cstr); \ + env.put(name##key, &name##value); \ } - #define INFO(key, value) \ - String value(pool); \ - if(r.info.value) { \ - value.APPEND_CONST(r.info.value); \ - env.put(String(pool, key), &value); \ + #define EPASS(name) \ + String name##key(pool, #name); \ + String name##value(pool); \ + if(const char *value_cstr=SAPI::get_env(pool, #name)) { \ + name##value.APPEND_CONST(value_cstr); \ + env.put(name##key, &name##value); \ } // const - String gateway_interface(pool, "CGI/1.1"); - env.put(String(pool, "GATEWAY_INTERFACE"), &gateway_interface); + ECSTR(GATEWAY_INTERFACE, "CGI/1.1"); // from Request.info - INFO("DOCUMENT_ROOT", document_root); - INFO("PATH_TRANSLATED", path_translated); - INFO("SERVER_PROTOCOL", method); - INFO("QUERY_STRING", query_string); - INFO("REQUEST_URI", uri); - INFO("CONTENT_TYPE", content_type); + ECSTR(DOCUMENT_ROOT, r.info.document_root); + ECSTR(PATH_TRANSLATED, r.info.path_translated); + ECSTR(REQUEST_METHOD, r.info.method); + ECSTR(QUERY_STRING, r.info.query_string); + ECSTR(REQUEST_URI, r.info.uri); + ECSTR(CONTENT_TYPE, r.info.content_type); char content_length_cstr[MAX_NUMBER]; snprintf(content_length_cstr, MAX_NUMBER, "%u", r.info.content_length); String content_length(pool, content_length_cstr); - env.put(String(pool, "CONTENT_LENGTH"), &content_length); - INFO("HTTP_COOKIE", cookie); - INFO("HTTP_USER_AGENT", user_agent); + ECSTR(CONTENT_LENGTH, content_length_cstr); + ECSTR(HTTP_COOKIE, r.info.cookie); + ECSTR(HTTP_USER_AGENT, r.info.user_agent); // passing some SAPI:get_env-s - PASS(SERVER_NAME); - PASS(SERVER_PORT); - PASS(HTTP_REFERER); - PASS(REMOTE_ADDR); - PASS(REMOTE_HOST); - PASS(REMOTE_USER); + EPASS(SERVER_PROTOCOL); + EPASS(SERVER_NAME); + EPASS(SERVER_PORT); + EPASS(HTTP_REFERER); + EPASS(REMOTE_ADDR); + EPASS(REMOTE_HOST); + EPASS(REMOTE_USER); // SCRIPT_NAME - env.put(String(pool, "SCRIPT_NAME"), &script_name); + env.put(*new(pool) String(pool, "SCRIPT_NAME"), &script_name); #ifdef WIN32 // WIN32 shell - PASS(COMSPEC); + EPASS(COMSPEC); #endif if(params->size()>1) { Value& venv=params->as_no_junction(1, "env must not be code"); - if(Hash *user_env=venv.get_hash()) + if(Hash *user_env=venv.get_hash(&method_name)) user_env->for_each(append_env_pair, &env); } @@ -223,15 +227,16 @@ static void _exec_cgi(Request& r, const if(params->size()>2) { argv=new(pool) Array(pool, params->size()-2); for(int i=2; isize(); i++) - *argv+=¶ms->get(i).as_string(); + *argv+=¶ms->as_string(i, "parameter must be string"); } - const String in(pool, r.post_data, r.post_size); + String in(pool); + in.APPEND(r.post_data, r.post_size, String::UL_CLEAN, "passing post data", 0); String out(pool); //out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body"); //out<(r.self); @@ -247,7 +252,7 @@ static void _exec_cgi(Request& r, const } if(pos<0) { delim_size=0; // calm down, compiler - PTHROW(0, 0, + throw Exception(0, &method_name, "output does not contain CGI header; exit code=%d; outsize=%u; out: \"%s\"; errsize=%u; err: \"%s\"", status, @@ -266,7 +271,7 @@ static void _exec_cgi(Request& r, const } } // body - self.set(false/*not tainted*/, body->cstr(String::UL_AS_IS), body->size()); + self.set(false/*not tainted*/, body->cstr(), body->size()); // $status self.fields().put( @@ -301,15 +306,15 @@ static void _list(Request& r, const Stri if(params->size()>1) { regexp=¶ms->as_no_junction(1, "regexp must not be code").as_string(); - const char *pattern=regexp->cstr(String::UL_AS_IS); + const char *pattern=regexp->cstr(); const char *errptr; int erroffset; regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, &errptr, &erroffset, - r.pcre_tables()); + pool.get_client_charset().pcre_tables); if(!regexp_code) - PTHROW(0, 0, + throw Exception(0, ®exp->mid(erroffset, regexp->size()), "regular expression syntax error - %s", errptr); @@ -337,7 +342,7 @@ static void _list(Request& r, const Stri suits=false; else if(exec_result<0) { (*pcre_free)(regexp_code); - PTHROW(0, 0, + throw Exception(0, regexp, "regular expression execute (%d)", exec_result); @@ -360,11 +365,32 @@ static void _list(Request& r, const Stri if(regexp_code) (*pcre_free)(regexp_code); + // write out result VTable& result=*new(pool) VTable(pool, &table); result.set_name(method_name); r.write_no_lang(result); } +#ifndef DOXYGEN +struct Lock_execute_body_info { + Request *r; + Value *body_code; +}; +#endif +static void lock_execute_body(int , void *context) { + Lock_execute_body_info& info=*static_cast(context); + + // execute body + info.r->write_assign_lang(info.r->process(*info.body_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); +} + // constructor MFile::MFile(Pool& apool) : Methoded(apool) { @@ -405,6 +431,9 @@ MFile::MFile(Pool& apool) : Methoded(apo // ^file:list[path][regexp] add_native_method("list", Method::CT_STATIC, _list, 1, 2); + // ^file:lock[path]{code} + add_native_method("lock", Method::CT_STATIC, _lock, 2, 2); + } // global variable