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
Change start log message to 'metaproxy start'
[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
d8cc4fb
..
d036433
100644
(file)
--- a/
src/filter_http_file.cpp
+++ b/
src/filter_http_file.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2009 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
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
@@
-17,12
+17,13
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.hpp"
*/
#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 "filter_http_file.hpp"
#include <yaz/zgdu.h>
+#include <yaz/log.h>
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
@@
-158,7
+159,13
@@
void yf::HttpFile::Rep::fetch_file(mp::Session &session,
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
hres->content_len = sz;
hres->content_buf = (char*) odr_malloc(o, hres->content_len);
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);
fclose(f);
@@
-173,12
+180,21
@@
void yf::HttpFile::Rep::fetch_uri(mp::Session &session,
Z_HTTP_Request *req, mp::Package &package)
{
bool sane = true;
Z_HTTP_Request *req, mp::Package &package)
{
bool sane = true;
+ std::string::size_type p;
std::string path = req->path;
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 ..
// we don't allow ..
- std::string::size_type p = path.find("..");
+ p = path.find("..");
if (p != std::string::npos)
sane = false;
if (p != std::string::npos)
sane = false;
@@
-192,15
+208,13
@@
void yf::HttpFile::Rep::fetch_uri(mp::Session &session,
if (path.compare(0, l, it->m_url_path_prefix) == 0)
{
std::string fname = it->m_file_root + path.substr(l);
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;
}
}
}
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
}
void yf::HttpFile::process(mp::Package &package) const
@@
-212,7
+226,8
@@
void yf::HttpFile::process(mp::Package &package) const
package.move();
}
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)
{
{
for (ptr = ptr->children; ptr; ptr = ptr->next)
{