X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=d036433bb5d80df4e0907781a73a2e29c3c402eb;hb=b8550b672196ca7e6fe11a8cba7155beb8794286;hp=27fcce4b33e8614e741a95766145939b88e24d6b;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp
index 27fcce4..d036433 100644
--- a/src/filter_http_file.cpp
+++ b/src/filter_http_file.cpp
@@ -1,23 +1,35 @@
-/* $Id: filter_http_file.cpp,v 1.5 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2012 Index Data
 
-   See the LICENSE file for details
- */
+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.
+
+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 <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
+#include "filter_http_file.hpp"
 
-#include "filter.hpp"
-#include "package.hpp"
+#include <yaz/zgdu.h>
+#include <yaz/log.h>
 
 #include <boost/thread/mutex.hpp>
 
-#include "util.hpp"
-#include "filter_http_file.hpp"
-
 #include <list>
 #include <map>
-
-#include <yaz/zgdu.h>
+#include <iostream>
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -147,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);
-    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);
     
@@ -162,12 +180,21 @@ void yf::HttpFile::Rep::fetch_uri(mp::Session &session,
                                   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);
 
-    // we don't consider ?, # yet..
+    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;
 
@@ -181,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);
-                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
@@ -201,7 +226,8 @@ void yf::HttpFile::process(mp::Package &package) const
         package.move();
 }
 
-void mp::filter::HttpFile::configure(const xmlNode * ptr)
+void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only,
+                                     const char *path)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -236,9 +262,9 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr)
                 if (a_node->type != XML_ELEMENT_NODE)
                     continue;
                 
-                if (mp::xml::is_element_yp2(a_node, "documentroot"))
+                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_yp2(a_node, "prefix"))
+                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
@@ -279,8 +305,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+