X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_http_file.cpp;h=c5cca416126d041d54e265edd8a795acd9602a67;hb=219ffa015c0e35b03fae0788b0e8e6abcfde1a81;hp=d83af33c3624a91941fd4de913d2791da1069d3e;hpb=ab8cc809fd30019282584dbb2572bf38f6bd910d;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index d83af33..c5cca41 100644 --- a/src/filter_http_file.cpp +++ b/src/filter_http_file.cpp @@ -1,23 +1,22 @@ -/* $Id: filter_http_file.cpp,v 1.2 2006-01-25 11:28:23 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: filter_http_file.cpp,v 1.8 2007-01-25 14:05:54 adam Exp $ + Copyright (c) 2005-2007, Index Data. -%LICENSE% + See the LICENSE file for details */ #include "config.hpp" - #include "filter.hpp" #include "package.hpp" - -#include - #include "util.hpp" #include "filter_http_file.hpp" +#include + +#include + #include #include - -#include +#include #if HAVE_SYS_TYPES_H #include @@ -27,9 +26,10 @@ #include #endif -namespace yf = yp2::filter; +namespace mp = metaproxy_1; +namespace yf = mp::filter; -namespace yp2 { +namespace metaproxy_1 { namespace filter { struct HttpFile::Area { std::string m_url_path_prefix; @@ -50,11 +50,11 @@ namespace yp2 { MimeMap m_ext_to_map; AreaList m_area_list; - void fetch_uri(yp2::Session &session, - Z_HTTP_Request *req, yp2::Package &package); - void fetch_file(yp2::Session &session, + void fetch_uri(mp::Session &session, + Z_HTTP_Request *req, mp::Package &package); + void fetch_file(mp::Session &session, Z_HTTP_Request *req, - std::string &fname, yp2::Package &package); + std::string &fname, mp::Package &package); std::string get_mime_type(std::string &fname); }; } @@ -111,43 +111,40 @@ std::string yf::HttpFile::Rep::get_mime_type(std::string &fname) return content_type; } -void yf::HttpFile::Rep::fetch_file(yp2::Session &session, +void yf::HttpFile::Rep::fetch_file(mp::Session &session, Z_HTTP_Request *req, - std::string &fname, yp2::Package &package) + std::string &fname, mp::Package &package) { - struct stat sbuf; - yp2::odr o; + mp::odr o; - if (stat(fname.c_str(), &sbuf)) - { - Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); - package.response() = gdu; - return; - } - if ((sbuf.st_mode & S_IFMT) != S_IFREG) + FILE *f = fopen(fname.c_str(), "rb"); + if (!f) { Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); package.response() = gdu; return; } - if (sbuf.st_size > (off_t) 1000000) + if (fseek(f, 0L, SEEK_END) == -1) { + fclose(f); Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); package.response() = gdu; return; } - - FILE *f = fopen(fname.c_str(), "rb"); - if (!f) + long sz = ftell(f); + if (sz > 1000000L) { + fclose(f); Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); package.response() = gdu; return; } + rewind(f); + Z_GDU *gdu = o.create_HTTP_Response(session, req, 200); Z_HTTP_Response *hres = gdu->u.HTTP_Response; - hres->content_len = sbuf.st_size; + hres->content_len = sz; hres->content_buf = (char*) odr_malloc(o, hres->content_len); fread(hres->content_buf, 1, hres->content_len, f); @@ -160,8 +157,8 @@ void yf::HttpFile::Rep::fetch_file(yp2::Session &session, package.response() = gdu; } -void yf::HttpFile::Rep::fetch_uri(yp2::Session &session, - Z_HTTP_Request *req, yp2::Package &package) +void yf::HttpFile::Rep::fetch_uri(mp::Session &session, + Z_HTTP_Request *req, mp::Package &package) { bool sane = true; std::string path = req->path; @@ -189,12 +186,12 @@ void yf::HttpFile::Rep::fetch_uri(yp2::Session &session, } } } - yp2::odr o; + mp::odr o; Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); package.response() = gdu; } -void yf::HttpFile::process(yp2::Package &package) const +void yf::HttpFile::process(mp::Package &package) const { Z_GDU *gdu = package.request().get(); if (gdu && gdu->which == Z_GDU_HTTP_Request) @@ -203,7 +200,7 @@ void yf::HttpFile::process(yp2::Package &package) const package.move(); } -void yp2::filter::HttpFile::configure(const xmlNode * ptr) +void mp::filter::HttpFile::configure(const xmlNode * ptr) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -211,13 +208,13 @@ void yp2::filter::HttpFile::configure(const xmlNode * ptr) continue; if (!strcmp((const char *) ptr->name, "mimetypes")) { - std::string fname = yp2::xml::get_text(ptr); + std::string fname = mp::xml::get_text(ptr); - yp2::PlainFile f; + mp::PlainFile f; if (!f.open(fname)) { - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Can not open mime types file " + fname); } @@ -238,12 +235,12 @@ void yp2::filter::HttpFile::configure(const xmlNode * ptr) if (a_node->type != XML_ELEMENT_NODE) continue; - if (yp2::xml::is_element_yp2(a_node, "documentroot")) - a.m_file_root = yp2::xml::get_text(a_node); - else if (yp2::xml::is_element_yp2(a_node, "prefix")) - a.m_url_path_prefix = yp2::xml::get_text(a_node); + if (mp::xml::is_element_mp(a_node, "documentroot")) + a.m_file_root = mp::xml::get_text(a_node); + else if (mp::xml::is_element_mp(a_node, "prefix")) + a.m_url_path_prefix = mp::xml::get_text(a_node); else - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Bad element " + std::string((const char *) a_node->name) + " in area section" @@ -256,7 +253,7 @@ void yp2::filter::HttpFile::configure(const xmlNode * ptr) } else { - throw yp2::filter::FilterException + throw mp::filter::FilterException ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); @@ -264,13 +261,13 @@ void yp2::filter::HttpFile::configure(const xmlNode * ptr) } } -static yp2::filter::Base* filter_creator() +static mp::filter::Base* filter_creator() { - return new yp2::filter::HttpFile; + return new mp::filter::HttpFile; } extern "C" { - struct yp2_filter_struct yp2_filter_http_file = { + struct metaproxy_1_filter_struct metaproxy_1_filter_http_file = { 0, "http_file", filter_creator