--- parser3/src/classes/file.C 2001/04/09 13:21:08 1.22 +++ parser3/src/classes/file.C 2001/04/15 13:12:17 1.26 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.22 2001/04/09 13:21:08 paf Exp $ + $Id: file.C,v 1.26 2001/04/15 13:12:17 paf Exp $ */ #include "pa_request.h" @@ -13,6 +13,7 @@ #include "pa_vfile.h" #include "pa_table.h" #include "pa_vint.h" +#include "pa_exec.h" // consts @@ -24,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(); @@ -78,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(); @@ -100,12 +81,23 @@ 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()); @@ -114,24 +106,58 @@ static void append_env_pair(const Hash:: /// ^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) { +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()); + + 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 INFO(key, value) \ + String value(pool); \ + if(r.info.value) { \ + value.APPEND_CONST(r.info.value); \ + env.put(String(pool, key), &value); \ + } + + // const + String gateway_interface(pool, "CGI/1.1"); + env.put(String(pool, "GATEWAY_INTERFACE"), &gateway_interface); + // 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); + 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); + // passing some SAPI:get_env-s + PASS(SERVER_NAME); + PASS(SERVER_PORT); + PASS(HTTP_REFERER); + PASS(REMOTE_ADDR); + PASS(REMOTE_HOST); + PASS(REMOTE_USER); + // SCRIPT_NAME + env.put(String(pool, "SCRIPT_NAME"), &script_name); - Hash *env=0; 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"); - if(Hash *user_env=venv.get_hash()) { - env=new(pool) Hash(pool); - user_env->for_each(append_env_pair, env); - } else + 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 PTHROW(0, 0, &method_name, "env must be hash"); @@ -141,13 +167,13 @@ 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); - int exit_code=SAPI::execute(r.absolute(vfile_name.as_string()), env, argv, + int exit_code=pa_exec(script_name, &env, argv, in, out, err); VFile& self=*static_cast(r.self); @@ -203,6 +229,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]