--- parser3/src/classes/file.C 2001/04/09 16:04:45 1.24 +++ parser3/src/classes/file.C 2001/04/17 19:31:06 1.28 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.24 2001/04/09 16:04:45 paf Exp $ + $Id: file.C,v 1.28 2001/04/17 19:31:06 paf Exp $ */ #include "pa_request.h" @@ -25,37 +25,24 @@ VStateless_class *file_class; // methods -static void _save(Request& r, const String& method_name, Array *params) { - Pool& pool=r.pool(); - Value& vfile_name=*static_cast(params->get(0)); - // forcing - // ^save[this body type] - r.fail_if_junction_(true, vfile_name, - method_name, "file name must not be code"); +static void _save(Request& r, const String&, MethodParams *params) { + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); // save static_cast(r.self)->save(r.absolute(vfile_name.as_string())); } -static void _delete(Request& r, const String& method_name, Array *params) { +static void _delete(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=*static_cast(params->get(0)); - // forcing - // ^delete[this body type] - r.fail_if_junction_(true, vfile_name, - method_name, "file name must not be code"); + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); // unlink file_delete(pool, r.absolute(vfile_name.as_string())); } -static void _find(Request& r, const String& method_name, Array *params) { +static void _find(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=*static_cast(params->get(0)); - // forcing - // ^delete[this body type] - r.fail_if_junction_(true, vfile_name, - method_name, "file name must not be code"); + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); const String &lfile_name=vfile_name.as_string(); @@ -79,21 +66,14 @@ static void _find(Request& r, const Stri // not found if(params->size()==2) { - // forcing ..{this body type} - Value& not_found_code=*static_cast(params->get(1)); - r.fail_if_junction_(false, not_found_code, - method_name, "not-found param must be code"); + Value& not_found_code=params->get_junction(1, "not-found param must be code"); r.write_pass_lang(r.process(not_found_code)); } } -static void _load(Request& r, const String& method_name, Array *params) { +static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=*static_cast(params->get(0)); - - // forcing ^load[this body type] - r.fail_if_junction_(true, vfile_name, - method_name, "file name must not be code"); + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); const String& lfile_name=vfile_name.as_string(); @@ -101,27 +81,38 @@ static void _load(Request& r, const Stri file_read(pool, r.absolute(lfile_name), data, size, false/*binary*/); char *user_file_name=params->size()==1?lfile_name.cstr(String::UL_FILE_NAME) - :static_cast(params->get(1))->as_string().cstr(); + :params->get(1).as_string().cstr(); static_cast(r.self)->set(true/*tainted*/, data, size, user_file_name, &r.mime_type_of(user_file_name)); } +static void _stat(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + + const String& lfile_name=vfile_name.as_string(); + + size_t size=file_size(r.absolute(lfile_name)); + + static_cast(r.self)->set(true/*tainted*/, 0/*no bytes*/, size); +} + static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) { Hash& hash=*static_cast(info); hash.put(key, &static_cast(value)->as_string()); } -/// ^exec[file-name] -/// ^exec[file-name;env hash] -/// ^exec[file-name;env hash;cmd;line;arg;s] -/// @test header to $fields. waits for header '\' tricks -static void _cgi(Request& r, const String& method_name, Array *params) { +/** + ^exec[file-name] + ^exec[file-name;env hash] + ^exec[file-name;env hash;cmd;line;arg;s] + @test header to $fields. waits for header '\' tricks + @todo fix `` in perl - they produced flipping consoles and no output to perl +*/ +static void _cgi(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=*static_cast(params->get(0)); - // forcing [this param type] - r.fail_if_junction_(true, vfile_name, - method_name, "file name must not be code"); + Value& vfile_name=params->get_no_junction(0, "file name must not be code"); const String& script_name=r.absolute(vfile_name.as_string()); @@ -164,12 +155,13 @@ static void _cgi(Request& r, const Strin PASS(REMOTE_USER); // SCRIPT_NAME env.put(String(pool, "SCRIPT_NAME"), &script_name); +#ifdef WIN32 + // WIN32 shell + PASS(COMSPEC); +#endif if(params->size()>1) { - Value& venv=*static_cast(params->get(1)); - // forcing [this param type] - r.fail_if_junction_(true, venv, - method_name, "env must not be code"); + Value& venv=params->get_no_junction(1, "env must not be code"); if(Hash *user_env=venv.get_hash()) user_env->for_each(append_env_pair, &env); else @@ -182,12 +174,12 @@ static void _cgi(Request& r, const Strin if(params->size()>2) { argv=new(pool) Array(pool, params->size()-2); for(int i=2; isize(); i++) - *argv+=&static_cast(params->get(i))->as_string(); + *argv+=¶ms->get(i).as_string(); } const String in(pool, r.post_data, r.post_size); String out(pool); - String err(pool); + String& err=*new(pool) String(pool); int exit_code=pa_exec(script_name, &env, argv, in, out, err); @@ -201,7 +193,8 @@ static void _cgi(Request& r, const Strin delim_size=0; // calm down, compiler PTHROW(0, 0, &method_name, - "output does not contain CGI header"); + "output does not contain CGI header; exit code=%d; size=%u; text: \"%s\"", + exit_code, (uint)out.size(), out.cstr()); } const String& header=out.mid(0, pos); @@ -244,6 +237,9 @@ void initialize_file_class(Pool& pool, V // ^load[disk-name;user-name] vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + // ^stat[disk-name] + vclass.add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1); + // ^exec[file-name] // ^exec[file-name;env hash] // ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]