--- parser3/src/classes/file.C 2026/09/30 16:44:19 1.301 +++ parser3/src/classes/file.C 2026/11/03 16:04:19 1.308 @@ -5,8 +5,6 @@ Authors: Konstantin Morshnev , Alexandr Petrosian */ -#include "pa_config_includes.h" - #include "classes.h" #include "pa_vmethod_frame.h" #include "pa_base64.h" @@ -27,7 +25,7 @@ #include "pa_vregex.h" #include "pa_version.h" -volatile const char * IDENT_FILE_C="$Id: file.C,v 1.301 2026/09/30 16:44:19 moko Exp $"; +volatile const char * IDENT_FILE_C="$Id: file.C,v 1.308 2026/11/03 16:04:19 moko Exp $"; // defines @@ -184,6 +182,26 @@ static void _delete(Request& r, MethodPa file_delete(*path, fail_on_problem, keep_empty_dirs); } +static void _rmdir(Request& r, MethodParams& params) { + const String& dir_name=params.as_file_name(0); + bool fail_on_problem=true; + + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1)){ + int valid_options=0; + if(Value* vsuppress_exception=options->get(SUPPRESS_EXCEPTION_NAME)){ + fail_on_problem=r.process(*vsuppress_exception).as_bool(); + valid_options++; + } + if(valid_options != options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + + const String* path=fail_on_problem ? &r.full_disk_path(dir_name) : r.real_disk_path(dir_name); + if(path) + dir_delete(*path, fail_on_problem); +} + static void _move(Request& r, MethodParams& params) { 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"); @@ -503,7 +521,7 @@ static void _exec_cgi(Request& r, Method // const ECSTR(GATEWAY_INTERFACE, "CGI/1.1"); - ECSTR(PARSER_VERSION, PARSER_VERSION); + ECSTR(PARSER_VERSION, PARSER_VERSION_WITH_FEATURES); // from Request.info ECSTR(DOCUMENT_ROOT, r.request_info.document_root); ECSTR(PATH_TRANSLATED, r.request_info.path_translated); @@ -707,6 +725,7 @@ static void _list(Request& r, MethodPara Value& relative_path=params.as_no_junction(0, "path must not be code"); bool stat=false; + bool fail_on_problem=false; VRegex* vregex=0; VRegexCleaner vrcleaner; @@ -724,6 +743,10 @@ static void _list(Request& r, MethodPara vfilter=value; valid_options++; } + if(Value* vexception=options->get(SUPPRESS_EXCEPTION_NAME)) { + fail_on_problem=r.process(*vexception).as_bool(); + valid_options++; + } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { @@ -745,11 +768,17 @@ static void _list(Request& r, MethodPara } } - const char* absolute_path_cstr=r.full_disk_path(relative_path.as_string()).taint_cstr(String::L_FILE_SPEC); - Table::Action_options table_options; Table& table=*new Table(file_list_table_template(), table_options); + // no exception for a uri or an invalid or tainted file:// + const String* path=fail_on_problem ? &r.full_disk_path(relative_path.as_string()) : r.real_disk_path(relative_path.as_string()); + if(!path) { + r.write(*new VTable(&table)); + return; + } + const char* absolute_path_cstr=path->taint_cstr(String::L_FILE_SPEC); + const int ovector_size=(1/*match*/)*3; int ovector[ovector_size]; @@ -769,6 +798,10 @@ static void _list(Request& r, MethodPara } table+=row; } + , + if(fail_on_problem) + throw Exception(errno==EACCES ? "file.access" : (errno==ENOENT || errno==ENOTDIR) ? "file.missing" : 0, + path, "list failed: %s (%d)%s", strerror(errno), errno, actual_filename(*path, absolute_path_cstr)); ); // write out result @@ -829,7 +862,7 @@ static const String* web_path(Request& r // checking the result is inside document root; // first checking the segment boundary: /root must not match /root-but-longer - return result.first_char()=='/' && !strncmp(disk_path->cstr(), document_root, document_root_length) ? &result : 0; + return result.first_char()=='/' && !path_cmp(disk_path->cstr(), document_root, document_root_length) ? &result : 0; } static void _find(Request& r, MethodParams& params) { @@ -966,6 +999,10 @@ static void _fullpath(Request& r, Method throw Exception(PARSER_RUNTIME, &file_spec, "is outside of $request:document-root [%s]", r.request_info.document_root); } +static void _diskpath(Request& r, MethodParams& params) { + r.write(r.full_disk_path(params.as_file_spec(0))); +} + static void _sql_string(Request& r, MethodParams&) { VFile& self=GET_SELF(r, VFile); @@ -1240,15 +1277,19 @@ MFile::MFile(): Methoded("file") { add_native_method("create", Method::CT_DYNAMIC, _create, 1, 4); // ^file.save[mode;file-name] - // ^file.save[mode;file-name;$.charset[...]$.append(false)] + // ^file.save[mode;file-name; $.charset[...] $.append(false) ] add_native_method("save", Method::CT_DYNAMIC, _save, 2, 3); // ^file:delete[file-name] - // ^file:delete[file-name;$.keep-empty-dir(true)$.exception(false)] + // ^file:delete[file-name; $.keep-empty-dir(true) $.exception(false) ] add_native_method("delete", Method::CT_STATIC, _delete, 1, 2); + // ^file:rmdir[dir-name] + // ^file:rmdir[dir-name; $.exception(false) ] + add_native_method("rmdir", Method::CT_STATIC, _rmdir, 1, 2); + // ^file:move[from-file-name;to-file-name] - // ^file:move[from-file-name;to-file-name;$.keep-empty-dir(true)] + // ^file:move[from-file-name;to-file-name; $.keep-empty-dir(true) ] add_native_method("move", Method::CT_STATIC, _move, 2, 3); // ^file::load[mode;disk-name] @@ -1293,6 +1334,8 @@ MFile::MFile(): Methoded("file") { add_native_method("justext", Method::CT_STATIC, _justext, 1, 1); // /some/page.html: ^file:fullpath[a.gif] => /some/a.gif add_native_method("fullpath", Method::CT_STATIC, _fullpath, 1, 1); + // /some/page.html: ^file:diskpath[a.gif] => /document/root/some/a.gif, file:// and C:\ resolved as well + add_native_method("diskpath", Method::CT_STATIC, _diskpath, 1, 1); // ^file.sql-string[] add_native_method("sql-string", Method::CT_DYNAMIC, _sql_string, 0, 0); @@ -1307,7 +1350,7 @@ MFile::MFile(): Methoded("file") { // decode: // ^file::base64[encoded] // backward // ^file::base64[mode;user-file-name;encoded] - // ^file::base64[mode;user-file-name;encoded;$.content-type[...]] + // ^file::base64[mode;user-file-name;encoded; $.content-type[...] ] add_native_method("base64", Method::CT_ANY, _base64, 0, 4); // ^file.crc32[] @@ -1319,6 +1362,6 @@ MFile::MFile(): Methoded("file") { add_native_method("md5", Method::CT_ANY, _md5, 0, 1); // ^file:copy[from-file-name;to-file-name] - // ^file:copy[from-file-name;to-file-name;$.append(false)] + // ^file:copy[from-file-name;to-file-name; $.append(false) ] add_native_method("copy", Method::CT_STATIC, _copy, 2, 3); }