-/* $Id: filter_http_file.cpp,v 1.6 2006-08-29 10:34:32 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2011 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 "filter.hpp"
-#include "package.hpp"
-#include "util.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
#include "filter_http_file.hpp"
#include <yaz/zgdu.h>
+#include <yaz/log.h>
#include <boost/thread/mutex.hpp>
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 (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);
Z_HTTP_Request *req, mp::Package &package)
{
bool sane = true;
+ std::string::size_type p;
std::string path = req->path;
+
+ p = path.find("#");
+ if (p != std::string::npos)
+ path = path.erase(p);
- // we don't consider ?, # yet..
+ 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;
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;
}
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)
{
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
/*
* 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
*/
+