X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=5d376018bf2fc35aaa3c58ccbfe84096055afc69;hb=0ce322844494022dc85a9c776d9ff041aad17520;hp=27fcce4b33e8614e741a95766145939b88e24d6b;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index 27fcce4..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.5 2006-06-10 14:29:12 adam Exp $ - Copyright (c) 2005-2006, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2013 Index Data - See the LICENSE file for details - */ +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 @@ -93,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); @@ -117,7 +129,7 @@ void yf::HttpFile::Rep::fetch_file(mp::Session &session, std::string &fname, mp::Package &package) { mp::odr o; - + FILE *f = fopen(fname.c_str(), "rb"); if (!f) { @@ -146,11 +158,19 @@ void yf::HttpFile::Rep::fetch_file(mp::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, @@ -162,12 +182,21 @@ 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; @@ -181,17 +210,15 @@ void yf::HttpFile::Rep::fetch_uri(mp::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; } } } - mp::odr o; - Z_GDU *gdu = o.create_HTTP_Response(session, req, 404); - package.response() = gdu; + package.move(); } - + void yf::HttpFile::process(mp::Package &package) const { Z_GDU *gdu = package.request().get(); @@ -201,7 +228,8 @@ void yf::HttpFile::process(mp::Package &package) const package.move(); } -void mp::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) { @@ -218,7 +246,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr) throw mp::filter::FilterException ("Can not open mime types file " + fname); } - + std::vector args; while (f.getline(args)) { @@ -235,14 +263,14 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr) { if (a_node->type != XML_ELEMENT_NODE) continue; - - if (mp::xml::is_element_yp2(a_node, "documentroot")) + + 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_yp2(a_node, "prefix")) + else if (mp::xml::is_element_mp(a_node, "prefix")) a.m_url_path_prefix = mp::xml::get_text(a_node); else throw mp::filter::FilterException - ("Bad element " + ("Bad element " + std::string((const char *) a_node->name) + " in area section" ); @@ -255,7 +283,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr) else { throw mp::filter::FilterException - ("Bad element " + ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); } @@ -279,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 */ +