--- parser3/src/classes/file.C 2001/04/15 13:12:17 1.26 +++ parser3/src/classes/file.C 2001/07/11 15:02:09 1.40 @@ -5,28 +5,47 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.26 2001/04/15 13:12:17 paf Exp $ + $Id: file.C,v 1.40 2001/07/11 15:02:09 parser Exp $ */ +static const char *RCSId="$Id: file.C,v 1.40 2001/07/11 15:02:09 parser Exp $"; +#include "classes.h" #include "pa_request.h" -#include "_file.h" #include "pa_vfile.h" #include "pa_table.h" #include "pa_vint.h" #include "pa_exec.h" +#include "pa_vdate.h" // 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; } -// global var +public: + MFile(Pool& pool); -VStateless_class *file_class; +}; + +// consts + +const int FIND_MONKEY_MAX_HOPS=10; // methods static void _save(Request& r, const String&, MethodParams *params) { - Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); // save static_cast(r.self)->save(r.absolute(vfile_name.as_string())); @@ -34,7 +53,7 @@ static void _save(Request& r, const Stri static void _delete(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); // unlink file_delete(pool, r.absolute(vfile_name.as_string())); @@ -42,7 +61,7 @@ static void _delete(Request& r, const St static void _find(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"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String &lfile_name=vfile_name.as_string(); @@ -66,14 +85,14 @@ static void _find(Request& r, const Stri // not found if(params->size()==2) { - Value& not_found_code=params->get_junction(1, "not-found param must be code"); + Value& not_found_code=params->as_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, MethodParams *params) { Pool& pool=r.pool(); - Value& vfile_name=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& lfile_name=vfile_name.as_string(); @@ -89,27 +108,42 @@ static void _load(Request& r, const Stri 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"); + Value& vfile_name=params->as_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)); + size_t size; + time_t atime, mtime, ctime; + file_stat(r.absolute(lfile_name), + size, + atime, mtime, ctime); - static_cast(r.self)->set(true/*tainted*/, 0/*no bytes*/, size); + VFile& vfile=*static_cast(r.self); + vfile.set(true/*tainted*/, 0/*no bytes*/, size); + Hash& ff=vfile.fields(); + ff.put(*new(pool) String(pool, "adate"), new(pool) VDate(pool, atime)); + ff.put(*new(pool) String(pool, "mdate"), new(pool) VDate(pool, mtime)); + ff.put(*new(pool) String(pool, "cdate"), new(pool) VDate(pool, ctime)); } 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 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()))); +} +/// @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=params->get_no_junction(0, "file name must not be code"); + Value& vfile_name=params->as_no_junction(0, "file name must not be code"); const String& script_name=r.absolute(vfile_name.as_string()); @@ -152,9 +186,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=params->get_no_junction(1, "env must not be code"); + Value& venv=params->as_no_junction(1, "env must not be code"); if(Hash *user_env=venv.get_hash()) user_env->for_each(append_env_pair, &env); else @@ -172,21 +210,26 @@ static void _cgi(Request& r, const Strin 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); @@ -195,7 +238,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( @@ -212,28 +260,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); + + // ^cgi[file-name] + // ^cgi[file-name;env hash] + // ^cgi[file-name;env hash;1cmd;2line;3ar;4g;5s] + add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5); +} + +// global variable + +Methoded *file_class; + +// creator - // ^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); +Methoded *MFile_create(Pool& pool) { + return file_class=new(pool) MFile(pool); }