--- parser3/src/classes/file.C 2001/04/28 15:22:38 1.35 +++ parser3/src/classes/file.C 2001/08/22 14:03:18 1.48 @@ -5,8 +5,13 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: file.C,v 1.35 2001/04/28 15:22:38 paf Exp $ + $Id: file.C,v 1.48 2001/08/22 14:03:18 parser Exp $ */ +static const char *RCSId="$Id: file.C,v 1.48 2001/08/22 14:03:18 parser Exp $"; + +#include "pa_config_includes.h" + +#include "pcre.h" #include "classes.h" #include "pa_request.h" @@ -14,6 +19,9 @@ #include "pa_table.h" #include "pa_vint.h" #include "pa_exec.h" +#include "pa_vdate.h" +#include "pa_dir.h" +#include "pa_vtable.h" // consts @@ -21,6 +29,8 @@ #define FILE_CLASS_NAME "file" +#define TEXT_MODE_NAME "text" + // class class MFile : public Methoded { @@ -43,23 +53,36 @@ 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& vmode_name=params-> as_no_junction(0, "mode 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())); + 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) { 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())); } +static void _move(Request& r, const String&, MethodParams *params) { + Pool& pool=r.pool(); + 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 + file_move(pool, + r.absolute(vfrom_file_name.as_string()), + r.absolute(vto_file_name.as_string())); +} + 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(); @@ -83,22 +106,24 @@ 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& 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->get(2).as_string().cstr() + :lfile_name.cstr(String::UL_FILE_NAME); static_cast(r.self)->set(true/*tainted*/, data, size, user_file_name, &r.mime_type_of(user_file_name)); @@ -106,13 +131,22 @@ 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) { @@ -128,16 +162,12 @@ 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()))); } -/** - ^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) { +/// @todo fix `` in perl - they produced flipping consoles and no output to perl +static void _exec_cgi(Request& r, const String& method_name, MethodParams *params, + bool cgi) { 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()); @@ -186,13 +216,9 @@ static void _cgi(Request& r, const Strin #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 - PTHROW(0, 0, - &method_name, - "env must be hash"); } Array *argv=0; @@ -207,42 +233,47 @@ static void _cgi(Request& r, const Strin //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; - 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; exit code=%d; size=%u; text: \"%s\"", - exit_code, (uint)out.size(), out.cstr()); - } - const String& header=out.mid(0, pos); - const String& body=out.mid(pos+delim_size, out.size()); + const String *body=&out; // ^file:exec + if(cgi) { // ^file:cgi + // construct with 'out' body and header + int delim_size; + 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; exit code=%d; outsize=%u; out: \"%s\"; errsize=%u; err: \"%s\"", + status, + (uint)out.size(), out.cstr(), + (uint)err.size(), err.cstr()); + } - // body - self.set(false/*not tainted*/, body.cstr(String::UL_AS_IS), body.size()); + const String& header=out.mid(0, pos); + body=&out.mid(pos+delim_size, out.size()); - // 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()); + // 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()); + } } + // body + self.set(false/*not tainted*/, body->cstr(String::UL_AS_IS), body->size()); - // $exit-code + // $status self.fields().put( - *new(pool) String(pool, "exit-code"), - new(pool) VInt(pool, exit_code)); + *new(pool) String(pool, "status"), + new(pool) VInt(pool, status)); // $stderr if(err.size()) { @@ -250,9 +281,91 @@ static void _cgi(Request& r, const Strin *new(pool) String(pool, "stderr"), new(pool) VString(err)); - SAPI::log(pool, "cgi: %s", err.cstr()); + SAPI::log(pool, "file:%s: %s", cgi?"cgi":"exec", err.cstr()); } } +static void _exec(Request& r, const String& method_name, MethodParams *params) { + _exec_cgi(r, method_name, params, false); +} +static void _cgi(Request& r, const String& method_name, MethodParams *params) { + _exec_cgi(r, method_name, params, true); +} + +static void _list(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Value& relative_path=params->as_no_junction(0, "path must not be code"); + + const String *regexp; + pcre *regexp_code; + int ovecsize; + int *ovector; + 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 *errptr; + int erroffset; + regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, + &errptr, &erroffset, + r.pcre_tables); + + if(!regexp_code) + PTHROW(0, 0, + ®exp->mid(erroffset, regexp->size()), + "regular expression syntax error - %s", errptr); + + ovector=(int *)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); + + Array& columns=*new(pool) Array(pool); + columns+=new(pool) String(pool, "name"); + Table& table=*new(pool) Table(pool, &method_name, &columns); + + LOAD_DIR(absolute_path_cstr, + size_t file_name_size=strlen(ffblk.ff_name); + bool suits=true; + if(regexp_code) { + int exec_result=pcre_exec(regexp_code, 0, + ffblk.ff_name, file_name_size, 0, + 0, ovector, ovecsize); + + if(exec_result==PCRE_ERROR_NOMATCH) + suits=false; + else if(exec_result<0) { + (*pcre_free)(regexp_code); + PTHROW(0, 0, + regexp, + "regular expression execute (%d)", + exec_result); + } + } + + if(suits) { + char *file_name_cstr=(char *)r.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, + method_name.origin().file, method_name.origin().line); + + Array& row=*new(pool) Array(pool); + row+=&file_name; + table+=&row; + } + ); + + if(regexp_code) + (*pcre_free)(regexp_code); + + VTable& result=*new(pool) VTable(pool, &table); + result.set_name(method_name); + r.write_no_lang(result); +} // constructor @@ -260,27 +373,40 @@ 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); + // ^move[from-file-name;to-file-name] + add_native_method("move", Method::CT_STATIC, _move, 2, 2); + // ^find[file-name] // ^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); + // ^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+10); + // ^exec[file-name] // ^exec[file-name;env hash] // ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s] - add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5); + add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+10); + + // ^file:list[path] + // ^file:list[path][regexp] + add_native_method("list", Method::CT_STATIC, _list, 1, 2); + } // global variable