X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=defac589f25b0da47fc5928d86e90b0b46feb2d2;hb=09d9b36e4529a5cf42066f4a1e5b3ce635e04f34;hp=533f57530957134b0769c324f9ddb6595b405f5b;hpb=1751782d8e3c9d4574754463ffd43373cf92133a;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index 533f575..defac58 100644 --- a/src/filter_http_file.cpp +++ b/src/filter_http_file.cpp @@ -1,23 +1,35 @@ -/* $Id: filter_http_file.cpp,v 1.1 2006-01-19 21:44:26 adam Exp $ - Copyright (c) 2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) Index Data -%LICENSE% - */ +Metaproxy is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #include "config.hpp" +#include +#include +#include +#include "filter_http_file.hpp" -#include "filter.hpp" -#include "package.hpp" +#include +#include #include -#include "util.hpp" -#include "filter_http_file.hpp" - #include #include - -#include +#include #if HAVE_SYS_TYPES_H #include @@ -27,13 +39,16 @@ #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; std::string m_file_root; + bool m_raw; + Area(); }; class HttpFile::Mime { friend class Rep; @@ -50,22 +65,28 @@ 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, + bool raw); std::string get_mime_type(std::string &fname); }; } } +yf::HttpFile::Area::Area() : m_raw(false) +{ +} + yf::HttpFile::Mime::Mime() {} yf::HttpFile::Mime::Mime(std::string type) : m_type(type) {} yf::HttpFile::HttpFile() : m_p(new Rep) { +#if 0 m_p->m_ext_to_map["html"] = Mime("text/html"); m_p->m_ext_to_map["htm"] = Mime("text/html"); m_p->m_ext_to_map["png"] = Mime("image/png"); @@ -74,11 +95,13 @@ yf::HttpFile::HttpFile() : m_p(new Rep) m_p->m_ext_to_map["asc"] = Mime("text/plain"); m_p->m_ext_to_map["xml"] = Mime("application/xml"); m_p->m_ext_to_map["xsl"] = Mime("application/xml"); - +#endif +#if 0 Area a; a.m_url_path_prefix = "/etc"; - a.m_file_root = ".."; + a.m_file_root = "."; m_p->m_area_list.push_back(a); +#endif } yf::HttpFile::~HttpFile() @@ -89,7 +112,7 @@ std::string yf::HttpFile::Rep::get_mime_type(std::string &fname) { std::string file_part = fname; std::string::size_type p = fname.find_last_of('/'); - + if (p != std::string::npos) file_part = fname.substr(p+1); @@ -108,65 +131,92 @@ 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, + bool raw) { - struct stat sbuf; - yp2::odr o; - - if (stat(fname.c_str(), &sbuf)) + mp::odr o(ODR_ENCODE); + + 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_mode & S_IFMT) != S_IFREG) + if (fseek(f, 0L, SEEK_END) == -1) { + fclose(f); Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); package.response() = gdu; return; } - if (sbuf.st_size > (off_t) 1000000) + long sz = ftell(f); + if (sz > 1000000L) { + 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) + rewind(f); + char *fbuf = (char*) odr_malloc(o, sz); + if (sz > 0) { - Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); - package.response() = gdu; - return; + if (fread(fbuf, sz, 1, f) != 1) + { + Z_GDU *gdu = o.create_HTTP_Response(session, req, 500); + package.response() = gdu; + fclose(f); + return; + } } - 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_buf = (char*) odr_malloc(o, hres->content_len); - fread(hres->content_buf, 1, hres->content_len, f); - fclose(f); - - std::string content_type = get_mime_type(fname); - z_HTTP_header_add(o, &hres->headers, + Z_GDU *gdu = 0; + mp::odr decode(ODR_DECODE); + if (raw) + { + odr_setbuf(decode, (char *) fbuf, sz, 0); + int r = z_GDU(decode, &gdu, 0, 0); + if (!r) + { + gdu = o.create_HTTP_Response(session, req, 500); + } + } + else + { + gdu = o.create_HTTP_Response(session, req, 200); + Z_HTTP_Response *hres = gdu->u.HTTP_Response; + hres->content_len = sz; + hres->content_buf = fbuf; + std::string content_type = get_mime_type(fname); + z_HTTP_header_add(o, &hres->headers, "Content-Type", content_type.c_str()); + } 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::size_type p; std::string path = req->path; - // we don't consider ?, # yet.. + p = path.find("#"); + if (p != std::string::npos) + path = path.erase(p); + + p = path.find("?"); + if (p != std::string::npos) + path = path.erase(p); + + path = mp::util::uri_decode(path); // we don't allow .. - std::string::size_type p = path.find(".."); + p = path.find(".."); if (p != std::string::npos) sane = false; @@ -179,18 +229,17 @@ void yf::HttpFile::Rep::fetch_uri(yp2::Session &session, if (path.compare(0, l, it->m_url_path_prefix) == 0) { - std::string fname = it->m_file_root + path; - fetch_file(session, req, fname, package); + std::string fname = it->m_file_root + path.substr(l); + package.log("http_file", YLOG_LOG, "%s", fname.c_str()); + fetch_file(session, req, fname, package, it->m_raw); return; } } } - yp2::odr o; - Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); - package.response() = gdu; + package.move(); } - -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) @@ -199,13 +248,78 @@ void yf::HttpFile::process(yp2::Package &package) const package.move(); } -static yp2::filter::Base* filter_creator() +void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only, + const char *path) +{ + for (ptr = ptr->children; ptr; ptr = ptr->next) + { + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) ptr->name, "mimetypes")) + { + std::string fname = mp::xml::get_text(ptr); + + mp::PlainFile f; + + if (!f.open(fname)) + { + throw mp::filter::FilterException + ("Can not open mime types file " + fname); + } + + std::vector args; + while (f.getline(args)) + { + size_t i; + for (i = 1; im_ext_to_map[args[i]] = args[0]; + } + } + else if (!strcmp((const char *) ptr->name, "area")) + { + xmlNode *a_node = ptr->children; + Area a; + + for (; a_node; a_node = a_node->next) + { + if (a_node->type != XML_ELEMENT_NODE) + continue; + + 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 if (mp::xml::is_element_mp(a_node, "raw")) + a.m_raw = mp::xml::get_bool(a_node, false); + else + throw mp::filter::FilterException + ("Bad element " + + std::string((const char *) a_node->name) + + " in area section" + ); + } + if (a.m_file_root.length()) + { + m_p->m_area_list.push_back(a); + } + } + else + { + throw mp::filter::FilterException + ("Bad element " + + std::string((const char *) ptr->name) + + " in virt_db filter"); + } + } +} + +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 @@ -216,8 +330,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +