X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=58ec810f38c05d6058b8884a2487205a5cd2c046;hb=73f37c91c144b070020df2f27472c09b62367acf;hp=d8cc4fba9b0aea8f64f2242816ae30bb3fc9b195;hpb=d0123337d70b0fb97b578cc57467bb94980f1014;p=metaproxy-moved-to-github.git

diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp
index d8cc4fb..58ec810 100644
--- a/src/filter_http_file.cpp
+++ b/src/filter_http_file.cpp
@@ -1,5 +1,5 @@
 /* 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
@@ -17,12 +17,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #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 <yaz/log.h>
 
 #include <boost/thread/mutex.hpp>
 
@@ -104,7 +105,7 @@ std::string yf::HttpFile::Rep::get_mime_type(std::string &fname)
 {
     std::string file_part = fname;
     std::string::size_type p = fname.find_last_of('/');
-    
+
     if (p != std::string::npos)
         file_part = fname.substr(p+1);
 
@@ -128,7 +129,7 @@ void yf::HttpFile::Rep::fetch_file(mp::Session &session,
                                    std::string &fname, mp::Package &package)
 {
     mp::odr o;
-    
+
     FILE *f = fopen(fname.c_str(), "rb");
     if (!f)
     {
@@ -157,11 +158,19 @@ 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 (hres->content_len > 0)
+    {
+        hres->content_buf = (char*) odr_malloc(o, hres->content_len);
+        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);
-    
+
     std::string content_type = get_mime_type(fname);
 
     z_HTTP_header_add(o, &hres->headers,
@@ -173,12 +182,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;
 
-    // we don't consider ?, # yet..
+    p = path.find("#");
+    if (p != std::string::npos)
+        path = path.erase(p);
+
+    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;
 
@@ -192,17 +210,15 @@ 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
 {
     Z_GDU *gdu = package.request().get();
@@ -212,7 +228,8 @@ 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)
     {
@@ -229,7 +246,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
                 throw mp::filter::FilterException
                     ("Can not open mime types file " + fname);
             }
-            
+
             std::vector<std::string> args;
             while (f.getline(args))
             {
@@ -246,14 +263,14 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
             {
                 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 " 
+                        ("Bad element "
                          + std::string((const char *) a_node->name)
                          + " in area section"
                             );
@@ -266,7 +283,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only)
         else
         {
             throw mp::filter::FilterException
-                ("Bad element " 
+                ("Bad element "
                  + std::string((const char *) ptr->name)
                  + " in virt_db filter");
         }