--- parser3/src/main/pa_xml_io.C 2003/11/28 10:42:47 1.11 +++ parser3/src/main/pa_xml_io.C 2010/11/24 00:44:09 1.27 @@ -1,7 +1,7 @@ /** @file Parser: plugins to xml library, controlling i/o; implementation - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,13 +9,35 @@ #ifdef XML -static const char * const IDENT="$Date: 2003/11/28 10:42:47 $"; +static const char * const IDENT="$Date: 2010/11/24 00:44:09 $"; #include "libxslt/extensions.h" +#include "pa_threads.h" #include "pa_globals.h" #include "pa_request.h" +THREAD_LOCAL HashStringBool* xml_dependencies = NULL; + +static void add_dependency(const String::Body url) { + if(xml_dependencies) // do we need to monitor now? + xml_dependencies->put(url, true); +} + +void pa_xmlStartMonitoringDependencies() { + xml_dependencies=new HashStringBool; +} + +void pa_xmlStopMonitoringDependencies() { + xml_dependencies=NULL; +} + +HashStringBool* pa_xmlGetDependencies() { + HashStringBool* result=xml_dependencies; + xml_dependencies=NULL; + return result; +} + #ifndef DOXYGEN struct MemoryStream { const char* m_buf; @@ -28,7 +50,7 @@ struct MemoryStream { return 0; size_t to_read=min(a_size, left); - memcpy(a_buffer, m_buf, to_read); + memcpy(a_buffer, m_buf+m_position, to_read); m_position+=to_read; return to_read; } @@ -36,24 +58,78 @@ struct MemoryStream { }; #endif - +static void * +xmlFileOpen_ReadIntoStream (const char* do_not_store_filename, bool adjust_path_to_root_from_document_root=false) { #ifdef PA_SAFE_MODE -static int -xmlFileMatchSafeMode(const char* file_spec_cstr) { - if(strstr(file_spec_cstr, "://")) { - String* file_spec=new String(file_spec_cstr, true); - struct stat finfo; - if(stat(file_spec_cstr, &finfo)!=0) - throw Exception("file.missing", - file_spec, - "stat failed: %s (%d)", - strerror(errno), errno); +//copied from libxml/catalog.c +# define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" + // disable attempts to consult default catalog [usually, that file belongs to other user/group] + if(strcmp(do_not_store_filename, XML_XML_DEFAULT_CATALOG)==0) + return 0; +#endif - check_safe_mode(finfo, file_spec, file_spec_cstr); + Request& r=pa_thread_request(); + char adjust_buf[MAX_STRING]; + if(adjust_path_to_root_from_document_root) { + const char* document_root=r.request_info.document_root; + if(!document_root) + document_root="."; + + adjust_buf[0]=0; + strcat(adjust_buf, document_root); + strcat(adjust_buf, &do_not_store_filename[16]); + do_not_store_filename=adjust_buf; + } else + if(!strstr(do_not_store_filename, "http://")) + if(strstr(do_not_store_filename, "file://")){ + do_not_store_filename+=7/*strlen("file://")*/; +#ifdef WIN32 + if( + do_not_store_filename[0]=='/' + && do_not_store_filename[1] + && do_not_store_filename[2]==':' + && do_not_store_filename[3]=='/' + ){ + // skip leading slash for absolute path file:///C:/path/to/file + do_not_store_filename++; + } +#endif + } else if(*do_not_store_filename && do_not_store_filename[1]!=':' && strstr(do_not_store_filename, "://")) { + pa_xmlStopMonitoringDependencies(); + return 0; // plug out [do not handle other prefixes] + } + + const char* can_store_filename=pa_strdup(do_not_store_filename); + add_dependency(can_store_filename); + + const char *buf; + try { + buf=file_load_text(r, *new String(can_store_filename), + true/*fail_on_read_problem*/, + 0/*params*/, + false/*don't transcode result because it must be fit with @encoding value!*/); + } catch(const Exception& e) { + if(strcmp(e.type(), "file.missing")==0) + return 0; // let the library try that and report an error properly + + buf=e.comment(); + } catch(...) { + buf="xmlFileOpen_ReadIntoStream: unknown error"; } - return 0; + MemoryStream* stream=new(UseGC) MemoryStream; + stream->m_buf=buf; + stream->m_size=strlen(buf); + return (void *)stream; +} + +static int +xmlFileMatchMonitor(const char* /*file_spec_cstr*/) { + return 1; // always intercept, causing xmlFileOpenMonitor to be called +} +static void * +xmlFileOpenMonitor(const char* filename) { + return xmlFileOpen_ReadIntoStream(filename); // handles localfile case, else returns 0 } -#endif /** @@ -71,35 +147,17 @@ xmlFileMatchLocalhost(const char* filena return(0); } - /** - * xmlFileOpenHttpLocalhost : + * xmlFileOpenLocalhost: * filename: the URI for matching * * http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc * - * input from FILE *, supports compressed input - * if filename is " " then the standard input is used - * * Returns an I/O context or NULL in case of error */ static void * xmlFileOpenLocalhost (const char* filename) { - Request& r=pa_thread_request(); - const char* document_root=r.request_info.document_root; - if(!document_root) - document_root="."; - - char path[MAX_STRING]; - path[0]=0; - strcat(path, document_root); - strcat(path, &filename[16]); - - MemoryStream *stream=new(UseGC) MemoryStream; - stream->m_buf=file_read_text(r.charsets, *new String(filename), true); - stream->m_size=strlen(stream->m_buf); - - return (void *)stream; + return xmlFileOpen_ReadIntoStream(filename, true/*adjust path to root from document_root*/); } static int @@ -112,34 +170,51 @@ xmlFileMatchMethod(const char* filename) /// parser://method/param/here -> ^MAIN:method[/params/here] static void * xmlFileOpenMethod (const char* afilename) { - Request& r=pa_thread_request(); - - char* s=pa_strdup(afilename+9 /*strlen("parser://")*/); - const char* method_cstr=lsplit(&s, '/'); - const String* method=new String(method_cstr); - String::Body param_body("/"); - if(s) - param_body.append_know_length(s, strlen(s)); - - VString* vparam=new VString(*new String(param_body, String::L_TAINTED)); - { - Temp_lang temp_lang(r, String::L_XML); // default language: XML - Request::Execute_nonvirtual_method_result body= - r.execute_nonvirtual_method(r.main_class, *method, vparam, true); - if(body.string) { - MemoryStream *stream=new(UseGC) MemoryStream; - stream->m_buf=body.string->cstr(String::L_UNSPECIFIED); - stream->m_size=strlen(stream->m_buf); - return (void*)stream; + const char* buf; + try { + Request& r=pa_thread_request(); + + char* s=pa_strdup(afilename+9 /*strlen("parser://")*/); + const char* method_cstr=lsplit(&s, '/'); + const String* method=new String(method_cstr); + String::Body param_body("/"); + if(s) + param_body.append_know_length(s, strlen(s)); + + VString* vparam=new VString(*new String(param_body, String::L_TAINTED)); + { + Temp_lang temp_lang(r, String::L_XML); // default language: XML + Request::Execute_nonvirtual_method_result body= + r.execute_nonvirtual_method(r.main_class, *method, vparam, true); + if(body.string) { + buf=body.string->untaint_cstr(r.flang); + } else + throw Exception(0, + new String(afilename), + "'%s' method not found in %s class", + method_cstr, MAIN_CLASS_NAME); } + } catch(const Exception& e) { + buf=e.comment(); + } catch(...) { + buf="xmlFileOpenLocalhost: unknown error"; } - - throw Exception(0, - new String(afilename), - "'%s' method not found in %s class", - method_cstr, MAIN_CLASS_NAME); + MemoryStream* stream=new(UseGC) MemoryStream; + stream->m_buf=buf; + stream->m_size=strlen(buf); + return (void *)stream; } +/** + * pa_xmlFileReadMethod: + * @context: the I/O context + * @buffer: where to drop data + * @len: number of bytes to write + * + * Read @len bytes to @buffer from the I/O channel. + * + * Returns the number of bytes written + */ static int pa_xmlFileReadMethod (void * context, //< MemoryStream actually char * buffer, int len) @@ -157,12 +232,12 @@ pa_xmlFileCloseMethod (void * /*context* void pa_xml_io_init() { -#ifdef PA_SAFE_MODE + // file open monitorer [for xslt cacher] // safe mode checker, always fail match, but checks non-"://" there xmlRegisterInputCallbacks( - xmlFileMatchSafeMode, 0, - 0, 0); -#endif + xmlFileMatchMonitor, xmlFileOpenMonitor, + pa_xmlFileReadMethod, pa_xmlFileCloseMethod); + // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc xmlRegisterInputCallbacks( xmlFileMatchLocalhost, xmlFileOpenLocalhost,