X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=5d376018bf2fc35aaa3c58ccbfe84096055afc69;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=7ca4062fd9aeba1697a10e9790735518a0fbe7b3;hpb=357884a3c428262e37911c9429dc122fb0243bcd;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index 7ca4062..5d37601 100644 --- a/src/filter_http_file.cpp +++ b/src/filter_http_file.cpp @@ -1,23 +1,35 @@ -/* $Id: filter_http_file.cpp,v 1.3 2006-02-02 11:33:46 adam Exp $ - Copyright (c) 2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2013 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,9 +39,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 +63,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); }; } @@ -92,7 +105,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); @@ -111,12 +124,12 @@ 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) { - yp2::odr o; - + mp::odr o; + FILE *f = fopen(fname.c_str(), "rb"); if (!f) { @@ -145,11 +158,19 @@ void yf::HttpFile::Rep::fetch_file(yp2::Session &session, Z_HTTP_Response *hres = gdu->u.HTTP_Response; hres->content_len = sz; - hres->content_buf = (char*) odr_malloc(o, hres->content_len); - fread(hres->content_buf, 1, hres->content_len, f); - + if (hres->content_len > 0) + { + hres->content_buf = (char*) odr_malloc(o, hres->content_len); + if (fread(hres->content_buf, hres->content_len, 1, f) != 1) + { + fclose(f); + Z_GDU *gdu = o.create_HTTP_Response(session, req, 500); + package.response() = gdu; + return; + } + } fclose(f); - + std::string content_type = get_mime_type(fname); z_HTTP_header_add(o, &hres->headers, @@ -157,16 +178,25 @@ 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::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; @@ -180,18 +210,16 @@ 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.substr(l); - std::cout << "fname = " << fname << "\n"; + package.log("http_file", YLOG_LOG, "%s", fname.c_str()); fetch_file(session, req, fname, package); 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) @@ -200,7 +228,8 @@ 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, bool test_only, + const char *path) { for (ptr = ptr->children; ptr; ptr = ptr->next) { @@ -208,16 +237,16 @@ 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); } - + std::vector args; while (f.getline(args)) { @@ -234,14 +263,14 @@ 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 - ("Bad element " + throw mp::filter::FilterException + ("Bad element " + std::string((const char *) a_node->name) + " in area section" ); @@ -253,21 +282,21 @@ void yp2::filter::HttpFile::configure(const xmlNode * ptr) } else { - throw yp2::filter::FilterException - ("Bad element " + throw mp::filter::FilterException + ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); } } } -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 @@ -278,8 +307,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 */ +