/* 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>
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);
+
+ p = path.find("?");
+ if (p != std::string::npos)
+ path = path.erase(p);
- // we don't consider ?, # yet..
+ 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
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)
{