--- parser3/src/classes/file.C 2012/03/03 00:21:47 1.217 +++ parser3/src/classes/file.C 2012/06/15 06:13:10 1.221 @@ -1,12 +1,10 @@ /** @file Parser: @b file parser class. - Copyright (c) 2001-2012 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_FILE_C="$Date: 2012/03/03 00:21:47 $"; - #include "pa_config_includes.h" #include "classes.h" @@ -27,6 +25,8 @@ static const char * const IDENT_FILE_C=" #include "pa_vregex.h" #include "pa_version.h" +volatile const char * IDENT_FILE_C="$Id: file.C,v 1.221 2012/06/15 06:13:10 misha Exp $"; + // defines #define STDIN_EXEC_PARAM_NAME "stdin" @@ -234,11 +234,9 @@ static void _load(Request& r, MethodPara if(Value* remote_content_type=file.headers->get(HTTP_CONTENT_TYPE_UPPER)) vcontent_type=new VString(*new String(remote_content_type->as_string().cstr())); } - - VFile& self=GET_SELF(r, VFile); - self.set(true/*tainted*/, file.str, file.length, user_file_name, vcontent_type, &r); - self.set_mode(as_text); + VFile& self=GET_SELF(r, VFile); + self.set(true/*tainted*/, as_text, file.str, file.length, user_file_name, vcontent_type, &r); if(file.headers){ file.headers->for_each(_load_pass_param, &self.fields()); @@ -311,14 +309,13 @@ static void _create(Request& r, MethodPa String::Body body=content_str->cstr_to_string_body_untaint(String::L_AS_IS); // explode content, honor tainting changes if(asked_charset && is_text) body=Charset::transcode(body, r.charsets.source(), *asked_charset); - self.set(true/*tainted*/, body.cstr(), body.length()); - self.set_mode(is_text); + + self.set(true/*tainted*/, is_text, body.cstrm(), body.length()); } else { if(asked_charset) throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with file-content"); self.set(*vcontent.as_vfile(String::L_AS_IS)); - if(mode) - self.set_mode(is_text); + self.set_mode(is_text); } self.set_name(file_name); @@ -337,7 +334,7 @@ static void _stat(Request& r, MethodPara VFile& self=GET_SELF(r, VFile); - self.set(true/*tainted*/, 0/*no bytes*/, size, &lfile_name, 0, &r); + self.set(true/*tainted*/, false/*binary*/, 0/*no bytes*/, size, &lfile_name, 0, &r); HashStringValue& ff=self.fields(); ff.put(adate_name, new VDate(atime)); ff.put(mdate_name, new VDate(mtime)); @@ -463,8 +460,7 @@ static void _exec_cgi(Request& r, Method String *in=new String(); Charset *charset=0; // default script works raw_in 'source' charset = no transcoding needed if(param_index < params.count()) { - Value& venv=params.as_no_junction(param_index++, "env must not be code"); - if(HashStringValue* user_env=venv.get_hash()) { + if(HashStringValue* user_env=params.as_hash(param_index++, "env")) { // $.charset [previewing to handle URI pieces] if(Value* vcharset=user_env->get(CHARSET_EXEC_PARAM_NAME)) charset=&charsets.get(vcharset->as_string() @@ -606,7 +602,7 @@ static void _exec_cgi(Request& r, Method file_out->length -= headersize; // $body - self.set(false/*not tainted*/, file_out->str, file_out->length); + self.set(false/*not tainted*/, is_text, file_out->str, file_out->length); // $fields << header if(header) { @@ -622,11 +618,9 @@ static void _exec_cgi(Request& r, Method } } else { // ^file::exec // $body - self.set(false/*not tainted*/, file_out->str, file_out->length); + self.set(false/*not tainted*/, is_text, file_out->str, file_out->length); } - self.set_mode(is_text); - // $status self.fields().put(file_status_name, new VInt(execution.status)); @@ -710,8 +704,19 @@ static void _lock(Request& r, MethodPara &info); } +static size_t afterlastslash(const String& str) { + size_t pos=str.strrpbrk("/\\"); + return pos!=STRING_NOT_FOUND?pos+1:0; +} + +static size_t afterlastslash(const String& str, size_t right) { + size_t pos=str.strrpbrk("/\\", 0, right); + return pos!=STRING_NOT_FOUND?pos+1:0; +} + static void _find(Request& r, MethodParams& params) { const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE); + Value* not_found_code=(params.count()==2)?¶ms.as_junction(1, "not-found param must be code"):0; const String* file_spec; @@ -727,19 +732,23 @@ static void _find(Request& r, MethodPara } // monkey way - int after_base_slash=lastposafter(*file_spec, 0, "/", 1); - const String* dirname=&file_spec->mid(0, after_base_slash); - const String& basename=file_spec->mid(after_base_slash, file_spec->length()); - - int after_monkey_slash; - while((after_monkey_slash=lastposafter(*dirname, 0, "/", 1, true))>0) { + size_t last_slash=file_spec->strrpbrk("/\\"); + const String& dirname=file_spec->mid(0, last_slash!=STRING_NOT_FOUND?last_slash:0); + const String& basename=file_spec->mid(last_slash!=STRING_NOT_FOUND?last_slash+1:0, file_spec->length()); + + size_t rpos=dirname.is_empty()?0:dirname.length()-1; + while((rpos=dirname.rskipchars("/\\", 0, rpos))!=STRING_NOT_FOUND){ + size_t slash=dirname.strrpbrk("/\\", 0, rpos); + if(slash==STRING_NOT_FOUND) + break; String test_name; - test_name<<*(dirname=&dirname->mid(0, after_monkey_slash)); - test_name< . + // / > / + // /a > / + // /a/ > / // /a/some.tar.gz > /a - // /a/b/ > /a - int afterslash=lastposafter(file_spec, 0, "/", 1, true); - if(afterslash>0) - r.write_assign_lang(file_spec.mid(0, afterslash==1?1:afterslash-1)); - else + // /a/b/ > /a + // /a///b/ > /a + // /a/b/// > /a + // file > . + + if(file_spec.is_empty()) { r.write_assign_lang(String(".")); + return; + } + + size_t p; + size_t slash; + if((p=file_spec.rskipchars("/\\"))==STRING_NOT_FOUND) + r.write_assign_lang(String("/")); + else { + if((slash=file_spec.strrpbrk("/\\", 0, p))!=STRING_NOT_FOUND) { + if((p=file_spec.rskipchars("/\\", 0, slash))==STRING_NOT_FOUND) + p=slash; + r.write_assign_lang(file_spec.mid(0, p+1)); + return; + } + r.write_assign_lang(String(".")); + } } static void _basename(Request& r, MethodParams& params) { const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING); + // works as *nix basename + + // empty > . + // / > / + // /a > a + // /a/ > a // /a/some.tar.gz > some.tar.gz - int afterslash=lastposafter(file_spec, 0, "/", 1); - r.write_assign_lang(file_spec.mid(afterslash, file_spec.length())); + // /a/b/ > b + // /a///b/ > b + // /a/b/// > b + // file > file + + if(file_spec.is_empty()) { + r.write_assign_lang(String(".")); + return; + } + + size_t p=file_spec.rskipchars("/\\"); + if(p==STRING_NOT_FOUND) + r.write_assign_lang(String("/")); + else + r.write_assign_lang(file_spec.mid(afterlastslash(file_spec, p), p+1)); } static void _justname(Request& r, MethodParams& params) { const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING); // /a/some.tar.gz > some.tar - int afterslash=lastposafter(file_spec, 0, "/", 1); - int afterdot=lastposafter(file_spec, afterslash, ".", 1); - r.write_assign_lang(file_spec.mid(afterslash, afterdot!=afterslash?afterdot-1:file_spec.length())); + // /a/b.c/ > empty + // /a/b.c > b + size_t pos=afterlastslash(file_spec); + size_t dotpos=file_spec.strrpbrk(".", pos); + r.write_assign_lang(file_spec.mid(pos, dotpos!=STRING_NOT_FOUND?dotpos:file_spec.length())); } + static void _justext(Request& r, MethodParams& params) { const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING); // /a/some.tar.gz > gz - int afterdot=lastposafter(file_spec, 0, ".", 1); - if(afterdot>0) - r.write_assign_lang(file_spec.mid(afterdot, file_spec.length())); + // /a/b.c/ > empty + size_t pos=afterlastslash(file_spec); + size_t dotpos=file_spec.strrpbrk(".", pos); + if(dotpos!=STRING_NOT_FOUND) + r.write_assign_lang(file_spec.mid(dotpos+1, file_spec.length())); } static void _fullpath(Request& r, MethodParams& params) { @@ -873,7 +929,7 @@ static void _sql(Request& r, MethodParam ulong offset=0; if(params.count()>1) - if(HashStringValue* options=params.as_hash(1)){ + if(HashStringValue* options=params.as_hash(1, "sql options")) { int valid_options=0; if(Value* vfilename=options->get(NAME_NAME)) { valid_options++; @@ -910,10 +966,9 @@ static void _sql(Request& r, MethodParam VFile& self=GET_SELF(r, VFile); - self.set(true/*tainted*/, handlers.value.str, handlers.value.length, handlers.user_file_name + self.set(true/*tainted*/, false/*binary*/, (char*)handlers.value.str, handlers.value.length, handlers.user_file_name , handlers.user_content_type ? new VString(*handlers.user_content_type) : 0 , &r); - self.set_mode(false/*binary*/); } static void _base64(Request& r, MethodParams& params) { @@ -964,13 +1019,7 @@ static void _base64(Request& r, MethodPa size_t length=0; pa_base64_decode(encoded, strlen(encoded), decoded, length, strict); - if(length && is_text) - fix_line_breaks(decoded, length); - - self.set(true/*tainted*/, decoded, length, user_file_name, vcontent_type, &r); - - if(params.count() > 1) - self.set_mode(is_text); + self.set(true/*tainted*/, is_text, decoded, length, user_file_name, vcontent_type, &r); } else { // encode: ^f.base64[] const char* encoded=pa_base64_encode(self.value_ptr(), self.value_size());