--- parser3/src/classes/file.C 2001/08/21 11:12:20 1.47 +++ parser3/src/classes/file.C 2001/11/05 11:46:20 1.65 @@ -2,12 +2,10 @@ Parser: @b file parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: file.C,v 1.47 2001/08/21 11:12:20 parser Exp $ + $Id: file.C,v 1.65 2001/11/05 11:46:20 paf Exp $ */ -static const char *RCSId="$Id: file.C,v 1.47 2001/08/21 11:12:20 parser Exp $"; #include "pa_config_includes.h" @@ -29,6 +27,8 @@ static const char *RCSId="$Id: file.C,v #define FILE_CLASS_NAME "file" +#define TEXT_MODE_NAME "text" + // class class MFile : public Methoded { @@ -51,10 +51,12 @@ const int FIND_MONKEY_MAX_HOPS=10; // methods static void _save(Request& r, const String&, MethodParams *params) { - Value& vfile_name=params->as_no_junction(0, "file name must not be code"); + 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.self)->save(r.absolute(vfile_name.as_string())); + static_cast(r.self)->save(r.absolute(vfile_name.as_string()), + vmode_name.as_string()==TEXT_MODE_NAME); } static void _delete(Request& r, const String&, MethodParams *params) { @@ -70,7 +72,7 @@ static void _move(Request& r, const Stri 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"); - // unlink + // move file_move(pool, r.absolute(vfrom_file_name.as_string()), r.absolute(vto_file_name.as_string())); @@ -109,18 +111,21 @@ static void _find(Request& r, const Stri static void _load(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& 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"); const String& lfile_name=vfile_name.as_string(); void *data; size_t size; - file_read(pool, r.absolute(lfile_name), data, size, false/*binary*/); + file_read(pool, r.absolute(lfile_name), data, size, + vmode_name.as_string()==TEXT_MODE_NAME); - char *user_file_name=params->size()==1?lfile_name.cstr(String::UL_FILE_NAME) - :params->get(1).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, - user_file_name, &r.mime_type_of(user_file_name)); + user_file_name, new(pool) VString(r.mime_type_of(user_file_name))); } static void _stat(Request& r, const String& method_name, MethodParams *params) { @@ -156,7 +161,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(); @@ -166,52 +173,53 @@ 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(SERVER_PROTOCOL, 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_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); } @@ -219,10 +227,11 @@ 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<cstr(String::UL_AS_IS), body->size()); + self.set(false/*not tainted*/, body->cstr(), body->size()); // $status self.fields().put( @@ -297,25 +306,25 @@ 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); + r.pcre_tables()); if(!regexp_code) - PTHROW(0, 0, + throw Exception(0, 0, ®exp->mid(erroffset, regexp->size()), "regular expression syntax error - %s", errptr); - ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3)); + ovector=(int *)pool.malloc(sizeof(int)*(ovecsize=(1/*match*/)*3)); } else regexp_code=0; const char* absolute_path_cstr=r.absolute(relative_path.as_string()) - .cstr(String::UL_FILE_NAME); + .cstr(String::UL_FILE_SPEC); Array& columns=*new(pool) Array(pool); columns+=new(pool) String(pool, "name"); @@ -333,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, 0, regexp, "regular expression execute (%d)", exec_result); @@ -341,10 +350,10 @@ static void _list(Request& r, const Stri } if(suits) { - char *file_name_cstr=(char *)r.malloc(file_name_size); + char *file_name_cstr=(char *)pool.malloc(file_name_size); memcpy(file_name_cstr, ffblk.ff_name, file_name_size); String &file_name=*new(pool) String(pool); - file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME, + file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_SPEC, method_name.origin().file, method_name.origin().line); Array& row=*new(pool) Array(pool); @@ -356,6 +365,7 @@ 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); @@ -367,8 +377,8 @@ MFile::MFile(Pool& apool) : Methoded(apo set_name(*NEW String(pool(), FILE_CLASS_NAME)); - // ^save[file-name] - add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1); + // ^save[mode;file-name] + add_native_method("save", Method::CT_DYNAMIC, _save, 2, 2); // ^delete[file-name] add_native_method("delete", Method::CT_STATIC, _delete, 1, 1); @@ -380,9 +390,9 @@ MFile::MFile(Pool& apool) : Methoded(apo // ^find[file-name]{when-not-found} add_native_method("find", Method::CT_STATIC, _find, 1, 2); - // ^load[disk-name] - // ^load[disk-name;user-name] - add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + // ^load[mode;disk-name] + // ^load[mode;disk-name;user-name] + add_native_method("load", Method::CT_DYNAMIC, _load, 2, 3); // ^stat[disk-name] add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);