-/* $Id: filter_http_file.cpp,v 1.1 2006-01-19 21:44:26 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: filter_http_file.cpp,v 1.8 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
-
#include "filter.hpp"
#include "package.hpp"
-
-#include <boost/thread/mutex.hpp>
-
#include "util.hpp"
#include "filter_http_file.hpp"
+#include <yaz/zgdu.h>
+
+#include <boost/thread/mutex.hpp>
+
#include <list>
#include <map>
-
-#include <yaz/zgdu.h>
+#include <iostream>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/stat.h>
#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;
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);
};
}
yf::HttpFile::HttpFile() : m_p(new Rep)
{
+#if 0
m_p->m_ext_to_map["html"] = Mime("text/html");
m_p->m_ext_to_map["htm"] = Mime("text/html");
m_p->m_ext_to_map["png"] = Mime("image/png");
m_p->m_ext_to_map["asc"] = Mime("text/plain");
m_p->m_ext_to_map["xml"] = Mime("application/xml");
m_p->m_ext_to_map["xsl"] = Mime("application/xml");
-
+#endif
+#if 0
Area a;
a.m_url_path_prefix = "/etc";
- a.m_file_root = "..";
+ a.m_file_root = ".";
m_p->m_area_list.push_back(a);
+#endif
}
yf::HttpFile::~HttpFile()
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)
{
- struct stat sbuf;
- yp2::odr o;
+ mp::odr o;
- if (stat(fname.c_str(), &sbuf))
- {
- Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
- package.response() = gdu;
- return;
- }
- if ((sbuf.st_mode & S_IFMT) != S_IFREG)
+ FILE *f = fopen(fname.c_str(), "rb");
+ if (!f)
{
Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
package.response() = gdu;
return;
}
- if (sbuf.st_size > (off_t) 1000000)
+ if (fseek(f, 0L, SEEK_END) == -1)
{
+ fclose(f);
Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
package.response() = gdu;
return;
}
-
- FILE *f = fopen(fname.c_str(), "rb");
- if (!f)
+ long sz = ftell(f);
+ if (sz > 1000000L)
{
+ fclose(f);
Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
package.response() = gdu;
return;
}
+ rewind(f);
+
Z_GDU *gdu = o.create_HTTP_Response(session, req, 200);
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
- hres->content_len = sbuf.st_size;
+ hres->content_len = sz;
hres->content_buf = (char*) odr_malloc(o, hres->content_len);
fread(hres->content_buf, 1, hres->content_len, f);
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 path = req->path;
if (path.compare(0, l, it->m_url_path_prefix) == 0)
{
- std::string fname = it->m_file_root + path;
+ std::string fname = it->m_file_root + path.substr(l);
+ std::cout << "fname = " << fname << "\n";
fetch_file(session, req, fname, package);
return;
}
}
}
- yp2::odr o;
+ mp::odr o;
Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
package.response() = gdu;
}
-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)
package.move();
}
-static yp2::filter::Base* filter_creator()
+void mp::filter::HttpFile::configure(const xmlNode * ptr)
+{
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) ptr->name, "mimetypes"))
+ {
+ std::string fname = mp::xml::get_text(ptr);
+
+ mp::PlainFile f;
+
+ if (!f.open(fname))
+ {
+ throw mp::filter::FilterException
+ ("Can not open mime types file " + fname);
+ }
+
+ std::vector<std::string> args;
+ while (f.getline(args))
+ {
+ size_t i;
+ for (i = 1; i<args.size(); i++)
+ m_p->m_ext_to_map[args[i]] = args[0];
+ }
+ }
+ else if (!strcmp((const char *) ptr->name, "area"))
+ {
+ xmlNode *a_node = ptr->children;
+ Area a;
+ for (; a_node; a_node = a_node->next)
+ {
+ 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 "
+ + std::string((const char *) a_node->name)
+ + " in area section"
+ );
+ }
+ if (a.m_file_root.length())
+ {
+ m_p->m_area_list.push_back(a);
+ }
+ }
+ else
+ {
+ throw mp::filter::FilterException
+ ("Bad element "
+ + std::string((const char *) ptr->name)
+ + " in virt_db filter");
+ }
+ }
+}
+
+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