/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 2005-2012 Index Data
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
#include "filter_http_file.hpp"
#include <yaz/zgdu.h>
+#include <yaz/log.h>
#include <boost/thread/mutex.hpp>
{
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);
std::string &fname, mp::Package &package)
{
mp::odr o;
-
+
FILE *f = fopen(fname.c_str(), "rb");
if (!f)
{
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
hres->content_len = sz;
- hres->content_buf = (char*) odr_malloc(o, hres->content_len);
- if (fread(hres->content_buf, hres->content_len, 1, f) != 1)
+ if (hres->content_len > 0)
{
- fclose(f);
- Z_GDU *gdu = o.create_HTTP_Response(session, req, 500);
- package.response() = gdu;
- return;
+ 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,
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;
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();
package.move();
}
-void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
+void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only,
+ const char *path)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
throw mp::filter::FilterException
("Can not open mime types file " + fname);
}
-
+
std::vector<std::string> args;
while (f.getline(args))
{
{
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
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) a_node->name)
+ " in area section"
);
else
{
throw mp::filter::FilterException
- ("Bad element "
+ ("Bad element "
+ std::string((const char *) ptr->name)
+ " in virt_db filter");
}