projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inval ses for diagnostic 'temporary system error'
[metaproxy-moved-to-github.git]
/
src
/
filter_http_file.cpp
diff --git
a/src/filter_http_file.cpp
b/src/filter_http_file.cpp
index
d83af33
..
00fab9e
100644
(file)
--- a/
src/filter_http_file.cpp
+++ b/
src/filter_http_file.cpp
@@
-1,23
+1,34
@@
-/* $Id: filter_http_file.cpp,v 1.2 2006-01-25 11:28:23 adam Exp $
- Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2009 Index Data
-%LICENSE%
- */
+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.
-#include "config.hpp"
+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 "filter.hpp"
#include "package.hpp"
-
-#include <boost/thread/mutex.hpp>
-
#include "util.hpp"
#include "filter_http_file.hpp"
#include "util.hpp"
#include "filter_http_file.hpp"
+#include <yaz/zgdu.h>
+
+#include <boost/thread/mutex.hpp>
+
#include <list>
#include <map>
#include <list>
#include <map>
-
-#include <yaz/zgdu.h>
+#include <iostream>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@
-27,9
+38,10
@@
#include <sys/stat.h>
#endif
#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;
namespace filter {
struct HttpFile::Area {
std::string m_url_path_prefix;
@@
-50,11
+62,11
@@
namespace yp2 {
MimeMap m_ext_to_map;
AreaList m_area_list;
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,
Z_HTTP_Request *req,
- std::string &fname, yp2::Package &package);
+ std::string &fname, mp::Package &package);
std::string get_mime_type(std::string &fname);
};
}
std::string get_mime_type(std::string &fname);
};
}
@@
-111,45
+123,48
@@
std::string yf::HttpFile::Rep::get_mime_type(std::string &fname)
return content_type;
}
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,
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;
}
{
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;
}
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;
}
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;
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);
hres->content_buf = (char*) odr_malloc(o, hres->content_len);
- fread(hres->content_buf, 1, hres->content_len, f);
+ if (fread(hres->content_buf, 1, hres->content_len, f) != 1)
+ {
+ fclose(f);
+ Z_GDU *gdu = o.create_HTTP_Response(session, req, 500);
+ package.response() = gdu;
+ return;
+ }
fclose(f);
fclose(f);
@@
-160,8
+175,8
@@
void yf::HttpFile::Rep::fetch_file(yp2::Session &session,
package.response() = gdu;
}
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;
{
bool sane = true;
std::string path = req->path;
@@
-189,12
+204,12
@@
void yf::HttpFile::Rep::fetch_uri(yp2::Session &session,
}
}
}
}
}
}
- yp2::odr o;
+ mp::odr o;
Z_GDU *gdu = o.create_HTTP_Response(session, req, 404);
package.response() = gdu;
}
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)
{
Z_GDU *gdu = package.request().get();
if (gdu && gdu->which == Z_GDU_HTTP_Request)
@@
-203,7
+218,7
@@
void yf::HttpFile::process(yp2::Package &package) const
package.move();
}
package.move();
}
-void yp2::filter::HttpFile::configure(const xmlNode * ptr)
+void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
@@
-211,13
+226,13
@@
void yp2::filter::HttpFile::configure(const xmlNode * ptr)
continue;
if (!strcmp((const char *) ptr->name, "mimetypes"))
{
continue;
if (!strcmp((const char *) ptr->name, "mimetypes"))
{
- std::string fname = yp2::xml::get_text(ptr);
+ std::string fname = mp::xml::get_text(ptr);
- yp2::PlainFile f;
+ mp::PlainFile f;
if (!f.open(fname))
{
if (!f.open(fname))
{
- throw yp2::filter::FilterException
+ throw mp::filter::FilterException
("Can not open mime types file " + fname);
}
("Can not open mime types file " + fname);
}
@@
-238,12
+253,12
@@
void yp2::filter::HttpFile::configure(const xmlNode * ptr)
if (a_node->type != XML_ELEMENT_NODE)
continue;
if (a_node->type != XML_ELEMENT_NODE)
continue;
- if (yp2::xml::is_element_yp2(a_node, "documentroot"))
- a.m_file_root = yp2::xml::get_text(a_node);
- else if (yp2::xml::is_element_yp2(a_node, "prefix"))
- a.m_url_path_prefix = yp2::xml::get_text(a_node);
+ 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
else
- throw yp2::filter::FilterException
+ throw mp::filter::FilterException
("Bad element "
+ std::string((const char *) a_node->name)
+ " in area section"
("Bad element "
+ std::string((const char *) a_node->name)
+ " in area section"
@@
-256,7
+271,7
@@
void yp2::filter::HttpFile::configure(const xmlNode * ptr)
}
else
{
}
else
{
- throw yp2::filter::FilterException
+ throw mp::filter::FilterException
("Bad element "
+ std::string((const char *) ptr->name)
+ " in virt_db filter");
("Bad element "
+ std::string((const char *) ptr->name)
+ " in virt_db filter");
@@
-264,13
+279,13
@@
void yp2::filter::HttpFile::configure(const xmlNode * ptr)
}
}
}
}
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
{
{
- return new yp2::filter::HttpFile;
+ return new mp::filter::HttpFile;
}
extern "C" {
}
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
0,
"http_file",
filter_creator
@@
-281,8
+296,9
@@
extern "C" {
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+