--- parser3/src/classes/file.C 2001/04/10 10:32:04 1.25 +++ parser3/src/classes/file.C 2001/04/28 15:22:38 1.35 @@ -5,11 +5,11 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.25 2001/04/10 10:32:04 paf Exp $ + $Id: file.C,v 1.35 2001/04/28 15:22:38 paf Exp $ */ +#include "classes.h" #include "pa_request.h" -#include "_file.h" #include "pa_vfile.h" #include "pa_table.h" #include "pa_vint.h" @@ -17,45 +17,49 @@ // consts -const int FIND_MONKEY_MAX_HOPS=10; +// defines + +#define FILE_CLASS_NAME "file" + +// class + +class MFile : public Methoded { +public: // VStateless_class + + Value *create_new_value(Pool& pool) { return new(pool) VFile(pool); } + +public: // Methoded + bool used_directly() { return true; } + +public: + MFile(Pool& pool); -// global var +}; -VStateless_class *file_class; +// consts + +const int FIND_MONKEY_MAX_HOPS=10; // 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 +83,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,19 +98,15 @@ 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, Array *params) { +static void _stat(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(); @@ -126,17 +119,25 @@ static void append_env_pair(const Hash:: 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) { + +static void pass_cgi_header_attribute(Array::Item *value, void *info) { + String& string=*static_cast(value); + Hash& hash=*static_cast(info); + int colon_pos=string.pos(":", 1); + if(colon_pos>0) + hash.put(string.mid(0, colon_pos), + new(string.pool()) VString(string.mid(colon_pos+1, string.size()))); +} +/** + ^exec[file-name] + ^exec[file-name;env hash] + ^exec[file-name;env hash;cmd;line;arg;s] + @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()); @@ -179,12 +180,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 @@ -197,26 +199,31 @@ 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=pa_exec(script_name, &env, argv, - in, out, err); + //out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body"); + //out<(r.self); // construct with 'out' body and header int delim_size; - int pos=out.pos("\n\n", delim_size=2); - if(pos<0) - pos=out.pos("\r\n\r\n", delim_size=4); + const char *eol_marker="\r\n"; size_t eol_marker_size=2; + int pos=out.pos("\r\n\r\n", delim_size=4); + if(pos<0) { + eol_marker="\n"; eol_marker_size=1; + pos=out.pos("\n\n", delim_size=2); + } if(pos<0) { 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); @@ -225,7 +232,12 @@ static void _cgi(Request& r, const Strin // body self.set(false/*not tainted*/, body.cstr(String::UL_AS_IS), body.size()); - // todo header to $fields. waits for header '\' tricks + // header to $fields + { + Array rows(pool); + header.split(rows, 0, eol_marker, eol_marker_size, String::UL_CLEAN); + rows.for_each(pass_cgi_header_attribute, &self.fields()); + } // $exit-code self.fields().put( @@ -242,28 +254,41 @@ static void _cgi(Request& r, const Strin } } -// initialize +// constructor + +MFile::MFile(Pool& apool) : Methoded(apool) { + set_name(*NEW String(pool(), FILE_CLASS_NAME)); + -void initialize_file_class(Pool& pool, VStateless_class& vclass) { // ^save[file-name] - vclass.add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1); + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1); // ^delete[file-name] - vclass.add_native_method("delete", Method::CT_STATIC, _delete, 1, 1); + add_native_method("delete", Method::CT_STATIC, _delete, 1, 1); // ^find[file-name] // ^find[file-name]{when-not-found} - vclass.add_native_method("find", Method::CT_STATIC, _find, 1, 2); + add_native_method("find", Method::CT_STATIC, _find, 1, 2); // ^load[disk-name] // ^load[disk-name;user-name] - vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); // ^stat[disk-name] - vclass.add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1); + 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] - vclass.add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5); + add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5); +} + +// global variable + +Methoded *file_class; + +// creator + +Methoded *MFile_create(Pool& pool) { + return file_class=new(pool) MFile(pool); }